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

Unified Diff: runtime/vm/simulator_arm.cc

Issue 14784011: Fixes for integer division on ARM hardware so that assembler tests pass. (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
« runtime/vm/disassembler_arm.cc ('K') | « runtime/vm/disassembler_arm.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/simulator_arm.cc
===================================================================
--- runtime/vm/simulator_arm.cc (revision 22334)
+++ runtime/vm/simulator_arm.cc (working copy)
@@ -1482,7 +1482,7 @@
break;
}
case 7: {
- if (instr->Bits(21, 2) == 0x1) {
+ if ((instr->Bits(21, 2) == 0x1) && (instr->ConditionField() == AL)) {
// Format(instr, "bkpt'cond #'imm12_4");
regis 2013/05/07 17:14:35 Remove 'cond.
zra 2013/05/07 17:50:18 Done.
SimulatorDebugger dbg(this);
set_pc(get_pc() + Instr::kInstrSize);
@@ -2067,12 +2067,12 @@
void Simulator::DoDivision(Instr* instr) {
ASSERT(CPUFeatures::integer_division_supported());
- Register rd = instr->RdField();
- Register rn = instr->RnField();
- Register rm = instr->RmField();
+ Register rd = instr->DivRdField();
+ Register rn = instr->DivRnField();
+ Register rm = instr->DivRmField();
- // TODO(zra): Does the hardware trap on divide-by-zero?
- // Revisit when we test on ARM hardware.
+ // ARMv7-a does not trap on divide-by-zero. The destination register is just
+ // set to 0.
if (get_register(rm) == 0) {
set_register(rd, 0);
return;
« runtime/vm/disassembler_arm.cc ('K') | « runtime/vm/disassembler_arm.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698