VM: Load common VM constants from Thread on ARM and MIPS.

runtime/vm/assembler_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"  // NOLINT
 #if defined(TARGET_ARCH_MIPS)
 
 #include "vm/assembler.h"
 #include "vm/longjump.h"
 #include "vm/runtime_entry.h"
@@ skipping 441 matching lines @@
     xor_(ro, rd, rs);
     xor_(TMP, rs, rt);
     and_(ro, TMP, ro);
   }
 }
 
 
 void Assembler::LoadObjectHelper(Register rd,
                                  const Object& object,
                                  bool is_unique) {
+  // Load common VM constants from the thread. This works also in places where
+  // no constant pool is set up (e.g. intrinsic code).
+  if (Thread::CanLoadFromThread(object)) {
+    lw(rd, Address(THR, Thread::OffsetFromThread(object)));
+    return;
+  }
   ASSERT(!in_delay_slot_);
   // Smis and VM heap objects are never relocated; do not use object pool.
   if (object.IsSmi()) {
     LoadImmediate(rd, reinterpret_cast<int32_t>(object.raw()));
   } else if (object.InVMHeap() || !allow_constant_pool()) {

[koda, 2015/07/08 14:50:34]

Oh, we actually have the check here, so I guess it's not too expensive then. So,
I again suggest adding it to OffsetFromThread

[Florian Schneider, 2015/07/09 08:50:36]

Done.

     // Make sure that class CallPattern is able to decode this load immediate.
     int32_t object_raw = reinterpret_cast<int32_t>(object.raw());
     const uint16_t object_low = Utils::Low16Bits(object_raw);
     const uint16_t object_high = Utils::High16Bits(object_raw);
     lui(rd, Immediate(object_high));
     ori(rd, rd, Immediate(object_low));
   } else {
     // Make sure that class CallPattern is able to decode this load from the
     // object pool.
     const int32_t offset = ObjectPool::element_offset(
@@ skipping 84 matching lines @@
     // Preserve T0.
     addiu(SP, SP, Immediate(-2 * kWordSize));
     sw(T0, Address(SP, 1 * kWordSize));
   } else {
     addiu(SP, SP, Immediate(-1 * kWordSize));
   }
   sw(RA, Address(SP, 0 * kWordSize));
   if (object != T0) {
     mov(T0, object);
   }
-  StubCode* stub_code = Isolate::Current()->stub_code();
-  BranchLink(&stub_code->UpdateStoreBufferLabel());
+  lw(T9, Address(THR, Thread::update_store_buffer_entry_point_offset()));
+  jalr(T9);
   lw(RA, Address(SP, 0 * kWordSize));
   if (value != T0) {
     // Restore T0.
     lw(T0, Address(SP, 1 * kWordSize));
     addiu(SP, SP, Immediate(2 * kWordSize));
   } else {
     addiu(SP, SP, Immediate(1 * kWordSize));
   }
   Bind(&done);
 }
@@ skipping 653 matching lines @@
   Label stop;
   b(&stop);
   Emit(reinterpret_cast<int32_t>(message));
   Bind(&stop);
   break_(Instr::kStopMessageCode);
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_MIPS