Fix movups disassembly on IA32

runtime/vm/disassembler_ia32.cc

 // Copyright (c) 2012, 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_IA32.
 #if defined(TARGET_ARCH_IA32)
 #include "platform/utils.h"
 #include "vm/allocation.h"
@@ skipping 338 matching lines @@
   // Handle special encodings.
   int JumpShort(uint8_t* data);
   int JumpConditional(uint8_t* data, const char* comment);
   int JumpConditionalShort(uint8_t* data, const char* comment);
   int SetCC(uint8_t* data);
   int CMov(uint8_t* data);
   int D1D3C1Instruction(uint8_t* data);
   uint8_t* F3Instruction(uint8_t* data);
   int F7Instruction(uint8_t* data);
   int FPUInstruction(uint8_t* data);
+  uint8_t* SSEInstruction(uint8_t prefix, uint8_t primary, uint8_t* data);
   int BitwisePDInstruction(uint8_t* data);
   int Packed660F38Instruction(uint8_t* data);
   int DecodeEnter(uint8_t* data);
   void CheckPrintStop(uint8_t* data);
 
   // Disassembler helper functions.
   static void GetModRm(uint8_t data, int* mod, int* regop, int* rm) {
     *mod = (data >> 6) & 3;
     *regop = (data & 0x38) >> 3;
     *rm = data & 7;
@@ skipping 752 matching lines @@
   } else if (b1 == 0xDA && b2 == 0xE9) {
     const char* mnem = "fucompp";
     Print(mnem);
     return 2;
   }
   Print("Unknown FP instruction");
   return 2;
 }
 
 
+uint8_t* X86Decoder::SSEInstruction(uint8_t prefix, uint8_t primary,
+                                    uint8_t* data) {
+  ASSERT(prefix == 0x0F);
+  int mod, regop, rm;
+  if (primary == 0x10) {
+    GetModRm(*data, &mod, &regop, &rm);
+    Print("movups ");
+    PrintXmmRegister(regop);
+    Print(",");
+    data += PrintRightOperand(data);
+  } else if (primary == 0x11) {
+    int mod, regop, rm;
+    GetModRm(*data, &mod, &regop, &rm);
+    Print("movups ");
+    data += PrintRightXmmOperand(data);
+    Print(",");
+    PrintXmmRegister(regop);
+  } else if (IsTwoXmmRegInstruction(primary)) {
+    const char* f0mnem = F0Mnem(primary);
+    int mod, regop, rm;
+    GetModRm(*data, &mod, &regop, &rm);
+    Print(f0mnem);
+    Print(" ");
+    PrintXmmRegister(regop);
+    Print(",");
+    data += PrintRightXmmOperand(data);
+  }
+  return data;
+}
+
+
 int X86Decoder::BitwisePDInstruction(uint8_t* data) {
   const char* mnem = (*data == 0x57)
       ? "xorpd"
       : (*data == 0x56)
         ? "orpd"
         : "andpd";
   int mod, regop, rm;
   GetModRm(*(data+1), &mod, &regop, &rm);
   Print(mnem);
   Print(" ");
@@ skipping 248 matching lines @@
             Print(" ");
             data += PrintRightOperand(data);
             if (f0byte == 0xAB) {
               Print(",");
               PrintCPURegister(regop);
             } else {
               Print(",");
               PrintCPURegister(regop);
               Print(",cl");
             }
-          } else if (f0byte == 0x10) {
-            int mod, regop, rm;
-            GetModRm(*data, &mod, &regop, &rm);
-            Print("movups ");
-            PrintXmmRegister(regop);
-            Print(",");
-            data += PrintRightOperand(data);
-          } else if (IsTwoXmmRegInstruction(f0byte)) {
-            int mod, regop, rm;
-            GetModRm(*data, &mod, &regop, &rm);
-            Print(f0mnem);
-            Print(" ");
-            PrintXmmRegister(regop);
-            Print(",");
-            data += PrintRightXmmOperand(data);
+          } else if ((f0byte == 0x10) || (f0byte == 0x11) ||
+                     IsTwoXmmRegInstruction(f0byte)) {
+            data = SSEInstruction(0x0F, f0byte, data);
           } else if (f0byte == 0x50) {
             Print("movmskps ");
             int mod, regop, rm;
             GetModRm(*data, &mod, &regop, &rm);
             PrintCPURegister(regop);
             Print(",");
             data += PrintRightXmmOperand(data);
           } else if (f0byte == 0xC2 || f0byte == 0xC6) {
             if (f0byte == 0xC2)
               Print("cmpps ");
@@ skipping 417 matching lines @@
                                   pc);
     pc += instruction_length;
   }
 
   return;
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32