Changeset 9131 in vbox for trunk/src/VBox/Disassembler/testcase

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.

File:

• trunk/src/VBox/Disassembler/testcase/tstDisasm-2.cpp (modified) (5 diffs)

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;
     }