Changeset 41734 in vbox for trunk/src/VBox/VMM/VMMAll/EMAll.cpp

Timestamp:

Jun 15, 2012 12:20:13 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

78542

Message:

DISCPUSTATE: s/prefix/fPrefix/ and a couple of forgotten opcode uses.

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (11 diffs)

trunk/src/VBox/VMM/VMMAll/EMAll.cpp

@@ -789 +789 @@
         case OP_LMSW:       return "Lmsw";
         case OP_SMSW:       return "Smsw";
-        case OP_CMPXCHG:    return pDis->prefix & DISPREFIX_LOCK ? "Lock CmpXchg"   : "CmpXchg";
-        case OP_CMPXCHG8B:  return pDis->prefix & DISPREFIX_LOCK ? "Lock CmpXchg8b" : "CmpXchg8b";
+        case OP_CMPXCHG:    return pDis->fPrefix & DISPREFIX_LOCK ? "Lock CmpXchg"   : "CmpXchg";
+        case OP_CMPXCHG8B:  return pDis->fPrefix & DISPREFIX_LOCK ? "Lock CmpXchg8b" : "CmpXchg8b";
 
         default:
@@ -1652 +1652 @@
 
     /* Don't support any but these three prefix bytes. */
-    if ((pDis->prefix & ~(DISPREFIX_ADDRSIZE|DISPREFIX_OPSIZE|DISPREFIX_REP|DISPREFIX_REX)))
+    if ((pDis->fPrefix & ~(DISPREFIX_ADDRSIZE|DISPREFIX_OPSIZE|DISPREFIX_REP|DISPREFIX_REX)))
         return VERR_EM_INTERPRETER;
 
@@ -1693 +1693 @@
     offIncrement = pRegFrame->eflags.Bits.u1DF ? -(signed)cbSize : (signed)cbSize;
 
-    if (!(pDis->prefix & DISPREFIX_REP))
+    if (!(pDis->fPrefix & DISPREFIX_REP))
     {
         LogFlow(("emInterpretStosWD dest=%04X:%RGv (%RGv) cbSize=%d\n", pRegFrame->es, GCOffset, GCDest, cbSize));
@@ -1848 +1848 @@
     LogFlow(("%s %RGv rax=%RX64 %RX64\n", emGetMnemonic(pDis), GCPtrPar1, pRegFrame->rax, valpar));
 
-    if (pDis->prefix & DISPREFIX_LOCK)
+    if (pDis->fPrefix & DISPREFIX_LOCK)
         eflags = EMEmulateLockCmpXchg(pvParam1, &pRegFrame->rax, valpar, pDis->param2.cb);
     else
@@ -1901 +1901 @@
     LogFlow(("%s %RGv=%08x eax=%08x\n", emGetMnemonic(pDis), pvParam1, pRegFrame->eax));
 
-    if (pDis->prefix & DISPREFIX_LOCK)
+    if (pDis->fPrefix & DISPREFIX_LOCK)
         eflags = EMEmulateLockCmpXchg8b(pvParam1, &pRegFrame->eax, &pRegFrame->edx, pRegFrame->ebx, pRegFrame->ecx);
     else
@@ -1970 +1970 @@
             LogFlow(("XAdd %RGv=%p reg=%08llx\n", GCPtrPar1, pvParam1, *(uint64_t *)pvParamReg2));
 
-            if (pDis->prefix & DISPREFIX_LOCK)
+            if (pDis->fPrefix & DISPREFIX_LOCK)
                 eflags = EMEmulateLockXAdd(pvParam1, pvParamReg2, cbParamReg2);
             else
@@ -2654 +2654 @@
     AssertRCReturn(rc, VERR_EM_INTERPRETER);
 
-    if (!(pDis->prefix & DISPREFIX_OPSIZE))
+    if (!(pDis->fPrefix & DISPREFIX_OPSIZE))
         dtr32.uAddr &= 0xffffff; /* 16 bits operand size */
 
@@ -3030 +3030 @@
     /* Note: The Intel manual claims there's a REX version of RDMSR that's slightly
              different, so we play safe by completely disassembling the instruction. */
-    Assert(!(pDis->prefix & DISPREFIX_REX));
+    Assert(!(pDis->fPrefix & DISPREFIX_REX));
     NOREF(pDis); NOREF(pvFault); NOREF(pcbSize);
     return EMInterpretRdmsr(pVM, pVCpu, pRegFrame);
@@ -3104 +3104 @@
 
 #ifdef IN_RC
-    if (    (pDis->prefix & (DISPREFIX_REPNE | DISPREFIX_REP))
-        ||  (   (pDis->prefix & DISPREFIX_LOCK)
+    if (    (pDis->fPrefix & (DISPREFIX_REPNE | DISPREFIX_REP))
+        ||  (   (pDis->fPrefix & DISPREFIX_LOCK)
              && pDis->pCurInstr->opcode != OP_CMPXCHG
              && pDis->pCurInstr->opcode != OP_CMPXCHG8B
@@ -3116 +3116 @@
        )
 #else
-    if (    (pDis->prefix & DISPREFIX_REPNE)
-        ||  (   (pDis->prefix & DISPREFIX_REP)
+    if (    (pDis->fPrefix & DISPREFIX_REPNE)
+        ||  (   (pDis->fPrefix & DISPREFIX_REP)
              && pDis->pCurInstr->opcode != OP_STOSWD
             )
-        ||  (   (pDis->prefix & DISPREFIX_LOCK)
+        ||  (   (pDis->fPrefix & DISPREFIX_LOCK)
              && pDis->pCurInstr->opcode != OP_OR
              && pDis->pCurInstr->opcode != OP_AND
@@ -3228 +3228 @@
 # define INTERPRET_CASE_EX_LOCK_PARAM3(opcode, Instr, InstrFn, pfnEmulate, pfnEmulateLock) \
         case opcode:\
-            if (pDis->prefix & DISPREFIX_LOCK) \
+            if (pDis->fPrefix & DISPREFIX_LOCK) \
                 rc = emInterpretLock##InstrFn(pVM, pVCpu, pDis, pRegFrame, pvFault, pcbSize, pfnEmulateLock); \
             else \