Index: src/ic/mips/ic-mips.cc |
diff --git a/src/ic/mips/ic-mips.cc b/src/ic/mips/ic-mips.cc |
index 1e01d4b9255b00a3410ac23150c17953d29c86ff..3b7f00362c60fe411c957da60e145c22f582ddae 100644 |
--- a/src/ic/mips/ic-mips.cc |
+++ b/src/ic/mips/ic-mips.cc |
@@ -251,8 +251,8 @@ static void GenerateKeyNameCheck(MacroAssembler* masm, Register key, |
void LoadIC::GenerateMegamorphic(MacroAssembler* masm) { |
// The return address is in lr. |
- Register receiver = LoadConvention::ReceiverRegister(); |
- Register name = LoadConvention::NameRegister(); |
+ Register receiver = LoadDescriptor::ReceiverRegister(); |
+ Register name = LoadDescriptor::NameRegister(); |
DCHECK(receiver.is(a1)); |
DCHECK(name.is(a2)); |
@@ -269,15 +269,15 @@ void LoadIC::GenerateMegamorphic(MacroAssembler* masm) { |
void LoadIC::GenerateNormal(MacroAssembler* masm) { |
Register dictionary = a0; |
- DCHECK(!dictionary.is(LoadConvention::ReceiverRegister())); |
- DCHECK(!dictionary.is(LoadConvention::NameRegister())); |
+ DCHECK(!dictionary.is(LoadDescriptor::ReceiverRegister())); |
+ DCHECK(!dictionary.is(LoadDescriptor::NameRegister())); |
Label slow; |
- __ lw(dictionary, FieldMemOperand(LoadConvention::ReceiverRegister(), |
+ __ lw(dictionary, FieldMemOperand(LoadDescriptor::ReceiverRegister(), |
JSObject::kPropertiesOffset)); |
GenerateDictionaryLoad(masm, &slow, dictionary, |
- LoadConvention::NameRegister(), v0, a3, t0); |
+ LoadDescriptor::NameRegister(), v0, a3, t0); |
__ Ret(); |
// Dictionary load failed, go slow (but don't miss). |
@@ -296,8 +296,8 @@ void LoadIC::GenerateMiss(MacroAssembler* masm) { |
__ IncrementCounter(isolate->counters()->keyed_load_miss(), 1, a3, t0); |
- __ mov(LoadIC_TempRegister(), LoadConvention::ReceiverRegister()); |
- __ Push(LoadIC_TempRegister(), LoadConvention::NameRegister()); |
+ __ mov(LoadIC_TempRegister(), LoadDescriptor::ReceiverRegister()); |
+ __ Push(LoadIC_TempRegister(), LoadDescriptor::NameRegister()); |
// Perform tail call to the entry. |
ExternalReference ref = ExternalReference(IC_Utility(kLoadIC_Miss), isolate); |
@@ -308,8 +308,8 @@ void LoadIC::GenerateMiss(MacroAssembler* masm) { |
void LoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) { |
// The return address is in ra. |
- __ mov(LoadIC_TempRegister(), LoadConvention::ReceiverRegister()); |
- __ Push(LoadIC_TempRegister(), LoadConvention::NameRegister()); |
+ __ mov(LoadIC_TempRegister(), LoadDescriptor::ReceiverRegister()); |
+ __ Push(LoadIC_TempRegister(), LoadDescriptor::NameRegister()); |
__ TailCallRuntime(Runtime::kGetProperty, 2, 1); |
} |
@@ -394,8 +394,8 @@ static MemOperand GenerateUnmappedArgumentsLookup(MacroAssembler* masm, |
void KeyedLoadIC::GenerateSloppyArguments(MacroAssembler* masm) { |
// The return address is in ra. |
- Register receiver = LoadConvention::ReceiverRegister(); |
- Register key = LoadConvention::NameRegister(); |
+ Register receiver = LoadDescriptor::ReceiverRegister(); |
+ Register key = LoadDescriptor::NameRegister(); |
DCHECK(receiver.is(a1)); |
DCHECK(key.is(a2)); |
@@ -419,9 +419,9 @@ void KeyedLoadIC::GenerateSloppyArguments(MacroAssembler* masm) { |
void KeyedStoreIC::GenerateSloppyArguments(MacroAssembler* masm) { |
- Register receiver = StoreConvention::ReceiverRegister(); |
- Register key = StoreConvention::NameRegister(); |
- Register value = StoreConvention::ValueRegister(); |
+ Register receiver = StoreDescriptor::ReceiverRegister(); |
+ Register key = StoreDescriptor::NameRegister(); |
+ Register value = StoreDescriptor::ValueRegister(); |
DCHECK(value.is(a0)); |
Label slow, notin; |
@@ -458,7 +458,7 @@ void KeyedLoadIC::GenerateMiss(MacroAssembler* masm) { |
__ IncrementCounter(isolate->counters()->keyed_load_miss(), 1, a3, t0); |
- __ Push(LoadConvention::ReceiverRegister(), LoadConvention::NameRegister()); |
+ __ Push(LoadDescriptor::ReceiverRegister(), LoadDescriptor::NameRegister()); |
// Perform tail call to the entry. |
ExternalReference ref = |
@@ -471,7 +471,7 @@ void KeyedLoadIC::GenerateMiss(MacroAssembler* masm) { |
void KeyedLoadIC::GenerateRuntimeGetProperty(MacroAssembler* masm) { |
// The return address is in ra. |
- __ Push(LoadConvention::ReceiverRegister(), LoadConvention::NameRegister()); |
+ __ Push(LoadDescriptor::ReceiverRegister(), LoadDescriptor::NameRegister()); |
__ TailCallRuntime(Runtime::kKeyedGetProperty, 2, 1); |
} |
@@ -482,8 +482,8 @@ void KeyedLoadIC::GenerateGeneric(MacroAssembler* masm) { |
Label slow, check_name, index_smi, index_name, property_array_property; |
Label probe_dictionary, check_number_dictionary; |
- Register key = LoadConvention::NameRegister(); |
- Register receiver = LoadConvention::ReceiverRegister(); |
+ Register key = LoadDescriptor::NameRegister(); |
+ Register receiver = LoadDescriptor::ReceiverRegister(); |
DCHECK(key.is(a2)); |
DCHECK(receiver.is(a1)); |
@@ -642,8 +642,8 @@ void KeyedLoadIC::GenerateString(MacroAssembler* masm) { |
// Return address is in ra. |
Label miss; |
- Register receiver = LoadConvention::ReceiverRegister(); |
- Register index = LoadConvention::NameRegister(); |
+ Register receiver = LoadDescriptor::ReceiverRegister(); |
+ Register index = LoadDescriptor::NameRegister(); |
Register scratch = a3; |
Register result = v0; |
DCHECK(!scratch.is(receiver) && !scratch.is(index)); |
@@ -823,9 +823,9 @@ void KeyedStoreIC::GenerateGeneric(MacroAssembler* masm, |
Label array, extra, check_if_double_array; |
// Register usage. |
- Register value = StoreConvention::ValueRegister(); |
- Register key = StoreConvention::NameRegister(); |
- Register receiver = StoreConvention::ReceiverRegister(); |
+ Register value = StoreDescriptor::ValueRegister(); |
+ Register key = StoreDescriptor::NameRegister(); |
+ Register receiver = StoreDescriptor::ReceiverRegister(); |
DCHECK(value.is(a0)); |
Register receiver_map = a3; |
Register elements_map = t2; |
@@ -909,8 +909,8 @@ void KeyedLoadIC::GenerateIndexedInterceptor(MacroAssembler* masm) { |
// Return address is in ra. |
Label slow; |
- Register receiver = LoadConvention::ReceiverRegister(); |
- Register key = LoadConvention::NameRegister(); |
+ Register receiver = LoadDescriptor::ReceiverRegister(); |
+ Register key = LoadDescriptor::NameRegister(); |
Register scratch1 = a3; |
Register scratch2 = t0; |
DCHECK(!scratch1.is(receiver) && !scratch1.is(key)); |
@@ -947,8 +947,8 @@ void KeyedLoadIC::GenerateIndexedInterceptor(MacroAssembler* masm) { |
void KeyedStoreIC::GenerateMiss(MacroAssembler* masm) { |
// Push receiver, key and value for runtime call. |
- __ Push(StoreConvention::ReceiverRegister(), StoreConvention::NameRegister(), |
- StoreConvention::ValueRegister()); |
+ __ Push(StoreDescriptor::ReceiverRegister(), StoreDescriptor::NameRegister(), |
+ StoreDescriptor::ValueRegister()); |
ExternalReference ref = |
ExternalReference(IC_Utility(kKeyedStoreIC_Miss), masm->isolate()); |
@@ -957,11 +957,11 @@ void KeyedStoreIC::GenerateMiss(MacroAssembler* masm) { |
void StoreIC::GenerateMegamorphic(MacroAssembler* masm) { |
- Register receiver = StoreConvention::ReceiverRegister(); |
- Register name = StoreConvention::NameRegister(); |
+ Register receiver = StoreDescriptor::ReceiverRegister(); |
+ Register name = StoreDescriptor::NameRegister(); |
DCHECK(receiver.is(a1)); |
DCHECK(name.is(a2)); |
- DCHECK(StoreConvention::ValueRegister().is(a0)); |
+ DCHECK(StoreDescriptor::ValueRegister().is(a0)); |
// Get the receiver from the stack and probe the stub cache. |
Code::Flags flags = Code::RemoveTypeAndHolderFromFlags( |
@@ -975,8 +975,8 @@ void StoreIC::GenerateMegamorphic(MacroAssembler* masm) { |
void StoreIC::GenerateMiss(MacroAssembler* masm) { |
- __ Push(StoreConvention::ReceiverRegister(), StoreConvention::NameRegister(), |
- StoreConvention::ValueRegister()); |
+ __ Push(StoreDescriptor::ReceiverRegister(), StoreDescriptor::NameRegister(), |
+ StoreDescriptor::ValueRegister()); |
// Perform tail call to the entry. |
ExternalReference ref = |
ExternalReference(IC_Utility(kStoreIC_Miss), masm->isolate()); |
@@ -986,9 +986,9 @@ void StoreIC::GenerateMiss(MacroAssembler* masm) { |
void StoreIC::GenerateNormal(MacroAssembler* masm) { |
Label miss; |
- Register receiver = StoreConvention::ReceiverRegister(); |
- Register name = StoreConvention::NameRegister(); |
- Register value = StoreConvention::ValueRegister(); |
+ Register receiver = StoreDescriptor::ReceiverRegister(); |
+ Register name = StoreDescriptor::NameRegister(); |
+ Register value = StoreDescriptor::ValueRegister(); |
Register dictionary = a3; |
DCHECK(receiver.is(a1)); |
DCHECK(name.is(a2)); |