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

Unified Diff: runtime/vm/assembler_arm.cc

Issue 1043263002: Adds armv5 build and test target. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 5 years, 9 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 | « pkg/pkg.status ('k') | tests/language/language.status » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/assembler_arm.cc
===================================================================
--- runtime/vm/assembler_arm.cc (revision 44804)
+++ runtime/vm/assembler_arm.cc (working copy)
@@ -3270,11 +3270,10 @@
// optimized function and there may be extra space for spill slots to
// allocate. We must also set up the pool pointer for the function.
void Assembler::EnterOsrFrame(intptr_t extra_size) {
- // The offset for the PC marker is adjusted by the difference in PC offset
- // between stores and other instructions. In particular, on some ARMv5's the
- // PC offset for stores is 12 and the offset in other instructions is 8.
- const intptr_t offset = CodeSize() -
- (TargetCPUFeatures::store_pc_read_offset() - Instr::kPCReadOffset);
+ // mov(IP, Operand(PC)) loads PC + Instr::kPCReadOffset (8). This may be
+ // different from EntryPointToPcMarkerOffset().
+ const intptr_t offset =
+ CodeSize() + Instr::kPCReadOffset - EntryPointToPcMarkerOffset();
Comment("EnterOsrFrame");
mov(IP, Operand(PC));
« no previous file with comments | « pkg/pkg.status ('k') | tests/language/language.status » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698