Remove isolate pointer from context objects.

runtime/vm/stub_code_mips.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_MIPS)
 
 #include "vm/assembler.h"
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
@@ skipping 30 matching lines @@
   const intptr_t exitframe_last_param_slot_from_fp = 2;
 
   __ SetPrologueOffset();
   __ TraceSimMsg("CallToRuntimeStub");
   __ addiu(SP, SP, Immediate(-3 * kWordSize));
   __ sw(ZR, Address(SP, 2 * kWordSize));  // Push 0 for the PC marker
   __ sw(RA, Address(SP, 1 * kWordSize));
   __ sw(FP, Address(SP, 0 * kWordSize));
   __ mov(FP, SP);
 
-  // Load current Isolate pointer from Context structure into A0.
-  __ lw(A0, FieldAddress(CTX, Context::isolate_offset()));
+  __ LoadIsolate(A0);
 
   // Save exit frame information to enable stack walking as we are about
   // to transition to Dart VM C++ code.
   __ sw(SP, Address(A0, Isolate::top_exit_frame_info_offset()));
 
   // Save current Context pointer into Isolate structure.
   __ sw(CTX, Address(A0, Isolate::top_context_offset()));
 
   // Cache Isolate pointer into CTX while executing runtime code.
   __ mov(CTX, A0);
@@ skipping 104 matching lines @@
   const intptr_t retval_offset = NativeArguments::retval_offset();
 
   __ SetPrologueOffset();
   __ TraceSimMsg("CallNativeCFunctionStub");
   __ addiu(SP, SP, Immediate(-3 * kWordSize));
   __ sw(ZR, Address(SP, 2 * kWordSize));  // Push 0 for the PC marker
   __ sw(RA, Address(SP, 1 * kWordSize));
   __ sw(FP, Address(SP, 0 * kWordSize));
   __ mov(FP, SP);
 
-  // Load current Isolate pointer from Context structure into A0.
-  __ lw(A0, FieldAddress(CTX, Context::isolate_offset()));
+  __ LoadIsolate(A0);
 
   // Save exit frame information to enable stack walking as we are about
   // to transition to native code.
   __ sw(SP, Address(A0, Isolate::top_exit_frame_info_offset()));
 
   // Save current Context pointer into Isolate structure.
   __ sw(CTX, Address(A0, Isolate::top_context_offset()));
 
   // Cache Isolate pointer into CTX while executing native code.
   __ mov(CTX, A0);
@@ skipping 93 matching lines @@
   const intptr_t retval_offset = NativeArguments::retval_offset();
 
   __ SetPrologueOffset();
   __ TraceSimMsg("CallNativeCFunctionStub");
   __ addiu(SP, SP, Immediate(-3 * kWordSize));
   __ sw(ZR, Address(SP, 2 * kWordSize));  // Push 0 for the PC marker
   __ sw(RA, Address(SP, 1 * kWordSize));
   __ sw(FP, Address(SP, 0 * kWordSize));
   __ mov(FP, SP);
 
-  // Load current Isolate pointer from Context structure into A0.
-  __ lw(A0, FieldAddress(CTX, Context::isolate_offset()));
+  __ LoadIsolate(A0);
 
   // Save exit frame information to enable stack walking as we are about
   // to transition to native code.
   __ sw(SP, Address(A0, Isolate::top_exit_frame_info_offset()));
 
   // Save current Context pointer into Isolate structure.
   __ sw(CTX, Address(A0, Isolate::top_context_offset()));
 
   // Cache Isolate pointer into CTX while executing native code.
   __ mov(CTX, A0);
@@ skipping 786 matching lines @@
     // T2: size and bit tags.
     __ LoadImmediate(TMP, RawObject::ClassIdTag::encode(cid));
     __ or_(T2, T2, TMP);
     __ sw(T2, FieldAddress(V0, Context::tags_offset()));
 
     // Setup up number of context variables field.
     // V0: new object.
     // T1: number of context variables as integer value (not object).
     __ sw(T1, FieldAddress(V0, Context::num_variables_offset()));
 
-    // Setup isolate field.
-    // V0: new object.
-    // T1: number of context variables.
-    // T2: isolate, not an object.
-    __ LoadIsolate(T2);
-    __ sw(T2, FieldAddress(V0, Context::isolate_offset()));
-
     __ LoadImmediate(T7, reinterpret_cast<intptr_t>(Object::null()));
 
     // Initialize the context variables.
     // V0: new object.
     // T1: number of context variables.
     Label loop, loop_exit;
     __ blez(T1, &loop_exit);
     // Setup the parent field.
     __ delay_slot()->sw(T7, FieldAddress(V0, Context::parent_offset()));
     __ AddImmediate(T3, V0, Context::variable_offset(0) - kHeapObjectTag);
@@ skipping 815 matching lines @@
   __ LeaveStubFrame();
   __ jr(T0);
 }
 
 
 // Called only from unoptimized code. All relevant registers have been saved.
 // RA: return address.
 void StubCode::GenerateDebugStepCheckStub(Assembler* assembler) {
   // Check single stepping.
   Label stepping, done_stepping;
-  __ lw(T0, FieldAddress(CTX, Context::isolate_offset()));
+  __ LoadIsolate(T0);
   __ lbu(T0, Address(T0, Isolate::single_step_offset()));
   __ BranchNotEqual(T0, Immediate(0), &stepping);
   __ Bind(&done_stepping);
 
   __ Ret();
 
   // Call single step callback in debugger.
   __ Bind(&stepping);
   __ EnterStubFrame();
   __ addiu(SP, SP, Immediate(-1 * kWordSize));
@@ skipping 268 matching lines @@
 
 // Called only from unoptimized code. All relevant registers have been saved.
 // RA: return address.
 // SP + 4: left operand.
 // SP + 0: right operand.
 // Returns: CMPRES1 is zero if equal, non-zero otherwise.
 void StubCode::GenerateUnoptimizedIdenticalWithNumberCheckStub(
     Assembler* assembler) {
   // Check single stepping.
   Label stepping, done_stepping;
-  __ lw(T0, FieldAddress(CTX, Context::isolate_offset()));
+  __ LoadIsolate(T0);
   __ lbu(T0, Address(T0, Isolate::single_step_offset()));
   __ BranchNotEqual(T0, Immediate(0), &stepping);
   __ Bind(&done_stepping);
 
   const Register temp1 = T2;
   const Register temp2 = T3;
   const Register left = T1;
   const Register right = T0;
   __ lw(left, Address(SP, 1 * kWordSize));
   __ lw(right, Address(SP, 0 * kWordSize));
@@ skipping 25 matching lines @@
   const Register right = T0;
   __ lw(left, Address(SP, 1 * kWordSize));
   __ lw(right, Address(SP, 0 * kWordSize));
   GenerateIdenticalWithNumberCheckStub(assembler, left, right, temp1, temp2);
   __ Ret();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_MIPS