| Index: src/ic/mips64/ic-mips64.cc
|
| diff --git a/src/ic/mips64/ic-mips64.cc b/src/ic/mips64/ic-mips64.cc
|
| index d995b8af0681af5266b5975638a52b20489fbca3..fd23f3283e2026a088f3612749384513fa8fe086 100644
|
| --- a/src/ic/mips64/ic-mips64.cc
|
| +++ b/src/ic/mips64/ic-mips64.cc
|
| @@ -250,8 +250,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));
|
|
|
| @@ -268,14 +268,14 @@ 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;
|
|
|
| - __ ld(dictionary, FieldMemOperand(LoadConvention::ReceiverRegister(),
|
| + __ ld(dictionary, FieldMemOperand(LoadDescriptor::ReceiverRegister(),
|
| JSObject::kPropertiesOffset));
|
| GenerateDictionaryLoad(masm, &slow, dictionary,
|
| - LoadConvention::NameRegister(), v0, a3, a4);
|
| + LoadDescriptor::NameRegister(), v0, a3, a4);
|
| __ Ret();
|
|
|
| // Dictionary load failed, go slow (but don't miss).
|
| @@ -294,8 +294,8 @@ void LoadIC::GenerateMiss(MacroAssembler* masm) {
|
|
|
| __ IncrementCounter(isolate->counters()->keyed_load_miss(), 1, a3, a4);
|
|
|
| - __ 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);
|
| @@ -306,8 +306,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);
|
| }
|
| @@ -392,8 +392,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));
|
|
|
| @@ -417,9 +417,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;
|
| @@ -456,7 +456,7 @@ void KeyedLoadIC::GenerateMiss(MacroAssembler* masm) {
|
|
|
| __ IncrementCounter(isolate->counters()->keyed_load_miss(), 1, a3, a4);
|
|
|
| - __ Push(LoadConvention::ReceiverRegister(), LoadConvention::NameRegister());
|
| + __ Push(LoadDescriptor::ReceiverRegister(), LoadDescriptor::NameRegister());
|
|
|
| // Perform tail call to the entry.
|
| ExternalReference ref =
|
| @@ -469,7 +469,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);
|
| }
|
| @@ -480,8 +480,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));
|
|
|
| @@ -647,8 +647,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));
|
| @@ -832,9 +832,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 = a6;
|
| @@ -918,8 +918,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 = a4;
|
| DCHECK(!scratch1.is(receiver) && !scratch1.is(key));
|
| @@ -956,8 +956,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());
|
| @@ -966,11 +966,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(
|
| @@ -984,8 +984,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());
|
| @@ -995,9 +995,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(!AreAliased(value, receiver, name, dictionary, a4, a5));
|
|
|
|
|