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

Unified Diff: runtime/vm/assembler_arm.cc

Issue 14605006: Allows "Hello, world!" to run on ARM hardware. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 8 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
Index: runtime/vm/assembler_arm.cc
===================================================================
--- runtime/vm/assembler_arm.cc (revision 22334)
+++ runtime/vm/assembler_arm.cc (working copy)
@@ -569,6 +569,7 @@
void Assembler::stm(BlockAddressMode am, Register base, RegList regs,
Condition cond) {
+ ASSERT(regs != 0);
EmitMultiMemOp(cond, am, false, base, regs);
}
@@ -1155,9 +1156,9 @@
}
-void Assembler::bkpt(uint16_t imm16, Condition cond) {
- ASSERT(cond != kNoCondition);
- int32_t encoding = (cond << kConditionShift) | B24 | B21 |
+void Assembler::bkpt(uint16_t imm16) {
+ // bkpt requires that the cond field is AL.
+ int32_t encoding = (AL << kConditionShift) | B24 | B21 |
((imm16 >> 4) << 8) | B6 | B5 | B4 | (imm16 & 0xf);
Emit(encoding);
}

Powered by Google App Engine
This is Rietveld 408576698