Chromium Code Reviews| Index: src/arm/stub-cache-arm.cc |
| diff --git a/src/arm/stub-cache-arm.cc b/src/arm/stub-cache-arm.cc |
| index 1c772eec81152d77ade1e95a7ebe1135d93210fb..8dcf3df6fcd2476d42d205baa1ea4aab1e184215 100644 |
| --- a/src/arm/stub-cache-arm.cc |
| +++ b/src/arm/stub-cache-arm.cc |
| @@ -1265,16 +1265,16 @@ Register* LoadStubCompiler::registers() { |
| // receiver, name, scratch1, scratch2, scratch3, scratch4. |
| Register receiver = LoadIC::ReceiverRegister(); |
| Register name = LoadIC::NameRegister(); |
| - static Register registers[] = { receiver, name, r3, r1, r4, r5 }; |
| + static Register registers[] = { receiver, name, r3, r0, r4, r5 }; |
| return registers; |
| } |
| Register* KeyedLoadStubCompiler::registers() { |
| // receiver, name, scratch1, scratch2, scratch3, scratch4. |
| - Register receiver = KeyedLoadIC::ReceiverRegister(); |
| - Register name = KeyedLoadIC::NameRegister(); |
| - static Register registers[] = { receiver, name, r2, r3, r4, r5 }; |
| + Register receiver = LoadIC::ReceiverRegister(); |
| + Register name = LoadIC::NameRegister(); |
| + static Register registers[] = { receiver, name, r3, r0, r4, r5 }; |
| return registers; |
| } |
| @@ -1476,19 +1476,19 @@ void KeyedLoadStubCompiler::GenerateLoadDictionaryElement( |
| MacroAssembler* masm) { |
| // ---------- S t a t e -------------- |
| // -- lr : return address |
|
Jakob Kummerow
2014/06/30 14:12:45
another comment that we an trim to just this line.
mvstanton
2014/06/30 14:59:00
Done.
|
| - // -- r0 : key |
| + // -- r2 : key |
| // -- r1 : receiver |
| // ----------------------------------- |
| - ASSERT(r1.is(KeyedLoadIC::ReceiverRegister())); |
| - ASSERT(r0.is(KeyedLoadIC::NameRegister())); |
| Label slow, miss; |
| - Register key = r0; |
| - Register receiver = r1; |
| + Register key = LoadIC::NameRegister(); |
| + Register receiver = LoadIC::ReceiverRegister(); |
| + ASSERT(receiver.is(r1)); |
| + ASSERT(key.is(r2)); |
| - __ UntagAndJumpIfNotSmi(r2, key, &miss); |
| + __ UntagAndJumpIfNotSmi(r6, key, &miss); |
| __ ldr(r4, FieldMemOperand(receiver, JSObject::kElementsOffset)); |
| - __ LoadFromNumberDictionary(&slow, r4, key, r0, r2, r3, r5); |
| + __ LoadFromNumberDictionary(&slow, r4, key, r0, r6, r3, r5); |
| __ Ret(); |
| __ bind(&slow); |