Changeset 10272 in vbox for trunk/src/VBox/Disassembler

Timestamp:

Jul 5, 2008 1:13:50 PM (16 years ago)

Author:

vboxsync

Message:

Deal with sign extending bytes to uint64_t.

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmCore.cpp (modified) (2 diffs)
• DisasmFormatYasm.cpp (modified) (2 diffs)
• DisasmReg.cpp (modified) (1 diff)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -1179 +1179 @@
 unsigned ParseImmByteSX(RTUINTPTR lpszCodeBlock, PCOPCODE pOp, POP_PARAMETER pParam, PDISCPUSTATE pCpu)
 {
-    if (pCpu->opmode == CPUMODE_32BIT) /** @todo In AMD64 mode we're ending up with 16-bit parvals now, see the disassembler _output_ for tstAsmSignExtend-1.asm. */
+    if (pCpu->opmode == CPUMODE_32BIT)
     {
         pParam->parval = (uint32_t)(int8_t)DISReadByte(pCpu, lpszCodeBlock);
@@ -1185 +1185 @@
         pParam->size   = sizeof(uint32_t);
         disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), "0%08Xh", (uint32_t)pParam->parval);
+    }
+    else
+    if (pCpu->opmode == CPUMODE_64BIT)
+    {
+        pParam->parval = (uint64_t)(int8_t)DISReadByte(pCpu, lpszCodeBlock);
+        pParam->flags |= USE_IMMEDIATE64_SX8;
+        pParam->size   = sizeof(uint64_t);
+        disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), "0%016RX64h", pParam->parval);
     }
     else

trunk/src/VBox/Disassembler/DisasmFormatYasm.cpp

@@ -780 +780 @@
                         Assert(*pszFmt == 'b' || *pszFmt == 'v' || *pszFmt == 'w' || *pszFmt == 'z'); pszFmt++;
                         switch (pParam->flags & (  USE_IMMEDIATE8 | USE_IMMEDIATE16 | USE_IMMEDIATE32 | USE_IMMEDIATE64
-                                                 | USE_IMMEDIATE16_SX8 | USE_IMMEDIATE32_SX8))
+                                                 | USE_IMMEDIATE16_SX8 | USE_IMMEDIATE32_SX8 | USE_IMMEDIATE64_SX8))
                         {
                             case USE_IMMEDIATE8:
@@ -833 +833 @@
                                 PUT_SZ_STRICT("strict byte ", "byte ");
                                 PUT_NUM_32(pParam->parval);
+                                break;
+
+                            case USE_IMMEDIATE64_SX8:
+                                PUT_SZ_STRICT("strict byte ", "byte ");
+                                PUT_NUM_64(pParam->parval);
                                 break;
 

trunk/src/VBox/Disassembler/DisasmReg.cpp

@@ -700 +700 @@
         }
         else
-        if (pParam->flags & (USE_IMMEDIATE64 | USE_IMMEDIATE64_REL))
+        if (pParam->flags & (USE_IMMEDIATE64 | USE_IMMEDIATE64_REL | USE_IMMEDIATE64_SX8))
         {
             pParamVal->flags |= PARAM_VAL64;
             pParamVal->size   = sizeof(uint64_t);
             pParamVal->val.val64 = pParam->parval;
-            Assert(pParamVal->size == pParam->size);
+            Assert(pParamVal->size == pParam->size || ((pParam->size == 1) && (pParam->flags & USE_IMMEDIATE64_SX8)) );
         }
         else