Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(343)

Unified Diff: runtime/vm/runtime_entry_mips.cc

Issue 1315893004: Load runtime entries from the Thread instead of the ObjectPool. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/runtime_entry_list.h ('k') | runtime/vm/runtime_entry_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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)));
+ __ 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);
}
« no previous file with comments | « runtime/vm/runtime_entry_list.h ('k') | runtime/vm/runtime_entry_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698