VM: Fix umulh on simarm64 Windows.

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>  // NOLINT
 #include <stdlib.h>
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_ARM64)
 
@@ skipping 2243 matching lines @@
       uint8_t s_shift = kXRegSizeInBits - reg_size;
       // Value with its sign restored.
       int64_t s_value = (value << s_shift) >> s_shift;
       return (s_value >> amount) & mask;
     }
     case ROR: {
       if (reg_size == kWRegSizeInBits) {
         value &= kWRegMask;
       }
       return (static_cast<uint64_t>(value) >> amount) |
-             ((value & ((1L << amount) - 1L)) << (reg_size - amount));
+             ((static_cast<uint64_t>(value) & ((1ULL << amount) - 1ULL))
+              << (reg_size - amount));
     }
     default:
       UNIMPLEMENTED();
       return 0;
   }
 }
 
 
 int64_t Simulator::ExtendOperand(uint8_t reg_size,
                                  int64_t value,
@@ skipping 391 matching lines @@
     const int64_t alu_out = static_cast<int64_t>(res >> 64);
 #endif  // TARGET_OS_WINDOWS
     set_register(instr, rd, alu_out, R31IsZR);
   } else if ((instr->Bits(29, 2) == 0) && (instr->Bits(21, 3) == 6) &&
              (instr->Bit(15) == 0)) {
     // Format(instr, "umulh 'rd, 'rn, 'rm");
     const uint64_t rn_val = get_register(rn, R31IsZR);
     const uint64_t rm_val = get_register(rm, R31IsZR);
 #if defined(TARGET_OS_WINDOWS)
     // Visual Studio does not support __int128.
-    int64_t alu_out;
-    Multiply128(rn_val, rm_val, &alu_out);
+    uint64_t alu_out;
+    UnsignedMultiply128(rn_val, rm_val, &alu_out);
 #else
-    const __int128 res =
-        static_cast<__int128>(rn_val) * static_cast<__int128>(rm_val);
-    const int64_t alu_out = static_cast<int64_t>(res >> 64);
+    const unsigned __int128 res = static_cast<unsigned __int128>(rn_val) *
+                                  static_cast<unsigned __int128>(rm_val);
+    const uint64_t alu_out = static_cast<uint64_t>(res >> 64);
 #endif  // TARGET_OS_WINDOWS
     set_register(instr, rd, alu_out, R31IsZR);
   } else if ((instr->Bits(29, 3) == 4) && (instr->Bits(21, 3) == 5) &&
              (instr->Bit(15) == 0)) {
     // Format(instr, "umaddl 'rd, 'rn, 'rm, 'ra");
     const uint64_t rn_val = static_cast<uint32_t>(get_wregister(rn, R31IsZR));
     const uint64_t rm_val = static_cast<uint32_t>(get_wregister(rm, R31IsZR));
     const uint64_t ra_val = get_register(ra, R31IsZR);
     const uint64_t alu_out = ra_val + (rn_val * rm_val);
     set_register(instr, rd, alu_out, R31IsZR);
@@ skipping 954 matching lines @@
   set_register(NULL, CODE_REG, code);
   set_register(NULL, PP, pp);
   buf->Longjmp();
 }
 
 }  // namespace dart
 
 #endif  // !defined(USING_SIMULATOR)
 
 #endif  // defined TARGET_ARCH_ARM64