Changeset 8355 in vbox

Timestamp:

Apr 24, 2008 11:20:37 AM (17 years ago)

Author:

vboxsync

Message:

Fixes for REX.R

File:

• trunk/src/VBox/Disassembler/DisasmCore.cpp (modified) (5 diffs)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -627 +627 @@
 
             case OP_PARM_P: //MMX register
+                reg &= 7;   /* REX.R has no effect here */
                 disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), "MM%d", reg);
                 pParam->flags |= USE_REG_MMX;
@@ -633 +634 @@
 
             case OP_PARM_S: //segment register
+                reg &= 7;   /* REX.R has no effect here */
                 disasmModRMSReg(pCpu, pOp, reg, pParam);
                 pParam->flags |= USE_REG_SEG;
@@ -638 +640 @@
 
             case OP_PARM_T: //test register
+                reg &= 7;   /* REX.R has no effect here */
                 disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), "TR%d", reg);
                 pParam->flags |= USE_REG_TEST;
@@ -643 +646 @@
                 return 0;
 
+            case OP_PARM_W: //XMM register or memory operand
+                if (mod != 3)
+                    break;  /* memory operand */
+                /* else no break */
             case OP_PARM_V: //XMM register
                 disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), "XMM%d", reg);
@@ -648 +655 @@
                 pParam->base.reg_xmm = reg;
                 return 0;
-
-            case OP_PARM_W: //XMM register or memory operand
-                if (mod == 3)
-                {
-                    disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), "XMM%d", rm);
-                    pParam->flags |= USE_REG_XMM;
-                    pParam->base.reg_xmm = rm;
-                    return 0;
-                }
-                /* else memory operand */
             }
         }