Adds vstm, vldm to ARM simulator, assembler, disassembler

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 278 matching lines @@
     int reg = instr->SmField();
     if (format[2] == '1') {  // 'sm1: S[m+1] register
       reg++;
       ASSERT(reg < kNumberOfSRegisters);
       PrintSRegister(reg);
       return 3;
     } else {  // 'sm: Sm register
       PrintSRegister(reg);
       return 2;
     }
+  } else if (format[1] == 'l') {
+    ASSERT(STRING_STARTS_WITH(format, "slist"));
+    int regs = instr->Bits(0, 8);

[regis, 2013/03/04 17:25:40]

reg_count?

+    int start = instr->Bit(22) | (instr->Bits(12, 4) << 1);
+    Print("{");
+    for (int i = start; i < start + regs; i++) {
+      PrintSRegister(i);
+      if (i != start + regs - 1) {
+        Print(", ");
+      }
+    }
+    Print("}");
+    return 5;
   }
   UNREACHABLE();
   return -1;
 }
 
 
 int ARMDecoder::FormatDRegister(Instr* instr, const char* format) {
   ASSERT(format[0] == 'd');
   if (format[1] == 'n') {  // 'dn: Dn register
     int reg = instr->DnField();
     PrintDRegister(reg);
     return 2;
   } else if (format[1] == 'd') {  // 'dd: Dd register
     int reg = instr->DdField();
     PrintDRegister(reg);
     return 2;
   } else if (format[1] == 'm') {  // 'dm: Dm register
     int reg = instr->DmField();
     PrintDRegister(reg);
     return 2;
+  } else if (format[1] == 'l') {
+    ASSERT(STRING_STARTS_WITH(format, "dlist"));
+    int regs = instr->Bits(0, 8) >> 1;
+    int start = (instr->Bit(22) << 4) | instr->Bits(12, 4);
+    Print("{");
+    for (int i = start; i < start + regs; i++) {
+      PrintDRegister(i);
+      if (i != start + regs - 1) {
+        Print(", ");
+      }
+    }
+    Print("}");
+    return 5;
   }
   UNREACHABLE();
   return -1;
 }
 
 
 // FormatOption takes a formatting string and interprets it based on
 // the current instructions. The format string points to the first
 // character of the option string (the option escape has already been
 // consumed by the caller.)  FormatOption returns the number of
@@ skipping 584 matching lines @@
           Format(instr, "vldrd'cond 'dd, ['rn, #-'off10]");
         }
       } else {  // vstrd
         if (instr->Bit(23) == 1) {
           Format(instr, "vstrd'cond 'dd, ['rn, #+'off10]");
         } else {
           Format(instr, "vstrd'cond 'dd, ['rn, #-'off10]");
         }
       }
     }
+  } else if (instr->IsVFPMultipleLoadStore()) {
+    if (instr->HasL()) {  // vldm
+      if (instr->Bit(8)) {  // vldmd
+        Format(instr, "vldmd'cond'pu 'rn'w, 'dlist");
+      } else {  // vldms
+        Format(instr, "vldms'cond'pu 'rn'w, 'slist");
+      }
+    } else {  // vstm
+      if (instr->Bit(8)) {  // vstmd
+        Format(instr, "vstmd'cond'pu 'rn'w, 'dlist");
+      } else {  // vstms
+        Format(instr, "vstms'cond'pu 'rn'w, 'slist");
+      }
+    }
   } else {
     Unknown(instr);
   }
 }
 
 
 void ARMDecoder::DecodeType7(Instr* instr) {
   if (instr->Bit(24) == 1) {
     Format(instr, "svc'cond #'svc");
     if (instr->SvcField() == kStopMessageSvcCode) {
@@ skipping 312 matching lines @@
                                   human_buffer,
                                   sizeof(human_buffer),
                                   pc);
     pc += instruction_length;
   }
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM