Changeset 11489 in vbox for trunk/src

Timestamp:

Aug 19, 2008 2:37:44 PM (17 years ago)

Author:

vboxsync

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

34986

Message:

ImmVRel is 32 bits sign extended to 64 bits in long mode.

File:

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

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -1388 +1388 @@
     if (pCpu->opmode == CPUMODE_64BIT)
     {
-        pParam->parval = DISReadQWord(pCpu, lpszCodeBlock);
+        /* 32 bits relative immediate sign extended to 64 bits. */
+        pParam->parval = (uint64_t)(int32_t)DISReadDWord(pCpu, lpszCodeBlock);
         pParam->flags |= USE_IMMEDIATE64_REL;
-        pParam->size   = sizeof(int64_t);
+        pParam->size   = sizeof(uint64_t);
 
         disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), " (0%VX64h)", pParam->parval);
-        return sizeof(int64_t);
+        return sizeof(int32_t);
     }
     else
@@ -1410 +1411 @@
 unsigned ParseImmVRel_SizeOnly(RTUINTPTR lpszCodeBlock, PCOPCODE pOp, POP_PARAMETER pParam, PDISCPUSTATE pCpu)
 {
-    if (pCpu->opmode == CPUMODE_32BIT)
-        return sizeof(int32_t);
-    else
-    if (pCpu->opmode == CPUMODE_64BIT)
-        return sizeof(int64_t);
-    return sizeof(uint16_t);
+    if (pCpu->opmode == CPUMODE_16BIT)
+        return sizeof(uint16_t);
+    /* Both 32 & 64 bits mode use 32 bits relative immediates. */
+    return sizeof(int32_t);
 }
 //*****************************************************************************