Changeset 10275 in vbox for trunk/src/VBox

Timestamp:

Jul 5, 2008 1:39:26 PM (17 years ago)

Author:

vboxsync

Message:

Handle the 'mov %Ev, %Iz' case correctly in 64 bits op mode.

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmCore.cpp (modified) (1 diff)
• DisasmTest.cpp (modified) (1 diff)
• DisasmTestA.asm (modified) (1 diff)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -1323 +1323 @@
     {
         pParam->parval = DISReadDWord(pCpu, lpszCodeBlock);
-        pParam->flags |= USE_IMMEDIATE32;
-        pParam->size   = sizeof(uint32_t);
+        /* 64 bits op mode means zero extend to 64 bits. */
+        if (pCpu->opmode == CPUMODE_64BIT)
+        {
+            pParam->flags |= USE_IMMEDIATE64;
+            pParam->size   = sizeof(uint64_t);
+        }
+        else
+        {
+            pParam->flags |= USE_IMMEDIATE32;
+            pParam->size   = sizeof(uint32_t);
+        }
 
         disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), "0%08Xh", (uint32_t)pParam->parval);

trunk/src/VBox/Disassembler/DisasmTest.cpp

@@ -78 +78 @@
             char         szOutput[256];
 
-//__debugbreak();
+__debugbreak();
             memset(&cpu, 0, sizeof(cpu));
             cpu.mode = CPUMODE_64BIT;

trunk/src/VBox/Disassembler/DisasmTestA.asm

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