Move register conventions out of the IC classes.

src/compiler/js-generic-lowering.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/code-stubs.h"
 #include "src/compiler/common-operator.h"
 #include "src/compiler/graph-inl.h"
 #include "src/compiler/js-generic-lowering.h"
 #include "src/compiler/machine-operator.h"
 #include "src/compiler/node-aux-data-inl.h"
@@ skipping 28 matching lines @@
     i::compiler::GetInterfaceDescriptor(isolate, this);
   }
 
   virtual Handle<Code> GenerateCode() V8_OVERRIDE {
     ExtraICState extra_state = LoadIC::ComputeExtraICState(contextual_mode_);
     return LoadIC::initialize_stub(isolate(), extra_state);
   }
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) V8_OVERRIDE {
-    Register registers[] = { InterfaceDescriptor::ContextRegister(),
-                             LoadIC::ReceiverRegister(),
-                             LoadIC::NameRegister() };
+    Register registers[] = {InterfaceDescriptor::ContextRegister(),
+                            LoadConvention::ReceiverRegister(),
+                            LoadConvention::NameRegister()};
     descriptor->Initialize(MajorKey(), arraysize(registers), registers);
   }
 
  private:
   virtual Major MajorKey() const V8_OVERRIDE { return NoCache; }
   virtual int NotMissMinorKey() const V8_OVERRIDE { return 0; }
   virtual bool UseSpecialCache() V8_OVERRIDE { return true; }
 
   ContextualMode contextual_mode_;
 };
 
 
 // TODO(mstarzinger): This is a temporary shim to be able to call an IC stub
 // which doesn't have an interface descriptor yet. It mimics a hydrogen code
 // stub for the underlying IC stub code.
 class KeyedLoadICStubShim : public HydrogenCodeStub {
  public:
   explicit KeyedLoadICStubShim(Isolate* isolate) : HydrogenCodeStub(isolate) {
     i::compiler::GetInterfaceDescriptor(isolate, this);
   }
 
   virtual Handle<Code> GenerateCode() V8_OVERRIDE {
     return isolate()->builtins()->KeyedLoadIC_Initialize();
   }
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) V8_OVERRIDE {
-    Register registers[] = { InterfaceDescriptor::ContextRegister(),
-                             KeyedLoadIC::ReceiverRegister(),
-                             KeyedLoadIC::NameRegister() };
+    Register registers[] = {InterfaceDescriptor::ContextRegister(),
+                            LoadConvention::ReceiverRegister(),
+                            LoadConvention::NameRegister()};
     descriptor->Initialize(MajorKey(), arraysize(registers), registers);
   }
 
  private:
   virtual Major MajorKey() const V8_OVERRIDE { return NoCache; }
   virtual int NotMissMinorKey() const V8_OVERRIDE { return 0; }
   virtual bool UseSpecialCache() V8_OVERRIDE { return true; }
 };
 
 
 // TODO(mstarzinger): This is a temporary shim to be able to call an IC stub
 // which doesn't have an interface descriptor yet. It mimics a hydrogen code
 // stub for the underlying IC stub code.
 class StoreICStubShim : public HydrogenCodeStub {
  public:
   StoreICStubShim(Isolate* isolate, StrictMode strict_mode)
       : HydrogenCodeStub(isolate), strict_mode_(strict_mode) {
     i::compiler::GetInterfaceDescriptor(isolate, this);
   }
 
   virtual Handle<Code> GenerateCode() V8_OVERRIDE {
     return StoreIC::initialize_stub(isolate(), strict_mode_);
   }
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) V8_OVERRIDE {
-    Register registers[] = { InterfaceDescriptor::ContextRegister(),
-                             StoreIC::ReceiverRegister(),
-                             StoreIC::NameRegister(),
-                             StoreIC::ValueRegister() };
+    Register registers[] = {InterfaceDescriptor::ContextRegister(),
+                            StoreConvention::ReceiverRegister(),
+                            StoreConvention::NameRegister(),
+                            StoreConvention::ValueRegister()};
     descriptor->Initialize(MajorKey(), arraysize(registers), registers);
   }
 
  private:
   virtual Major MajorKey() const V8_OVERRIDE { return NoCache; }
   virtual int NotMissMinorKey() const V8_OVERRIDE { return 0; }
   virtual bool UseSpecialCache() V8_OVERRIDE { return true; }
 
   StrictMode strict_mode_;
 };
@@ skipping 10 matching lines @@
   }
 
   virtual Handle<Code> GenerateCode() V8_OVERRIDE {
     return strict_mode_ == SLOPPY
                ? isolate()->builtins()->KeyedStoreIC_Initialize()
                : isolate()->builtins()->KeyedStoreIC_Initialize_Strict();
   }
 
   virtual void InitializeInterfaceDescriptor(
       CodeStubInterfaceDescriptor* descriptor) V8_OVERRIDE {
-    Register registers[] = { InterfaceDescriptor::ContextRegister(),
-                             KeyedStoreIC::ReceiverRegister(),
-                             KeyedStoreIC::NameRegister(),
-                             KeyedStoreIC::ValueRegister() };
+    Register registers[] = {InterfaceDescriptor::ContextRegister(),
+                            StoreConvention::ReceiverRegister(),
+                            StoreConvention::NameRegister(),
+                            StoreConvention::ValueRegister()};
     descriptor->Initialize(MajorKey(), arraysize(registers), registers);
   }
 
  private:
   virtual Major MajorKey() const V8_OVERRIDE { return NoCache; }
   virtual int NotMissMinorKey() const V8_OVERRIDE { return 0; }
   virtual bool UseSpecialCache() V8_OVERRIDE { return true; }
 
   StrictMode strict_mode_;
 };
@@ skipping 384 matching lines @@
 
 Node* JSGenericLowering::LowerJSCallRuntime(Node* node) {
   Runtime::FunctionId function = OpParameter<Runtime::FunctionId>(node);
   int arity = OperatorProperties::GetValueInputCount(node->op());
   ReplaceWithRuntimeCall(node, function, arity);
   return node;
 }
 }
 }
 }  // namespace v8::internal::compiler