Use UnboxedInt32 and UnboxedUint32 representation for LoadIndexedInstr

runtime/vm/simulator_arm64.cc

 // Copyright (c) 2014, 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 <setjmp.h>
 #include <stdlib.h>
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_ARM64)
 
@@ skipping 2731 matching lines @@
   }
 }
 
 
 void Simulator::DecodeFPIntCvt(Instr* instr) {
   const VRegister vd = instr->VdField();
   const VRegister vn = instr->VnField();
   const Register rd = instr->RdField();
   const Register rn = instr->RnField();
 
-  if ((instr->SFField() != 1) || (instr->Bit(29) != 0) ||
-      (instr->Bits(22, 2) != 1)) {
+  if ((instr->Bit(29) != 0) || (instr->Bits(22, 2) != 1)) {
     UnimplementedInstruction(instr);
     return;
   }
   if (instr->Bits(16, 5) == 2) {
-    // Format(instr, "scvtfd 'vd, 'vn");
-    const int64_t rn_val = get_register(rn, instr->RnMode());
-    const double vn_dbl = static_cast<double>(rn_val);
+    // Format(instr, "scvtfd'sf 'vd, 'vn");
+    const int64_t rn_val64 = get_register(rn, instr->RnMode());
+    const int32_t rn_val32 = get_wregister(rn, instr->RnMode());
+    const double vn_dbl = (instr->SFField() == 1) ?
+        static_cast<double>(rn_val64) : static_cast<double>(rn_val32);
     set_vregisterd(vd, 0, bit_cast<int64_t, double>(vn_dbl));
     set_vregisterd(vd, 1, 0);
-  } else if (instr->Bits(16, 5) == 6) {
-    // Format(instr, "fmovrd 'rd, 'vn");
+    return;
+  }
+  if (instr->SFField() == 0) {

[zra, 2014/10/09 19:21:51]

I'd merge this check with the condition at the top to keep the code in the
non-error case simpler.

|| ((instr->SFField() == 0) && (instr->Bits(16, 5) != 2))

[Cutch, 2014/10/09 20:48:22]

Done.

+    UnimplementedInstruction(instr);
+    return;
+  }
+  if (instr->Bits(16, 5) == 6) {
+    // Format(instr, "fmovrd'sf 'rd, 'vn");
     const int64_t vn_val = get_vregisterd(vn, 0);
     set_register(instr, rd, vn_val, R31IsZR);
   } else if (instr->Bits(16, 5) == 7) {
-    // Format(instr, "fmovdr 'vd, 'rn");
+    // Format(instr, "fmovdr'sf 'vd, 'rn");
     const int64_t rn_val = get_register(rn, R31IsZR);
     set_vregisterd(vd, 0, rn_val);
     set_vregisterd(vd, 1, 0);
   } else if (instr->Bits(16, 5) == 24) {
-    // Format(instr, "fcvtzds 'rd, 'vn");
+    // Format(instr, "fcvtzds'sf 'rd, 'vn");
     const double vn_val = bit_cast<double, int64_t>(get_vregisterd(vn, 0));
     set_register(instr, rd, static_cast<int64_t>(vn_val), instr->RdMode());
   } else {
     UnimplementedInstruction(instr);
   }
 }
 
 
 void Simulator::DecodeFPOneSource(Instr* instr) {
   const int opc = instr->Bits(15, 6);
@@ skipping 355 matching lines @@
   set_register(NULL, kExceptionObjectReg, bit_cast<int64_t>(raw_exception));
   set_register(NULL, kStackTraceObjectReg, bit_cast<int64_t>(raw_stacktrace));
   buf->Longjmp();
 }
 
 }  // namespace dart
 
 #endif  // !defined(HOST_ARCH_ARM64)
 
 #endif  // defined TARGET_ARCH_ARM64