| Index: src/codegen-arm.cc
|
| ===================================================================
|
| --- src/codegen-arm.cc (revision 1066)
|
| +++ src/codegen-arm.cc (working copy)
|
| @@ -4028,9 +4028,9 @@
|
| __ b(ne, &continue_exception);
|
|
|
| // Retrieve the pending exception and clear the variable.
|
| - __ mov(ip, Operand(Factory::the_hole_value().location()));
|
| + __ mov(ip, Operand(ExternalReference::the_hole_value_location()));
|
| __ ldr(r3, MemOperand(ip));
|
| - __ mov(ip, Operand(Top::pending_exception_address()));
|
| + __ mov(ip, Operand(ExternalReference(Top::k_pending_exception_address)));
|
| __ ldr(r0, MemOperand(ip));
|
| __ str(r3, MemOperand(ip));
|
|
|
| @@ -4160,7 +4160,7 @@
|
| // exception field in the JSEnv and return a failure sentinel.
|
| // Coming in here the fp will be invalid because the PushTryHandler below
|
| // sets it to 0 to signal the existence of the JSEntry frame.
|
| - __ mov(ip, Operand(Top::pending_exception_address()));
|
| + __ mov(ip, Operand(ExternalReference(Top::k_pending_exception_address)));
|
| __ str(r0, MemOperand(ip));
|
| __ mov(r0, Operand(reinterpret_cast<int32_t>(Failure::Exception())));
|
| __ b(&exit);
|
| @@ -4177,7 +4177,7 @@
|
| // Clear any pending exceptions.
|
| __ mov(ip, Operand(ExternalReference::the_hole_value_location()));
|
| __ ldr(r5, MemOperand(ip));
|
| - __ mov(ip, Operand(Top::pending_exception_address()));
|
| + __ mov(ip, Operand(ExternalReference(Top::k_pending_exception_address)));
|
| __ str(r5, MemOperand(ip));
|
|
|
| // Invoke the function by calling through JS entry trampoline builtin.
|
|
|