Fixes for integer division on ARM hardware so that assembler tests pass.

runtime/vm/disassembler_arm.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/disassembler.h"
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_ARM.
 #if defined(TARGET_ARCH_ARM)
 #include "platform/assert.h"
 
@@ skipping 583 matching lines @@
         case 3: {
           if (instr->Bits(21, 2) == 0x1) {
             Format(instr, "blx'cond 'rm");
           } else {
             // Could be inlined constant.
             Unknown(instr);
           }
           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.

           } else {
              // Format(instr, "smc'cond");
             Unknown(instr);  // Not used.
           }
           break;
         }
         default: {
           Unknown(instr);  // Not used.
           break;
         }
@@ skipping 238 matching lines @@
       UNREACHABLE();
       break;
     }
   }
 }
 
 
 void ARMDecoder::DecodeType3(Instr* instr) {
   if (instr->IsDivision()) {
     if (instr->Bit(21)) {
-      Format(instr, "udiv'cond 'rd, 'rn, 'rm");
+      Format(instr, "udiv'cond 'rn, 'rs, 'rm");
     } else {
-      Format(instr, "sdiv'cond 'rd, 'rn, 'rm");
+      Format(instr, "sdiv'cond 'rn, 'rs, 'rm");
     }
     return;
   }
   switch (instr->PUField()) {
     case 0: {
       if (instr->HasW()) {
         Unknown(instr);
       } else {
         Format(instr, "'memop'cond'b 'rd, ['rn], -'shift_rm");
       }
@@ skipping 429 matching lines @@
                                   human_buffer,
                                   sizeof(human_buffer),
                                   pc);
     pc += instruction_length;
   }
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM