Load runtime entries from the Thread instead of the ObjectPool.

runtime/vm/runtime_entry_mips.cc

Index: runtime/vm/runtime_entry_mips.cc
diff --git a/runtime/vm/runtime_entry_mips.cc b/runtime/vm/runtime_entry_mips.cc
index e4a5dbf7017e9d267ae8dba9844e1b0dae967641..31970fea7b4b693a784b515d0318b36a609ff5b1 100644
--- a/runtime/vm/runtime_entry_mips.cc
+++ b/runtime/vm/runtime_entry_mips.cc
@@ -16,38 +16,43 @@ namespace dart {
 #define __ assembler->
 
 
-// Generate code to call into the stub which will call the runtime
-// function. Input for the stub is as follows:
-//   SP : points to the arguments and return value array.
-//   S5 : address of the runtime function to call.
-//   S4 : number of arguments to the call.
-void RuntimeEntry::Call(Assembler* assembler, intptr_t argument_count) const {
+uword RuntimeEntry::GetEntryPoint() const {
   // Compute the effective address. When running under the simulator,
   // this is a redirection address that forces the simulator to call
   // into the runtime system.
-  uword entry = GetEntryPoint();
+  uword entry = reinterpret_cast<uword>(function());
 #if defined(USING_SIMULATOR)
   // Redirection to leaf runtime calls supports a maximum of 4 arguments passed
   // in registers (maximum 2 double arguments for leaf float runtime calls).
-  ASSERT(argument_count >= 0);
+  ASSERT(argument_count() >= 0);
   ASSERT(!is_leaf() ||
-         (!is_float() && (argument_count <= 4)) ||
-         (argument_count <= 2));
+         (!is_float() && (argument_count() <= 4)) ||
+         (argument_count() <= 2));
   Simulator::CallKind call_kind =
       is_leaf() ? (is_float() ? Simulator::kLeafFloatRuntimeCall
                               : Simulator::kLeafRuntimeCall)
                 : Simulator::kRuntimeCall;
   entry =
-      Simulator::RedirectExternalReference(entry, call_kind, argument_count);
+      Simulator::RedirectExternalReference(entry, call_kind, argument_count());
 #endif
-  ExternalLabel label(entry);
+  return entry;
+}
+
+
+// Generate code to call into the stub which will call the runtime
+// function. Input for the stub is as follows:
+//   SP : points to the arguments and return value array.
+//   S5 : address of the runtime function to call.
+//   S4 : number of arguments to the call.
+void RuntimeEntry::Call(Assembler* assembler, intptr_t argument_count) const {
   if (is_leaf()) {
     ASSERT(argument_count == this->argument_count());
-    __ BranchLink(&label, kNotPatchable);
+    __ lw(T9, Address(THR, Thread::OffsetFromThread(this)));

[Florian Schneider, 2015/08/31 06:51:56]

The offset may exceed the maximum that fits into the Address operand. 

[rmacnak, 2015/08/31 18:24:24]

This CL brings the 32-bit sizeof(Thread) to 276, versus the 4096/65536 we can
address with a simple load-word in ARM/MIPS.

[Florian Schneider, 2015/09/01 06:19:05]

Ok, seems there is room. Please make sure that there are assertions in place
about the max offset.

+    __ jalr(T9);
   } else {
     // Argument count is not checked here, but in the runtime entry for a more
     // informative error message.
-    __ LoadExternalLabel(S5, &label, kNotPatchable);
+    __ lw(S5, Address(THR, Thread::OffsetFromThread(this)));
     __ LoadImmediate(S4, argument_count);
     __ BranchLink(*StubCode::CallToRuntime_entry(), kNotPatchable);
   }