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

Unified Diff: runtime/vm/stub_code_arm.cc

Issue 27588004: Fixes a bug in runtime call stub on arm and mips. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 2 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 | « no previous file | runtime/vm/stub_code_mips.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/stub_code_arm.cc
===================================================================
--- runtime/vm/stub_code_arm.cc (revision 28802)
+++ runtime/vm/stub_code_arm.cc (working copy)
@@ -40,7 +40,7 @@
const intptr_t argv_offset = NativeArguments::argv_offset();
const intptr_t retval_offset = NativeArguments::retval_offset();
- __ EnterFrame((1 << FP) | (1 << LR), 0);
+ __ EnterStubFrame();
// Load current Isolate pointer from Context structure into R0.
__ ldr(R0, FieldAddress(CTX, Context::isolate_offset()));
@@ -73,7 +73,8 @@
ASSERT(argv_offset == 2 * kWordSize);
__ add(R2, FP, ShifterOperand(R4, LSL, 2)); // Compute argv.
- __ AddImmediate(R2, kWordSize); // Set argv in NativeArguments.
+ // Set argv in NativeArguments.
+ __ AddImmediate(R2, kParamEndSlotFromFp * kWordSize);
ASSERT(retval_offset == 3 * kWordSize);
__ add(R3, R2, ShifterOperand(kWordSize)); // Retval is next to 1st argument.
@@ -95,7 +96,7 @@
// Cache Context pointer into CTX while executing Dart code.
__ mov(CTX, ShifterOperand(R2));
- __ LeaveFrame((1 << FP) | (1 << LR));
+ __ LeaveStubFrame();
__ Ret();
}
« no previous file with comments | « no previous file | runtime/vm/stub_code_mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698