Index: runtime/vm/stub_code_arm.cc |
=================================================================== |
--- runtime/vm/stub_code_arm.cc (revision 40623) |
+++ runtime/vm/stub_code_arm.cc (working copy) |
@@ -766,7 +766,7 @@ |
__ ldr(CTX, Address(R3, VMHandles::kOffsetOfRawPtrInHandle)); |
// Load Isolate pointer into temporary register R8. |
- __ LoadImmediate(R8, Isolate::CurrentAddress()); |
+ __ LoadIsolate(R8); |
// Save the current VMTag on the stack. |
ASSERT(kSavedVMTagSlotFromEntryFp == -25); |
@@ -833,7 +833,7 @@ |
__ AddImmediate(SP, FP, kSavedContextSlotFromEntryFp * kWordSize); |
// Load Isolate pointer into CTX. Drop Context. |
- __ LoadImmediate(CTX, Isolate::CurrentAddress()); |
+ __ LoadIsolate(CTX); |
// Restore the saved Context pointer into the Isolate structure. |
// Uses R4 as a temporary register for this. |
@@ -937,7 +937,7 @@ |
// Load Isolate pointer into R2. |
// R0: new object. |
// R1: number of context variables. |
- __ LoadImmediate(R2, Isolate::CurrentAddress()); |
+ __ LoadIsolate(R2); |
// R2: isolate, not an object. |
__ str(R2, FieldAddress(R0, Context::isolate_offset())); |
@@ -1008,7 +1008,7 @@ |
// Load the isolate. |
// Spilled: R1, R2, R3. |
// R0: address being stored. |
- __ LoadImmediate(R1, Isolate::CurrentAddress()); |
+ __ LoadIsolate(R1); |
// Load the StoreBuffer block out of the isolate. Then load top_ out of the |
// StoreBufferBlock and add the address to the pointers_. |
@@ -1035,7 +1035,7 @@ |
// Setup frame, push callee-saved registers. |
__ EnterCallRuntimeFrame(0 * kWordSize); |
- __ LoadImmediate(R0, Isolate::CurrentAddress()); |
+ __ LoadIsolate(R0); |
__ CallRuntime(kStoreBufferBlockProcessRuntimeEntry, 1); |
// Restore callee-saved registers, tear down frame. |
__ LeaveCallRuntimeFrame(); |
@@ -1338,7 +1338,7 @@ |
// Check single stepping. |
Label stepping, done_stepping; |
- __ LoadImmediate(R6, Isolate::CurrentAddress()); |
+ __ LoadIsolate(R6); |
__ ldrb(R6, Address(R6, Isolate::single_step_offset())); |
__ CompareImmediate(R6, 0); |
__ b(&stepping, NE); |
@@ -1559,7 +1559,7 @@ |
// Check single stepping. |
Label stepping, done_stepping; |
- __ LoadImmediate(R6, Isolate::CurrentAddress()); |
+ __ LoadIsolate(R6); |
__ ldrb(R6, Address(R6, Isolate::single_step_offset())); |
__ CompareImmediate(R6, 0); |
__ b(&stepping, NE); |