vbox的更動 9761 路徑 trunk/src/VBox/Disassembler/DisasmReg.cpp

時間撮記:

2008-6-17 下午01:13:55 (16 年 以前)

作者:

vboxsync

訊息:

64 bits disassembly changes (32 bits displacement sign extended to 64 bits)

檔案:

• trunk/src/VBox/Disassembler/DisasmReg.cpp (修改) (1 筆差異)

trunk/src/VBox/Disassembler/DisasmReg.cpp

@@ -548 +548 @@
         if (pParam->flags & USE_DISPLACEMENT32)
         {
-            if (pCpu->mode == CPUMODE_32BIT)
-                pParamVal->val.val32 += pParam->disp32;
-            else
-            if (pCpu->mode == CPUMODE_64BIT)
-                pParamVal->val.val64 += (int64_t)pParam->disp32;
-            else
-                AssertFailed();
+            Assert(pCpu->mode == CPUMODE_32BIT);
+            pParamVal->val.val32 += pParam->disp32;
+        }
+        else
+        if (pParam->flags & USE_DISPLACEMENT64)
+        {
+            Assert(pCpu->mode == CPUMODE_64BIT);
+            pParamVal->val.val64 += (int64_t)pParam->disp64;
         }
         else
         if (pParam->flags & USE_RIPDISPLACEMENT32)
         {
-            if (pCpu->mode == CPUMODE_64BIT)
-                pParamVal->val.val64 += pParam->disp32 + pCtx->rip;
-            else
-                AssertFailed();
+            Assert(pCpu->mode == CPUMODE_64BIT);
+            pParamVal->val.val64 += pParam->disp32 + pCtx->rip;
         }
         return VINF_SUCCESS;