Revision: 23628
Author:   [email protected]
Date:     Wed Sep  3 04:18:06 2014 UTC
Log:      X87: Minor-key-ify four stubs.

port r23605.

orginal commit message:
  - Minor-key-ify four stubs.
  - ICCompareStub
  - BinaryOpICStub
  - CompareNilICStub - VectorLoadStub

BUG=
[email protected]

Review URL: https://codereview.chromium.org/534883002

Patch from Chunyang Dai <[email protected]>.
https://code.google.com/p/v8/source/detail?r=23628

Modified:
 /branches/bleeding_edge/src/x87/code-stubs-x87.cc
 /branches/bleeding_edge/src/x87/code-stubs-x87.h
 /branches/bleeding_edge/src/x87/macro-assembler-x87.cc

=======================================
--- /branches/bleeding_edge/src/x87/code-stubs-x87.cc Tue Sep 2 02:42:36 2014 UTC +++ /branches/bleeding_edge/src/x87/code-stubs-x87.cc Wed Sep 3 04:18:06 2014 UTC
@@ -1247,8 +1247,8 @@
   Condition cc = GetCondition();

   Label miss;
-  CheckInputType(masm, edx, left_, &miss);
-  CheckInputType(masm, eax, right_, &miss);
+  CheckInputType(masm, edx, left(), &miss);
+  CheckInputType(masm, eax, right(), &miss);

   // Compare two smis.
   Label non_smi, smi_done;
@@ -3070,7 +3070,7 @@


 void ICCompareStub::GenerateSmis(MacroAssembler* masm) {
-  DCHECK(state_ == CompareIC::SMI);
+  DCHECK(state() == CompareIC::SMI);
   Label miss;
   __ mov(ecx, edx);
   __ or_(ecx, eax);
@@ -3096,16 +3096,16 @@


 void ICCompareStub::GenerateNumbers(MacroAssembler* masm) {
-  DCHECK(state_ == CompareIC::NUMBER);
+  DCHECK(state() == CompareIC::NUMBER);

   Label generic_stub;
   Label unordered, maybe_undefined1, maybe_undefined2;
   Label miss;

-  if (left_ == CompareIC::SMI) {
+  if (left() == CompareIC::SMI) {
     __ JumpIfNotSmi(edx, &miss);
   }
-  if (right_ == CompareIC::SMI) {
+  if (right() == CompareIC::SMI) {
     __ JumpIfNotSmi(eax, &miss);
   }

@@ -3124,12 +3124,12 @@

   __ bind(&unordered);
   __ bind(&generic_stub);
- ICCompareStub stub(isolate(), op_, CompareIC::GENERIC, CompareIC::GENERIC, + ICCompareStub stub(isolate(), op(), CompareIC::GENERIC, CompareIC::GENERIC,
                      CompareIC::GENERIC);
   __ jmp(stub.GetCode(), RelocInfo::CODE_TARGET);

   __ bind(&maybe_undefined1);
-  if (Token::IsOrderedRelationalCompareOp(op_)) {
+  if (Token::IsOrderedRelationalCompareOp(op())) {
     __ cmp(eax, Immediate(isolate()->factory()->undefined_value()));
     __ j(not_equal, &miss);
     __ JumpIfSmi(edx, &unordered);
@@ -3139,7 +3139,7 @@
   }

   __ bind(&maybe_undefined2);
-  if (Token::IsOrderedRelationalCompareOp(op_)) {
+  if (Token::IsOrderedRelationalCompareOp(op())) {
     __ cmp(edx, Immediate(isolate()->factory()->undefined_value()));
     __ j(equal, &unordered);
   }
@@ -3150,7 +3150,7 @@


 void ICCompareStub::GenerateInternalizedStrings(MacroAssembler* masm) {
-  DCHECK(state_ == CompareIC::INTERNALIZED_STRING);
+  DCHECK(state() == CompareIC::INTERNALIZED_STRING);
   DCHECK(GetCondition() == equal);

   // Registers containing left and right operands respectively.
@@ -3195,7 +3195,7 @@


 void ICCompareStub::GenerateUniqueNames(MacroAssembler* masm) {
-  DCHECK(state_ == CompareIC::UNIQUE_NAME);
+  DCHECK(state() == CompareIC::UNIQUE_NAME);
   DCHECK(GetCondition() == equal);

   // Registers containing left and right operands respectively.
@@ -3240,10 +3240,10 @@


 void ICCompareStub::GenerateStrings(MacroAssembler* masm) {
-  DCHECK(state_ == CompareIC::STRING);
+  DCHECK(state() == CompareIC::STRING);
   Label miss;

-  bool equality = Token::IsEqualityOp(op_);
+  bool equality = Token::IsEqualityOp(op());

   // Registers containing left and right operands respectively.
   Register left = edx;
@@ -3330,7 +3330,7 @@


 void ICCompareStub::GenerateObjects(MacroAssembler* masm) {
-  DCHECK(state_ == CompareIC::OBJECT);
+  DCHECK(state() == CompareIC::OBJECT);
   Label miss;
   __ mov(ecx, edx);
   __ and_(ecx, eax);
@@ -3381,7 +3381,7 @@
     __ push(eax);
     __ push(edx);  // And also use them as the arguments.
     __ push(eax);
-    __ push(Immediate(Smi::FromInt(op_)));
+    __ push(Immediate(Smi::FromInt(op())));
     __ CallExternalReference(miss, 3);
     // Compute the entry point of the rewritten stub.
     __ lea(edi, FieldOperand(eax, Code::kHeaderSize));
=======================================
--- /branches/bleeding_edge/src/x87/code-stubs-x87.h Mon Aug 25 13:09:02 2014 UTC +++ /branches/bleeding_edge/src/x87/code-stubs-x87.h Wed Sep 3 04:18:06 2014 UTC
@@ -16,7 +16,7 @@
                      Label* call_generic_code);


-class StoreBufferOverflowStub: public PlatformCodeStub {
+class StoreBufferOverflowStub : public PlatformCodeStub {
  public:
   explicit StoreBufferOverflowStub(Isolate* isolate)
       : PlatformCodeStub(isolate) { }
=======================================
--- /branches/bleeding_edge/src/x87/macro-assembler-x87.cc Thu Aug 7 07:06:52 2014 UTC +++ /branches/bleeding_edge/src/x87/macro-assembler-x87.cc Wed Sep 3 04:18:06 2014 UTC
@@ -178,8 +178,7 @@
     DCHECK(and_then == kFallThroughAtEnd);
     j(equal, &done, Label::kNear);
   }
-  StoreBufferOverflowStub store_buffer_overflow =
-      StoreBufferOverflowStub(isolate());
+  StoreBufferOverflowStub store_buffer_overflow(isolate());
   CallStub(&store_buffer_overflow);
   if (and_then == kReturnAtEnd) {
     ret(0);

--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to