- Remove Isolate::CurrentAddress().

runtime/vm/stub_code_ia32.cc

Index: runtime/vm/stub_code_ia32.cc
===================================================================
--- runtime/vm/stub_code_ia32.cc	(revision 40623)
+++ runtime/vm/stub_code_ia32.cc	(working copy)
@@ -773,7 +773,7 @@
   __ movl(CTX, Address(EBP, kNewContextOffset));
   __ movl(CTX, Address(CTX, VMHandles::kOffsetOfRawPtrInHandle));
 
-  __ movl(EDI, Immediate(Isolate::CurrentAddress()));
+  __ LoadIsolate(EDI);
 
   // Save the current VMTag on the stack.
   ASSERT(kSavedVMTagSlotFromEntryFp == -4);
@@ -860,7 +860,7 @@
   __ leal(ESP, Address(ESP, EDX, TIMES_2, 0));  // EDX is a Smi.
 
   // Load Isolate pointer into CTX. Drop Context.
-  __ movl(CTX, Immediate(Isolate::CurrentAddress()));
+  __ LoadIsolate(CTX);
 
   // Restore the saved Context pointer into the Isolate structure.
   __ popl(Address(CTX, Isolate::top_context_offset()));
@@ -1043,7 +1043,7 @@
   // Load the isolate.
   // Spilled: EDX, ECX
   // EAX: Address being stored
-  __ movl(EDX, Immediate(Isolate::CurrentAddress()));
+  __ LoadIsolate(EDX);
 
   // Load the StoreBuffer block out of the isolate. Then load top_ out of the
   // StoreBufferBlock and add the address to the pointers_.
@@ -1074,7 +1074,7 @@
   // Setup frame, push callee-saved registers.
 
   __ EnterCallRuntimeFrame(1 * kWordSize);
-  __ movl(EAX, Immediate(Isolate::CurrentAddress()));
+  __ LoadIsolate(EAX);
   __ movl(Address(ESP, 0), EAX);  // Push the isolate as the only argument.
   __ CallRuntime(kStoreBufferBlockProcessRuntimeEntry, 1);
   // Restore callee-saved registers, tear down frame.
@@ -1381,8 +1381,8 @@
 
   // Check single stepping.
   Label stepping, done_stepping;
-  uword single_step_address =
-      Isolate::CurrentAddress() + Isolate::single_step_offset();
+  uword single_step_address = reinterpret_cast<uword>(Isolate::Current()) +
+      Isolate::single_step_offset();
   __ cmpb(Address::Absolute(single_step_address), Immediate(0));
   __ j(NOT_EQUAL, &stepping);
   __ Bind(&done_stepping);
@@ -1619,8 +1619,8 @@
 #endif  // DEBUG
   // Check single stepping.
   Label stepping, done_stepping;
-  uword single_step_address =
-      Isolate::CurrentAddress() + Isolate::single_step_offset();
+  uword single_step_address = reinterpret_cast<uword>(Isolate::Current()) +
+      Isolate::single_step_offset();
   __ cmpb(Address::Absolute(single_step_address), Immediate(0));
   __ j(NOT_EQUAL, &stepping, Assembler::kNearJump);
   __ Bind(&done_stepping);