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

時間撮記:

2008-4-25 上午08:23:14 (17 年 以前)

作者:

vboxsync

訊息:

Disassembler fixes + testcase for 64 bits

檔案:

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

trunk/src/VBox/Disassembler/DisasmReg.cpp

@@ -188 +188 @@
 
     if (subtype == OP_PARM_v)
-    {
         subtype = (pCpu->opmode == CPUMODE_32BIT) ? OP_PARM_d : OP_PARM_w;
-    }
 
     switch(subtype)
@@ -476 +474 @@
     memset(pParamVal, 0, sizeof(*pParamVal));
 
-    if (pParam->flags & (USE_BASE|USE_INDEX|USE_DISPLACEMENT32|USE_DISPLACEMENT16|USE_DISPLACEMENT8))
+    if (pParam->flags & (USE_BASE|USE_INDEX|USE_DISPLACEMENT32|USE_DISPLACEMENT16|USE_DISPLACEMENT8|USE_RIPDISPLACEMENT32))
     {
         // Effective address
@@ -528 +526 @@
         if (pParam->flags & USE_DISPLACEMENT8)
         {
-            if (pCpu->mode & CPUMODE_32BIT)
+            if (pCpu->mode == CPUMODE_32BIT)
                 pParamVal->val.val32 += (int32_t)pParam->disp8;
             else
@@ -536 +534 @@
         if (pParam->flags & USE_DISPLACEMENT16)
         {
-            if (pCpu->mode & CPUMODE_32BIT)
+            if (pCpu->mode == CPUMODE_32BIT)
                 pParamVal->val.val32 += (int32_t)pParam->disp16;
             else
@@ -544 +542 @@
         if (pParam->flags & USE_DISPLACEMENT32)
         {
-            if (pCpu->mode & CPUMODE_32BIT)
+            if (pCpu->mode == CPUMODE_32BIT)
                 pParamVal->val.val32 += pParam->disp32;
+            else
+                AssertFailed();
+        }
+        else
+        if (pParam->flags & USE_RIPDISPLACEMENT32)
+        {
+            if (pCpu->mode == CPUMODE_64BIT)
+                pParamVal->val.val64 += pParam->disp32 + pCtx->rip;
             else
                 AssertFailed();
@@ -597 +603 @@
             pParamVal->type = PARMTYPE_REGISTER;
         }
+        Assert(!(pParam->flags & USE_IMMEDIATE));
+        return VINF_SUCCESS;
     }