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

Unified Diff: src/arm/code-stubs-arm.cc

Issue 7633014: Do not use deprecated ARM instructions in DirectCEntryStub::GenerateCall. (Closed) Base URL: http://v8.googlecode.com/svn/branches/bleeding_edge/
Patch Set: '' Created 9 years, 4 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 | src/arm/deoptimizer-arm.cc » ('j') | src/arm/deoptimizer-arm.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/arm/code-stubs-arm.cc
===================================================================
--- src/arm/code-stubs-arm.cc (revision 8912)
+++ src/arm/code-stubs-arm.cc (working copy)
@@ -6319,7 +6319,9 @@
RelocInfo::CODE_TARGET));
__ mov(r2, Operand(function));
// Push return address (accessible to GC through exit frame pc).
- __ str(pc, MemOperand(sp, 0));
+ // Note that using pc with str is deprecated.
+ __ add(ip, pc, Operand(4));
m.m.capewell 2011/08/12 11:50:54 Replace 4 with kInstrSize, and assert on the size
+ __ str(ip, MemOperand(sp, 0));
__ Jump(r2); // Call the api function.
}
@@ -6329,7 +6331,9 @@
__ mov(lr, Operand(reinterpret_cast<intptr_t>(GetCode().location()),
RelocInfo::CODE_TARGET));
// Push return address (accessible to GC through exit frame pc).
- __ str(pc, MemOperand(sp, 0));
+ // Note that using pc with str is deprecated.
+ __ add(ip, pc, Operand(4));
m.m.capewell 2011/08/12 11:50:54 As above.
+ __ str(ip, MemOperand(sp, 0));
__ Jump(target); // Call the C++ function.
}
« no previous file with comments | « no previous file | src/arm/deoptimizer-arm.cc » ('j') | src/arm/deoptimizer-arm.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698