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

Unified Diff: runtime/vm/assembler_arm.cc

Issue 1318003003: VM: Fix bug in ARM v5/v6 loading of immediates. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 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 | « runtime/vm/assembler_arm.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/assembler_arm.cc
diff --git a/runtime/vm/assembler_arm.cc b/runtime/vm/assembler_arm.cc
index 71a960831e0aff959f3d0d7829966d4a7599e2c9..e1198a3279afe48e8e55786f6a1fed72e5b7aba2 100644
--- a/runtime/vm/assembler_arm.cc
+++ b/runtime/vm/assembler_arm.cc
@@ -2708,7 +2708,7 @@ void Assembler::BranchLink(const ExternalLabel* label, Patchability patchable) {
// use 'blx ip' in a non-patchable sequence (see other BranchLink flavors).
const int32_t offset = ObjectPool::element_offset(
object_pool_wrapper_.FindExternalLabel(label, patchable));
- LoadWordFromPoolOffset(LR, offset - kHeapObjectTag);
+ LoadWordFromPoolOffset(LR, offset - kHeapObjectTag, AL);
blx(LR); // Use blx instruction so that the return branch prediction works.
}
@@ -2761,7 +2761,7 @@ void Assembler::LoadDecodableImmediate(
if ((version == ARMv5TE) || (version == ARMv6)) {
if (constant_pool_allowed()) {
const int32_t offset = Array::element_offset(FindImmediate(value));
- LoadWordFromPoolOffset(rd, offset - kHeapObjectTag);
+ LoadWordFromPoolOffset(rd, offset - kHeapObjectTag, cond);
} else {
LoadPatchableImmediate(rd, value, cond);
}
« no previous file with comments | « runtime/vm/assembler_arm.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698