Changeset 10271 in vbox

Timestamp:

Jul 5, 2008 1:07:04 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

32883

Message:

Fixed DISGetParamSize for 64 bits mode.

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmReg.cpp (modified) (1 diff)
• DisasmTestA.asm (modified) (1 diff)

trunk/src/VBox/Disassembler/DisasmReg.cpp

@@ -221 +221 @@
 
     if (subtype == OP_PARM_v)
-        subtype = (pCpu->opmode == CPUMODE_32BIT) ? OP_PARM_d : OP_PARM_w;
+    {
+        switch(pCpu->opmode)
+        {
+        case CPUMODE_32BIT:
+            subtype = OP_PARM_d;
+            break;
+        case CPUMODE_64BIT:
+            subtype = OP_PARM_q;
+            break;
+        case CPUMODE_16BIT:
+            subtype = OP_PARM_w;
+            break;
+        default:
+            /* make gcc happy */
+            break;
+        }
+    }
 
     switch(subtype)

trunk/src/VBox/Disassembler/DisasmTestA.asm

@@ -73 +73 @@
       ;incorrectly assembled by yasm; REX.W should not be added!
       ;test rax, dword 0cc90cc90h
+      and   [r15], rax
       movzx rcx, sil
       and   sil, 3