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

Unified Diff: runtime/vm/intermediate_language_arm.cc

Issue 14925005: Remove stack_frame_<arch>.cc files. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 7 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/flow_graph_compiler_x64.cc ('k') | runtime/vm/intermediate_language_ia32.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/intermediate_language_arm.cc
===================================================================
--- runtime/vm/intermediate_language_arm.cc (revision 22469)
+++ runtime/vm/intermediate_language_arm.cc (working copy)
@@ -87,7 +87,7 @@
Label stack_ok;
__ Comment("Stack Check");
const intptr_t fp_sp_dist =
- (kFirstLocalSlotIndex + 1 - compiler->StackSize()) * kWordSize;
+ (kFirstLocalSlotFromFp + 1 - compiler->StackSize()) * kWordSize;
ASSERT(fp_sp_dist <= 0);
__ sub(R2, SP, ShifterOperand(FP));
__ CompareImmediate(R2, fp_sp_dist);
@@ -800,10 +800,10 @@
__ PushObject(Object::ZoneHandle());
// Pass a pointer to the first argument in R2.
if (!function().HasOptionalParameters()) {
- __ AddImmediate(R2, FP, (kLastParamSlotIndex +
- function().NumParameters() - 1) * kWordSize);
+ __ AddImmediate(R2, FP, (kParamEndSlotFromFp +
+ function().NumParameters()) * kWordSize);
} else {
- __ AddImmediate(R2, FP, kFirstLocalSlotIndex * kWordSize);
+ __ AddImmediate(R2, FP, kFirstLocalSlotFromFp * kWordSize);
}
// Compute the effective address. When running under the simulator,
// this is a redirection address that forces the simulator to call
@@ -1728,7 +1728,7 @@
// Restore SP from FP as we are coming from a throw and the code for
// popping arguments has not been run.
const intptr_t fp_sp_dist =
- (kFirstLocalSlotIndex + 1 - compiler->StackSize()) * kWordSize;
+ (kFirstLocalSlotFromFp + 1 - compiler->StackSize()) * kWordSize;
ASSERT(fp_sp_dist <= 0);
__ AddImmediate(SP, FP, fp_sp_dist);
« no previous file with comments | « runtime/vm/flow_graph_compiler_x64.cc ('k') | runtime/vm/intermediate_language_ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698