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
parent 9420c278
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
namespace v8 { namespace v8 {
namespace internal { namespace internal {
const Register InterfaceDescriptor::ContextRegister() { return cp; } const Register CallInterfaceDescriptor::ContextRegister() { return cp; }
void CallDescriptors::InitializeForIsolate(Isolate* isolate) { void CallDescriptors::InitializeForIsolate(Isolate* isolate) {
......
...@@ -1087,7 +1087,7 @@ LInstruction* LChunkBuilder::DoCallJSFunction( ...@@ -1087,7 +1087,7 @@ LInstruction* LChunkBuilder::DoCallJSFunction(
LInstruction* LChunkBuilder::DoCallWithDescriptor( LInstruction* LChunkBuilder::DoCallWithDescriptor(
HCallWithDescriptor* instr) { HCallWithDescriptor* instr) {
const InterfaceDescriptor* descriptor = instr->descriptor(); const CallInterfaceDescriptor* descriptor = instr->descriptor();
LOperand* target = UseRegisterOrConstantAtStart(instr->target()); LOperand* target = UseRegisterOrConstantAtStart(instr->target());
ZoneList<LOperand*> ops(instr->OperandCount(), zone()); ZoneList<LOperand*> ops(instr->OperandCount(), zone());
......
...@@ -1837,18 +1837,17 @@ class LCallJSFunction V8_FINAL : public LTemplateInstruction<1, 1, 0> { ...@@ -1837,18 +1837,17 @@ class LCallJSFunction V8_FINAL : public LTemplateInstruction<1, 1, 0> {
class LCallWithDescriptor V8_FINAL : public LTemplateResultInstruction<1> { class LCallWithDescriptor V8_FINAL : public LTemplateResultInstruction<1> {
public: public:
LCallWithDescriptor(const InterfaceDescriptor* descriptor, LCallWithDescriptor(const CallInterfaceDescriptor* descriptor,
const ZoneList<LOperand*>& operands, const ZoneList<LOperand*>& operands, Zone* zone)
Zone* zone) : descriptor_(descriptor),
: descriptor_(descriptor), inputs_(descriptor->GetRegisterParameterCount() + 1, zone) {
inputs_(descriptor->GetRegisterParameterCount() + 1, zone) {
DCHECK(descriptor->GetRegisterParameterCount() + 1 == operands.length()); DCHECK(descriptor->GetRegisterParameterCount() + 1 == operands.length());
inputs_.AddAll(operands, zone); inputs_.AddAll(operands, zone);
} }
LOperand* target() const { return inputs_[0]; } LOperand* target() const { return inputs_[0]; }
const InterfaceDescriptor* descriptor() { return descriptor_; } const CallInterfaceDescriptor* descriptor() { return descriptor_; }
private: private:
DECLARE_CONCRETE_INSTRUCTION(CallWithDescriptor, "call-with-descriptor") DECLARE_CONCRETE_INSTRUCTION(CallWithDescriptor, "call-with-descriptor")
...@@ -1858,7 +1857,7 @@ class LCallWithDescriptor V8_FINAL : public LTemplateResultInstruction<1> { ...@@ -1858,7 +1857,7 @@ class LCallWithDescriptor V8_FINAL : public LTemplateResultInstruction<1> {
int arity() const { return hydrogen()->argument_count() - 1; } int arity() const { return hydrogen()->argument_count() - 1; }
const InterfaceDescriptor* descriptor_; const CallInterfaceDescriptor* descriptor_;
ZoneList<LOperand*> inputs_; ZoneList<LOperand*> inputs_;
// Iterator support. // Iterator support.
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
namespace v8 { namespace v8 {
namespace internal { namespace internal {
const Register InterfaceDescriptor::ContextRegister() { return cp; } const Register CallInterfaceDescriptor::ContextRegister() { return cp; }
void CallDescriptors::InitializeForIsolate(Isolate* isolate) { void CallDescriptors::InitializeForIsolate(Isolate* isolate) {
......
...@@ -1087,7 +1087,7 @@ LInstruction* LChunkBuilder::DoCallJSFunction( ...@@ -1087,7 +1087,7 @@ LInstruction* LChunkBuilder::DoCallJSFunction(
LInstruction* LChunkBuilder::DoCallWithDescriptor( LInstruction* LChunkBuilder::DoCallWithDescriptor(
HCallWithDescriptor* instr) { HCallWithDescriptor* instr) {
const InterfaceDescriptor* descriptor = instr->descriptor(); const CallInterfaceDescriptor* descriptor = instr->descriptor();
LOperand* target = UseRegisterOrConstantAtStart(instr->target()); LOperand* target = UseRegisterOrConstantAtStart(instr->target());
ZoneList<LOperand*> ops(instr->OperandCount(), zone()); ZoneList<LOperand*> ops(instr->OperandCount(), zone());
......
...@@ -1836,18 +1836,17 @@ class LCallJSFunction V8_FINAL : public LTemplateInstruction<1, 1, 0> { ...@@ -1836,18 +1836,17 @@ class LCallJSFunction V8_FINAL : public LTemplateInstruction<1, 1, 0> {
class LCallWithDescriptor V8_FINAL : public LTemplateResultInstruction<1> { class LCallWithDescriptor V8_FINAL : public LTemplateResultInstruction<1> {
public: public:
LCallWithDescriptor(const InterfaceDescriptor* descriptor, LCallWithDescriptor(const CallInterfaceDescriptor* descriptor,
const ZoneList<LOperand*>& operands, const ZoneList<LOperand*>& operands, Zone* zone)
Zone* zone) : descriptor_(descriptor),
: descriptor_(descriptor), inputs_(descriptor->GetRegisterParameterCount() + 1, zone) {
inputs_(descriptor->GetRegisterParameterCount() + 1, zone) {
DCHECK(descriptor->GetRegisterParameterCount() + 1 == operands.length()); DCHECK(descriptor->GetRegisterParameterCount() + 1 == operands.length());
inputs_.AddAll(operands, zone); inputs_.AddAll(operands, zone);
} }
LOperand* target() const { return inputs_[0]; } LOperand* target() const { return inputs_[0]; }
const InterfaceDescriptor* descriptor() { return descriptor_; } const CallInterfaceDescriptor* descriptor() { return descriptor_; }
private: private:
DECLARE_CONCRETE_INSTRUCTION(CallWithDescriptor, "call-with-descriptor") DECLARE_CONCRETE_INSTRUCTION(CallWithDescriptor, "call-with-descriptor")
...@@ -1857,7 +1856,7 @@ class LCallWithDescriptor V8_FINAL : public LTemplateResultInstruction<1> { ...@@ -1857,7 +1856,7 @@ class LCallWithDescriptor V8_FINAL : public LTemplateResultInstruction<1> {
int arity() const { return hydrogen()->argument_count() - 1; } int arity() const { return hydrogen()->argument_count() - 1; }
const InterfaceDescriptor* descriptor_; const CallInterfaceDescriptor* descriptor_;
ZoneList<LOperand*> inputs_; ZoneList<LOperand*> inputs_;
// Iterator support. // Iterator support.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment