Revision: 22755
Author:   [email protected]
Date:     Thu Jul 31 12:07:30 2014 UTC
Log:      Unify InstanceofStub interface descriptors.

[email protected]

Review URL: https://codereview.chromium.org/437483003
http://code.google.com/p/v8/source/detail?r=22755

Modified:
 /branches/bleeding_edge/src/arm/code-stubs-arm.cc
 /branches/bleeding_edge/src/arm64/code-stubs-arm64.cc
 /branches/bleeding_edge/src/code-stubs.cc
 /branches/bleeding_edge/src/code-stubs.h
 /branches/bleeding_edge/src/compiler/js-generic-lowering.cc
 /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc
 /branches/bleeding_edge/src/mips/code-stubs-mips.cc
 /branches/bleeding_edge/src/x64/code-stubs-x64.cc

=======================================
--- /branches/bleeding_edge/src/arm/code-stubs-arm.cc Wed Jul 30 13:54:45 2014 UTC +++ /branches/bleeding_edge/src/arm/code-stubs-arm.cc Thu Jul 31 12:07:30 2014 UTC
@@ -76,17 +76,10 @@
   Register registers[] = { cp, r2, r3 };
   descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
 }
-
-
-void InstanceofStub::InitializeInterfaceDescriptor(
-    Isolate* isolate, CodeStubInterfaceDescriptor* descriptor) {
-  Register registers[] = {cp, left(), right()};
-  descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
-}


 void CallFunctionStub::InitializeInterfaceDescriptor(
-    Isolate* isolate, CodeStubInterfaceDescriptor* descriptor) {
+    CodeStubInterfaceDescriptor* descriptor) {
   // r1  function    the function to call
   Register registers[] = {cp, r1};
   descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
@@ -94,7 +87,7 @@


 void CallConstructStub::InitializeInterfaceDescriptor(
-    Isolate* isolate, CodeStubInterfaceDescriptor* descriptor) {
+    CodeStubInterfaceDescriptor* descriptor) {
   // r0 : number of arguments
   // r1 : the function to call
   // r2 : feedback vector
=======================================
--- /branches/bleeding_edge/src/arm64/code-stubs-arm64.cc Wed Jul 30 13:54:45 2014 UTC +++ /branches/bleeding_edge/src/arm64/code-stubs-arm64.cc Thu Jul 31 12:07:30 2014 UTC
@@ -95,17 +95,10 @@
   Register registers[] = { cp, x2, x3 };
   descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
 }
-
-
-void InstanceofStub::InitializeInterfaceDescriptor(
-    Isolate* isolate, CodeStubInterfaceDescriptor* descriptor) {
-  Register registers[] = {cp, left(), right()};
-  descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
-}


 void CallFunctionStub::InitializeInterfaceDescriptor(
-    Isolate* isolate, CodeStubInterfaceDescriptor* descriptor) {
+    CodeStubInterfaceDescriptor* descriptor) {
   // x1  function    the function to call
   Register registers[] = {cp, x1};
   descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
@@ -113,7 +106,7 @@


 void CallConstructStub::InitializeInterfaceDescriptor(
-    Isolate* isolate, CodeStubInterfaceDescriptor* descriptor) {
+    CodeStubInterfaceDescriptor* descriptor) {
   // x0 : number of arguments
   // x1 : the function to call
   // x2 : feedback vector
=======================================
--- /branches/bleeding_edge/src/code-stubs.cc   Wed Jul 30 13:54:45 2014 UTC
+++ /branches/bleeding_edge/src/code-stubs.cc   Thu Jul 31 12:07:30 2014 UTC
@@ -662,6 +662,15 @@
   descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers,
                          FUNCTION_ADDR(StoreIC_MissFromStubFailure));
 }
+
+
+void InstanceofStub::InitializeInterfaceDescriptor(
+    CodeStubInterfaceDescriptor* descriptor) {
+  Register registers[] = { InterfaceDescriptor::ContextRegister(),
+                           InstanceofStub::left(),
+                           InstanceofStub::right() };
+  descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
+}


 void LoadDictionaryElementPlatformStub::Generate(MacroAssembler* masm) {
=======================================
--- /branches/bleeding_edge/src/code-stubs.h    Thu Jul 31 07:50:26 2014 UTC
+++ /branches/bleeding_edge/src/code-stubs.h    Thu Jul 31 12:07:30 2014 UTC
@@ -747,7 +747,7 @@
   void Generate(MacroAssembler* masm);

   virtual void InitializeInterfaceDescriptor(
-      Isolate* isolate, CodeStubInterfaceDescriptor* descriptor);
+      CodeStubInterfaceDescriptor* descriptor);

  private:
   Major MajorKey() const { return Instanceof; }
@@ -1628,7 +1628,7 @@
   }

   virtual void InitializeInterfaceDescriptor(
-      Isolate* isolate, CodeStubInterfaceDescriptor* descriptor);
+      CodeStubInterfaceDescriptor* descriptor);

  private:
   int argc_;
@@ -1670,7 +1670,7 @@
   }

   virtual void InitializeInterfaceDescriptor(
-      Isolate* isolate, CodeStubInterfaceDescriptor* descriptor);
+      CodeStubInterfaceDescriptor* descriptor);

  private:
   CallConstructorFlags flags_;
=======================================
--- /branches/bleeding_edge/src/compiler/js-generic-lowering.cc Thu Jul 31 11:20:36 2014 UTC +++ /branches/bleeding_edge/src/compiler/js-generic-lowering.cc Thu Jul 31 12:07:30 2014 UTC
@@ -24,7 +24,7 @@
                                                            T* stub) {
   CodeStub::Major key = static_cast<CodeStub*>(stub)->MajorKey();
CodeStubInterfaceDescriptor* d = isolate->code_stub_interface_descriptor(key);
-  stub->InitializeInterfaceDescriptor(isolate, d);
+  stub->InitializeInterfaceDescriptor(d);
   return d;
 }

=======================================
--- /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc Wed Jul 30 13:54:45 2014 UTC +++ /branches/bleeding_edge/src/ia32/code-stubs-ia32.cc Thu Jul 31 12:07:30 2014 UTC
@@ -82,24 +82,17 @@
   Register registers[] = { esi, ebx, edx };
   descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
 }
-
-
-void InstanceofStub::InitializeInterfaceDescriptor(
-    Isolate* isolate, CodeStubInterfaceDescriptor* descriptor) {
-  Register registers[] = {esi, left(), right()};
-  descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
-}


 void CallFunctionStub::InitializeInterfaceDescriptor(
-    Isolate* isolate, CodeStubInterfaceDescriptor* descriptor) {
+    CodeStubInterfaceDescriptor* descriptor) {
   Register registers[] = {esi, edi};
   descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
 }


 void CallConstructStub::InitializeInterfaceDescriptor(
-    Isolate* isolate, CodeStubInterfaceDescriptor* descriptor) {
+    CodeStubInterfaceDescriptor* descriptor) {
   // eax : number of arguments
   // ebx : feedback vector
   // edx : (only if ebx is not the megamorphic symbol) slot in feedback
=======================================
--- /branches/bleeding_edge/src/mips/code-stubs-mips.cc Wed Jul 30 13:54:45 2014 UTC +++ /branches/bleeding_edge/src/mips/code-stubs-mips.cc Thu Jul 31 12:07:30 2014 UTC
@@ -77,22 +77,16 @@
   Register registers[] = { cp, a2, a3 };
   descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
 }
-
-
-void InstanceofStub::InitializeInterfaceDescriptor(
-    Isolate* isolate, CodeStubInterfaceDescriptor* descriptor) {
-  UNIMPLEMENTED();
-}


 void CallFunctionStub::InitializeInterfaceDescriptor(
-    Isolate* isolate, CodeStubInterfaceDescriptor* descriptor) {
+    CodeStubInterfaceDescriptor* descriptor) {
   UNIMPLEMENTED();
 }


 void CallConstructStub::InitializeInterfaceDescriptor(
-    Isolate* isolate, CodeStubInterfaceDescriptor* descriptor) {
+    CodeStubInterfaceDescriptor* descriptor) {
   UNIMPLEMENTED();
 }

=======================================
--- /branches/bleeding_edge/src/x64/code-stubs-x64.cc Wed Jul 30 13:54:45 2014 UTC +++ /branches/bleeding_edge/src/x64/code-stubs-x64.cc Thu Jul 31 12:07:30 2014 UTC
@@ -78,24 +78,17 @@
   Register registers[] = { rsi, rbx, rdx };
   descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
 }
-
-
-void InstanceofStub::InitializeInterfaceDescriptor(
-    Isolate* isolate, CodeStubInterfaceDescriptor* descriptor) {
-  Register registers[] = {rsi, left(), right()};
-  descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
-}


 void CallFunctionStub::InitializeInterfaceDescriptor(
-    Isolate* isolate, CodeStubInterfaceDescriptor* descriptor) {
+    CodeStubInterfaceDescriptor* descriptor) {
   Register registers[] = {rsi, rdi};
   descriptor->Initialize(MajorKey(), ARRAY_SIZE(registers), registers);
 }


 void CallConstructStub::InitializeInterfaceDescriptor(
-    Isolate* isolate, CodeStubInterfaceDescriptor* descriptor) {
+    CodeStubInterfaceDescriptor* descriptor) {
   // rax : number of arguments
   // rbx : feedback vector
   // rdx : (only if rbx is not the megamorphic symbol) slot in feedback

--
--
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