| Index: src/arm/lithium-codegen-arm.cc
|
| diff --git a/src/arm/lithium-codegen-arm.cc b/src/arm/lithium-codegen-arm.cc
|
| index 6d920a395da3b1dcc79d1a913f33849ee7226c43..f5a84c5af8d51314069a1fd1d60b7c63ff438583 100644
|
| --- a/src/arm/lithium-codegen-arm.cc
|
| +++ b/src/arm/lithium-codegen-arm.cc
|
| @@ -2994,11 +2994,11 @@ template <class T>
|
| void LCodeGen::EmitVectorLoadICRegisters(T* instr) {
|
| DCHECK(FLAG_vector_ics);
|
| Register vector = ToRegister(instr->temp_vector());
|
| - DCHECK(vector.is(FullVectorLoadConvention::VectorRegister()));
|
| + DCHECK(vector.is(VectorLoadICDescriptor::VectorRegister()));
|
| __ Move(vector, instr->hydrogen()->feedback_vector());
|
| // No need to allocate this register.
|
| - DCHECK(FullVectorLoadConvention::SlotRegister().is(r0));
|
| - __ mov(FullVectorLoadConvention::SlotRegister(),
|
| + DCHECK(VectorLoadICDescriptor::SlotRegister().is(r0));
|
| + __ mov(VectorLoadICDescriptor::SlotRegister(),
|
| Operand(Smi::FromInt(instr->hydrogen()->slot())));
|
| }
|
|
|
| @@ -3006,10 +3006,10 @@ void LCodeGen::EmitVectorLoadICRegisters(T* instr) {
|
| void LCodeGen::DoLoadGlobalGeneric(LLoadGlobalGeneric* instr) {
|
| DCHECK(ToRegister(instr->context()).is(cp));
|
| DCHECK(ToRegister(instr->global_object())
|
| - .is(LoadConvention::ReceiverRegister()));
|
| + .is(LoadDescriptor::ReceiverRegister()));
|
| DCHECK(ToRegister(instr->result()).is(r0));
|
|
|
| - __ mov(LoadConvention::NameRegister(), Operand(instr->name()));
|
| + __ mov(LoadDescriptor::NameRegister(), Operand(instr->name()));
|
| if (FLAG_vector_ics) {
|
| EmitVectorLoadICRegisters<LLoadGlobalGeneric>(instr);
|
| }
|
| @@ -3128,11 +3128,11 @@ void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) {
|
|
|
| void LCodeGen::DoLoadNamedGeneric(LLoadNamedGeneric* instr) {
|
| DCHECK(ToRegister(instr->context()).is(cp));
|
| - DCHECK(ToRegister(instr->object()).is(LoadConvention::ReceiverRegister()));
|
| + DCHECK(ToRegister(instr->object()).is(LoadDescriptor::ReceiverRegister()));
|
| DCHECK(ToRegister(instr->result()).is(r0));
|
|
|
| // Name is always in r2.
|
| - __ mov(LoadConvention::NameRegister(), Operand(instr->name()));
|
| + __ mov(LoadDescriptor::NameRegister(), Operand(instr->name()));
|
| if (FLAG_vector_ics) {
|
| EmitVectorLoadICRegisters<LLoadNamedGeneric>(instr);
|
| }
|
| @@ -3420,8 +3420,8 @@ MemOperand LCodeGen::PrepareKeyedOperand(Register key,
|
|
|
| void LCodeGen::DoLoadKeyedGeneric(LLoadKeyedGeneric* instr) {
|
| DCHECK(ToRegister(instr->context()).is(cp));
|
| - DCHECK(ToRegister(instr->object()).is(LoadConvention::ReceiverRegister()));
|
| - DCHECK(ToRegister(instr->key()).is(LoadConvention::NameRegister()));
|
| + DCHECK(ToRegister(instr->object()).is(LoadDescriptor::ReceiverRegister()));
|
| + DCHECK(ToRegister(instr->key()).is(LoadDescriptor::NameRegister()));
|
|
|
| if (FLAG_vector_ics) {
|
| EmitVectorLoadICRegisters<LLoadKeyedGeneric>(instr);
|
| @@ -3979,7 +3979,7 @@ void LCodeGen::DoCallWithDescriptor(LCallWithDescriptor* instr) {
|
| Handle<Code> code = Handle<Code>::cast(ToHandle(target));
|
| generator.BeforeCall(__ CallSize(code, RelocInfo::CODE_TARGET));
|
| PlatformInterfaceDescriptor* call_descriptor =
|
| - instr->descriptor()->platform_specific_descriptor();
|
| + instr->descriptor().platform_specific_descriptor();
|
| __ Call(code, RelocInfo::CODE_TARGET, TypeFeedbackId::None(), al,
|
| call_descriptor->storage_mode());
|
| } else {
|
| @@ -4199,10 +4199,10 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) {
|
|
|
| void LCodeGen::DoStoreNamedGeneric(LStoreNamedGeneric* instr) {
|
| DCHECK(ToRegister(instr->context()).is(cp));
|
| - DCHECK(ToRegister(instr->object()).is(StoreConvention::ReceiverRegister()));
|
| - DCHECK(ToRegister(instr->value()).is(StoreConvention::ValueRegister()));
|
| + DCHECK(ToRegister(instr->object()).is(StoreDescriptor::ReceiverRegister()));
|
| + DCHECK(ToRegister(instr->value()).is(StoreDescriptor::ValueRegister()));
|
|
|
| - __ mov(StoreConvention::NameRegister(), Operand(instr->name()));
|
| + __ mov(StoreDescriptor::NameRegister(), Operand(instr->name()));
|
| Handle<Code> ic = StoreIC::initialize_stub(isolate(), instr->strict_mode());
|
| CallCode(ic, RelocInfo::CODE_TARGET, instr, NEVER_INLINE_TARGET_ADDRESS);
|
| }
|
| @@ -4420,9 +4420,9 @@ void LCodeGen::DoStoreKeyed(LStoreKeyed* instr) {
|
|
|
| void LCodeGen::DoStoreKeyedGeneric(LStoreKeyedGeneric* instr) {
|
| DCHECK(ToRegister(instr->context()).is(cp));
|
| - DCHECK(ToRegister(instr->object()).is(StoreConvention::ReceiverRegister()));
|
| - DCHECK(ToRegister(instr->key()).is(StoreConvention::NameRegister()));
|
| - DCHECK(ToRegister(instr->value()).is(StoreConvention::ValueRegister()));
|
| + DCHECK(ToRegister(instr->object()).is(StoreDescriptor::ReceiverRegister()));
|
| + DCHECK(ToRegister(instr->key()).is(StoreDescriptor::NameRegister()));
|
| + DCHECK(ToRegister(instr->value()).is(StoreDescriptor::ValueRegister()));
|
|
|
| Handle<Code> ic = instr->strict_mode() == STRICT
|
| ? isolate()->builtins()->KeyedStoreIC_Initialize_Strict()
|
|
|