Changeset 9131 in vbox for trunk/src/VBox

Timestamp:

May 26, 2008 4:02:50 PM (17 years ago)

Author:

vboxsync

Message:

Dropped the USE_EFFICIENT_ADDRESS flag. This breaks assumptions in CSAM about parameter flags.
Instead use DIS_IS_EFFECTIVE_ADDRESS.

Location:

trunk/src/VBox/Disassembler

Files:

• DisasmCore.cpp (modified) (10 diffs)
• DisasmReg.cpp (modified) (1 diff)
• testcase/tstDisasm-2.cpp (modified) (5 diffs)

trunk/src/VBox/Disassembler/DisasmCore.cpp

@@ -466 +466 @@
 
         // Should contain the parameter type on input
-        pCpu->param1.parval = fpop->param1;
-        pCpu->param2.parval = fpop->param2;
-#if 1 /** @todo bird: why parval above? fmul and similar needs dword/qword data in param. */
         pCpu->param1.param = fpop->param1;
         pCpu->param2.param = fpop->param2;
-#endif
     }
     else
@@ -747 +743 @@
             {   /* SIB byte follows ModRM */
                 UseSIB(lpszCodeBlock, pOp, pParam, pCpu);
-                pParam->flags |= USE_EFFICIENT_ADDRESS;
             }
             else
@@ -755 +750 @@
                 if (pCpu->mode == CPUMODE_32BIT)
                 {
-                    pParam->flags |= USE_DISPLACEMENT32 | USE_EFFICIENT_ADDRESS;
+                    pParam->flags |= USE_DISPLACEMENT32;
                     pParam->disp32 = pCpu->disp;
                     disasmPrintDisp32(pParam);
@@ -761 +756 @@
                 else
                 {
-                    pParam->flags |= USE_RIPDISPLACEMENT32 | USE_EFFICIENT_ADDRESS;
+                    pParam->flags |= USE_RIPDISPLACEMENT32;
                     pParam->disp32 = pCpu->disp;
                     disasmAddStringF(pParam->szParam, sizeof(pParam->szParam), "RIP+");
@@ -768 +763 @@
             }
             else {//register address
-                pParam->flags |= USE_BASE | USE_EFFICIENT_ADDRESS;
+                pParam->flags |= USE_BASE;
                 disasmModRMReg(pCpu, pOp, rm, pParam, 1);
             }
@@ -786 +781 @@
             }
             pParam->disp8 = pCpu->disp;
-            pParam->flags |= USE_DISPLACEMENT8 | USE_EFFICIENT_ADDRESS;
+            pParam->flags |= USE_DISPLACEMENT8;
 
             if (pParam->disp8 != 0)
@@ -809 +804 @@
             }
             pParam->disp32 = pCpu->disp;
-            pParam->flags |= USE_DISPLACEMENT32 | USE_EFFICIENT_ADDRESS;
+            pParam->flags |= USE_DISPLACEMENT32;
 
             if (pParam->disp32 != 0)
@@ -834 +829 @@
             {//16 bits displacement
                 pParam->disp16 = pCpu->disp;
-                pParam->flags |= USE_DISPLACEMENT16 | USE_EFFICIENT_ADDRESS;
+                pParam->flags |= USE_DISPLACEMENT16;
                 disasmPrintDisp16(pParam);
             }
             else
             {
-                pParam->flags |= USE_BASE | USE_EFFICIENT_ADDRESS;
+                pParam->flags |= USE_BASE;
                 disasmModRMReg16(pCpu, pOp, rm, pParam);
             }
@@ -850 +845 @@
             disasmModRMReg16(pCpu, pOp, rm, pParam);
             pParam->disp8 = pCpu->disp;
-            pParam->flags |= USE_BASE | USE_DISPLACEMENT8 | USE_EFFICIENT_ADDRESS;
+            pParam->flags |= USE_BASE | USE_DISPLACEMENT8;
 
             if (pParam->disp8 != 0)
@@ -866 +861 @@
             disasmModRMReg16(pCpu, pOp, rm, pParam);
             pParam->disp16 = pCpu->disp;
-            pParam->flags |= USE_BASE | USE_DISPLACEMENT16 | USE_EFFICIENT_ADDRESS;
+            pParam->flags |= USE_BASE | USE_DISPLACEMENT16;
 
             if (pParam->disp16 != 0)

trunk/src/VBox/Disassembler/DisasmReg.cpp

@@ -474 +474 @@
     memset(pParamVal, 0, sizeof(*pParamVal));
 
-    if (pParam->flags & (USE_BASE|USE_INDEX|USE_DISPLACEMENT32|USE_DISPLACEMENT16|USE_DISPLACEMENT8|USE_RIPDISPLACEMENT32))
+    if (DIS_IS_EFFECTIVE_ADDR(pParam->flags))
     {
         // Effective address

trunk/src/VBox/Disassembler/testcase/tstDisasm-2.cpp

@@ -547 +547 @@
          */
         if (    (pCpu->prefix & PREFIX_SEG)
-            &&  !(pCpu->param1.flags & USE_EFFICIENT_ADDRESS)
-            &&  !(pCpu->param2.flags & USE_EFFICIENT_ADDRESS)
-            &&  !(pCpu->param3.flags & USE_EFFICIENT_ADDRESS))
+            &&  !DIS_IS_EFFECTIVE_ADDR(pCpu->param1.flags)
+            &&  !DIS_IS_EFFECTIVE_ADDR(pCpu->param2.flags)
+            &&  !DIS_IS_EFFECTIVE_ADDR(pCpu->param3.flags))
         {
             PUT_STR(s_szSegPrefix[pCpu->prefix_seg], 2);
@@ -600 +600 @@
 
                         PUT_FAR();
-                        if (pParam->flags & USE_EFFICIENT_ADDRESS)
+                        if (DIS_IS_EFFECTIVE_ADDR(pParam->flags))
                         {
                             /* Work around mov seg,[mem16]  and mov [mem16],seg as these always make a 16-bit mem
@@ -623 +623 @@
                                 PUT_SZ("dword ");
                         }
-                        if (pParam->flags & USE_EFFICIENT_ADDRESS)
+                        if (DIS_IS_EFFECTIVE_ADDR(pParam->flags))
                             PUT_SEGMENT_OVERRIDE();
 
                         bool fBase =  (pParam->flags & USE_BASE) /* When exactly is USE_BASE supposed to be set? disasmModRMReg doesn't set it. */
                                    || (   (pParam->flags & (USE_REG_GEN8 | USE_REG_GEN16 | USE_REG_GEN32 | USE_REG_GEN64))
-                                       && !(pParam->flags & USE_EFFICIENT_ADDRESS));
+                                       && !DIS_IS_EFFECTIVE_ADDR(pParam->flags));
                         if (fBase)
                         {
@@ -683 +683 @@
                         }
 
-                        if (pParam->flags & USE_EFFICIENT_ADDRESS)
+                        if (DIS_IS_EFFECTIVE_ADDR(pParam->flags))
                             PUT_C(']');
                         break;
@@ -1068 +1068 @@
     if (fPrefixes & PREFIX_SEG)
     {
-        /* no efficient address which it may apply to. */
+        /* no effective address which it may apply to. */
         Assert((pState->Cpu.prefix & PREFIX_SEG) || pState->Cpu.mode == CPUMODE_64BIT);
-        if (    !(pState->Cpu.param1.flags & USE_EFFICIENT_ADDRESS)
-            &&  !(pState->Cpu.param2.flags & USE_EFFICIENT_ADDRESS)
-            &&  !(pState->Cpu.param3.flags & USE_EFFICIENT_ADDRESS))
+        if (    !DIS_IS_EFFECTIVE_ADDR(pState->Cpu.param1.flags)
+            &&  !DIS_IS_EFFECTIVE_ADDR(pState->Cpu.param2.flags)
+            &&  !DIS_IS_EFFECTIVE_ADDR(pState->Cpu.param3.flags))
             return true;
     }