From 7260ff8138aad5e560cc0a12df46a92cdf9c5962 Mon Sep 17 00:00:00 2001 From: "balazs.kilvady@imgtec.com" Date: Mon, 1 Sep 2014 18:04:48 +0000 Subject: [PATCH] MIPS: InterfaceDescriptor becomes CallInterfaceDescriptor. Port r23560 (9a63ff6) Original commit message: There was no difference between these two classes in a hierarchical relationship. BUG= R=paul.lind@imgtec.com Review URL: https://codereview.chromium.org/530783003 git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@23574 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/mips/interface-descriptors-mips.cc | 2 +- src/mips/lithium-mips.cc | 2 +- src/mips/lithium-mips.h | 13 ++++++------- src/mips64/interface-descriptors-mips64.cc | 2 +- src/mips64/lithium-mips64.cc | 2 +- src/mips64/lithium-mips64.h | 13 ++++++------- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/mips/interface-descriptors-mips.cc b/src/mips/interface-descriptors-mips.cc index 41c451326d..d6d66ca1f3 100644 --- a/src/mips/interface-descriptors-mips.cc +++ b/src/mips/interface-descriptors-mips.cc @@ -11,7 +11,7 @@ namespace v8 { namespace internal { -const Register InterfaceDescriptor::ContextRegister() { return cp; } +const Register CallInterfaceDescriptor::ContextRegister() { return cp; } void CallDescriptors::InitializeForIsolate(Isolate* isolate) { diff --git a/src/mips/lithium-mips.cc b/src/mips/lithium-mips.cc index 7b4223da1f..9f302e730b 100644 --- a/src/mips/lithium-mips.cc +++ b/src/mips/lithium-mips.cc @@ -1087,7 +1087,7 @@ LInstruction* LChunkBuilder::DoCallJSFunction( LInstruction* LChunkBuilder::DoCallWithDescriptor( HCallWithDescriptor* instr) { - const InterfaceDescriptor* descriptor = instr->descriptor(); + const CallInterfaceDescriptor* descriptor = instr->descriptor(); LOperand* target = UseRegisterOrConstantAtStart(instr->target()); ZoneList ops(instr->OperandCount(), zone()); diff --git a/src/mips/lithium-mips.h b/src/mips/lithium-mips.h index 1fefe237b5..cbaba54692 100644 --- a/src/mips/lithium-mips.h +++ b/src/mips/lithium-mips.h @@ -1837,18 +1837,17 @@ class LCallJSFunction V8_FINAL : public LTemplateInstruction<1, 1, 0> { class LCallWithDescriptor V8_FINAL : public LTemplateResultInstruction<1> { public: - LCallWithDescriptor(const InterfaceDescriptor* descriptor, - const ZoneList& operands, - Zone* zone) - : descriptor_(descriptor), - inputs_(descriptor->GetRegisterParameterCount() + 1, zone) { + LCallWithDescriptor(const CallInterfaceDescriptor* descriptor, + const ZoneList& operands, Zone* zone) + : descriptor_(descriptor), + inputs_(descriptor->GetRegisterParameterCount() + 1, zone) { DCHECK(descriptor->GetRegisterParameterCount() + 1 == operands.length()); inputs_.AddAll(operands, zone); } LOperand* target() const { return inputs_[0]; } - const InterfaceDescriptor* descriptor() { return descriptor_; } + const CallInterfaceDescriptor* descriptor() { return descriptor_; } private: DECLARE_CONCRETE_INSTRUCTION(CallWithDescriptor, "call-with-descriptor") @@ -1858,7 +1857,7 @@ class LCallWithDescriptor V8_FINAL : public LTemplateResultInstruction<1> { int arity() const { return hydrogen()->argument_count() - 1; } - const InterfaceDescriptor* descriptor_; + const CallInterfaceDescriptor* descriptor_; ZoneList inputs_; // Iterator support. diff --git a/src/mips64/interface-descriptors-mips64.cc b/src/mips64/interface-descriptors-mips64.cc index 7b920c7470..11d94ffd41 100644 --- a/src/mips64/interface-descriptors-mips64.cc +++ b/src/mips64/interface-descriptors-mips64.cc @@ -11,7 +11,7 @@ namespace v8 { namespace internal { -const Register InterfaceDescriptor::ContextRegister() { return cp; } +const Register CallInterfaceDescriptor::ContextRegister() { return cp; } void CallDescriptors::InitializeForIsolate(Isolate* isolate) { diff --git a/src/mips64/lithium-mips64.cc b/src/mips64/lithium-mips64.cc index 8670cdff86..97c196164e 100644 --- a/src/mips64/lithium-mips64.cc +++ b/src/mips64/lithium-mips64.cc @@ -1087,7 +1087,7 @@ LInstruction* LChunkBuilder::DoCallJSFunction( LInstruction* LChunkBuilder::DoCallWithDescriptor( HCallWithDescriptor* instr) { - const InterfaceDescriptor* descriptor = instr->descriptor(); + const CallInterfaceDescriptor* descriptor = instr->descriptor(); LOperand* target = UseRegisterOrConstantAtStart(instr->target()); ZoneList ops(instr->OperandCount(), zone()); diff --git a/src/mips64/lithium-mips64.h b/src/mips64/lithium-mips64.h index 77e5b9c38d..0aae3f3f76 100644 --- a/src/mips64/lithium-mips64.h +++ b/src/mips64/lithium-mips64.h @@ -1836,18 +1836,17 @@ class LCallJSFunction V8_FINAL : public LTemplateInstruction<1, 1, 0> { class LCallWithDescriptor V8_FINAL : public LTemplateResultInstruction<1> { public: - LCallWithDescriptor(const InterfaceDescriptor* descriptor, - const ZoneList& operands, - Zone* zone) - : descriptor_(descriptor), - inputs_(descriptor->GetRegisterParameterCount() + 1, zone) { + LCallWithDescriptor(const CallInterfaceDescriptor* descriptor, + const ZoneList& operands, Zone* zone) + : descriptor_(descriptor), + inputs_(descriptor->GetRegisterParameterCount() + 1, zone) { DCHECK(descriptor->GetRegisterParameterCount() + 1 == operands.length()); inputs_.AddAll(operands, zone); } LOperand* target() const { return inputs_[0]; } - const InterfaceDescriptor* descriptor() { return descriptor_; } + const CallInterfaceDescriptor* descriptor() { return descriptor_; } private: DECLARE_CONCRETE_INSTRUCTION(CallWithDescriptor, "call-with-descriptor") @@ -1857,7 +1856,7 @@ class LCallWithDescriptor V8_FINAL : public LTemplateResultInstruction<1> { int arity() const { return hydrogen()->argument_count() - 1; } - const InterfaceDescriptor* descriptor_; + const CallInterfaceDescriptor* descriptor_; ZoneList inputs_; // Iterator support.