Changeset 41678 in vbox for trunk/src/VBox/VMM/VMMR3/CSAM.cpp

Timestamp:

Jun 13, 2012 9:37:47 AM (12 years ago)

Author:

vboxsync

Message:

OP_PARAMETER::flags -> fUse.

File:

• trunk/src/VBox/VMM/VMMR3/CSAM.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMR3/CSAM.cpp

@@ -800 +800 @@
     {
     case OP_INT:
-        Assert(pCpu->param1.flags & DISUSE_IMMEDIATE8);
+        Assert(pCpu->param1.fUse & DISUSE_IMMEDIATE8);
         if (pCpu->param1.parval == 3)
         {
@@ -1097 +1097 @@
                      * Any register is allowed as long as source and destination are identical.
                      */
-                    if (    cpu.param1.flags != DISUSE_REG_GEN32
+                    if (    cpu.param1.fUse != DISUSE_REG_GEN32
                         ||  (   cpu.param2.flags != DISUSE_REG_GEN32
                              && (   !(cpu.param2.flags & DISUSE_REG_GEN32)
@@ -1115 +1115 @@
                 {
                     if (    (pCurInstrGC & 0x3) != 0
-                        ||  cpu.param1.flags != DISUSE_REG_GEN32
+                        ||  cpu.param1.fUse != DISUSE_REG_GEN32
                         ||  cpu.param1.base.reg_gen32 != USE_REG_EBP
                        )
@@ -1141 +1141 @@
                 {
                     if (    (pCurInstrGC & 0x3) != 0
-                        ||  cpu.param1.flags != DISUSE_REG_GEN32
+                        ||  cpu.param1.fUse != DISUSE_REG_GEN32
                         ||  cpu.param1.base.reg_gen32 != USE_REG_ESP
                        )
@@ -1328 +1328 @@
         // For our first attempt, we'll handle only simple relative jumps and calls (immediate offset coded in instruction)
         if (    ((cpu.pCurInstr->optype & DISOPTYPE_CONTROLFLOW) && (OP_PARM_VTYPE(cpu.pCurInstr->param1) == OP_PARM_J))
-            ||  (cpu.pCurInstr->opcode == OP_CALL && cpu.param1.flags == DISUSE_DISPLACEMENT32))  /* simple indirect call (call dword ptr [address]) */
+            ||  (cpu.pCurInstr->opcode == OP_CALL && cpu.param1.fUse == DISUSE_DISPLACEMENT32))  /* simple indirect call (call dword ptr [address]) */
         {
             /* We need to parse 'call dword ptr [address]' type of calls to catch cpuid instructions in some recent Linux distributions (e.g. OpenSuse 10.3) */
             if (    cpu.pCurInstr->opcode == OP_CALL
-                &&  cpu.param1.flags == DISUSE_DISPLACEMENT32)
+                &&  cpu.param1.fUse == DISUSE_DISPLACEMENT32)
             {
                 addr = 0;
@@ -1342 +1342 @@
             if (addr == 0)
             {
-                Log(("We don't support far jumps here!! (%08X)\n", cpu.param1.flags));
+                Log(("We don't support far jumps here!! (%08X)\n", cpu.param1.fUse));
                 rc = VINF_SUCCESS;
                 break;
@@ -1399 +1399 @@
         else
         if (    cpu.pCurInstr->opcode == OP_JMP
-            &&  (cpu.param1.flags & (DISUSE_DISPLACEMENT32|DISUSE_INDEX|DISUSE_SCALE)) == (DISUSE_DISPLACEMENT32|DISUSE_INDEX|DISUSE_SCALE)
+            &&  (cpu.param1.fUse & (DISUSE_DISPLACEMENT32|DISUSE_INDEX|DISUSE_SCALE)) == (DISUSE_DISPLACEMENT32|DISUSE_INDEX|DISUSE_SCALE)
            )
         {