Changeset 41741 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Jun 15, 2012 1:50:13 AM (13 years ago)

Author:

vboxsync

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

78549

Message:

DISOPPARAM: s/parval/uValue/ + doc

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• CSAM.cpp (modified) (2 diffs)
• HWACCM.cpp (modified) (3 diffs)
• PATM.cpp (modified) (1 diff)
• PATMPatch.cpp (modified) (2 diffs)

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

@@ -801 +801 @@
     case OP_INT:
         Assert(pCpu->Param1.fUse & DISUSE_IMMEDIATE8);
-        if (pCpu->Param1.parval == 3)
+        if (pCpu->Param1.uValue == 3)
         {
             //two byte int 3
@@ -1101 +1101 @@
                              && (   !(cpu.Param2.flags & DISUSE_REG_GEN32)
                                  || !(cpu.Param2.flags & (DISUSE_DISPLACEMENT8|DISUSE_DISPLACEMENT16|DISUSE_DISPLACEMENT32))
-                                 ||  cpu.Param2.parval != 0
+                                 ||  cpu.Param2.uValue != 0
                                 )
                             )

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

@@ -1845 +1845 @@
                 Assert(pDis->Param2.fUse == DISUSE_IMMEDIATE32);
                 pPatch->enmType     = HWACCMTPRINSTR_WRITE_IMM;
-                pPatch->uSrcOperand = pDis->Param2.parval;
+                pPatch->uSrcOperand = pDis->Param2.uValue;
             }
             rc = PGMPhysSimpleWriteGCPtr(pVCpu, pCtx->rip, aVMMCall, sizeof(aVMMCall));
@@ -1875 +1875 @@
                 &&  pDis->Param1.base.reg_gen == uMmioReg
                 &&  pDis->Param2.fUse == DISUSE_IMMEDIATE8
-                &&  pDis->Param2.parval == 4
+                &&  pDis->Param2.uValue == 4
                 &&  oldcbOp + cbOp < sizeof(pVM->hwaccm.s.aPatches[idx].aOpcode))
             {
@@ -2048 +2048 @@
                 Assert(pDis->Param2.fUse == DISUSE_IMMEDIATE32);
                 aPatch[off++] = 0xB8;    /* mov eax, immediate */
-                *(uint32_t *)&aPatch[off] = pDis->Param2.parval;
+                *(uint32_t *)&aPatch[off] = pDis->Param2.uValue;
                 off += sizeof(uint32_t);
             }

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

@@ -3949 +3949 @@
      * references the target instruction in the conflict patch.
      */
-    RTRCPTR pJmpDest = PATMR3GuestGCPtrToPatchGCPtr(pVM, pInstrGC + pCpu->cbInstr + (int32_t)pCpu->Param1.parval);
-
-    AssertMsg(pJmpDest, ("PATMR3GuestGCPtrToPatchGCPtr failed for %RRv\n", pInstrGC + pCpu->cbInstr + (int32_t)pCpu->Param1.parval));
+    RTRCPTR pJmpDest = PATMR3GuestGCPtrToPatchGCPtr(pVM, pInstrGC + pCpu->cbInstr + (int32_t)pCpu->Param1.uValue);
+
+    AssertMsg(pJmpDest, ("PATMR3GuestGCPtrToPatchGCPtr failed for %RRv\n", pInstrGC + pCpu->cbInstr + (int32_t)pCpu->Param1.uValue));
     pPatch->pPatchJumpDestGC = pJmpDest;
 

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

@@ -857 +857 @@
     /** @note optimization: multiple identical ret instruction in a single patch can share a single patched ret. */
     if (    pPatch->pTempInfo->pPatchRetInstrGC
-        &&  pPatch->pTempInfo->uPatchRetParam1 == (uint32_t)pCpu->Param1.parval) /* nr of bytes popped off the stack should be identical of course! */
+        &&  pPatch->pTempInfo->uPatchRetParam1 == (uint32_t)pCpu->Param1.uValue) /* nr of bytes popped off the stack should be identical of course! */
     {
         Assert(pCpu->pCurInstr->uOpcode == OP_RETN);
@@ -891 +891 @@
     {
         pPatch->pTempInfo->pPatchRetInstrGC = pPatchRetInstrGC;
-        pPatch->pTempInfo->uPatchRetParam1  = pCpu->Param1.parval;
+        pPatch->pTempInfo->uPatchRetParam1  = pCpu->Param1.uValue;
     }
     return rc;