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

Timestamp:

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

Author:

vboxsync

Message:

DISOPPARAM: s/parval/uValue/ + doc

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IOMAll.cpp (modified) (4 diffs)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)
• VMMR3/CSAM.cpp (modified) (2 diffs)
• VMMR3/HWACCM.cpp (modified) (3 diffs)
• VMMR3/PATM.cpp (modified) (1 diff)
• VMMR3/PATMPatch.cpp (modified) (2 diffs)
• VMMRC/TRPMRCHandlers.cpp (modified) (4 diffs)
• include/CSAMInternal.h (modified) (1 diff)
• include/PATMInternal.h (modified) (1 diff)

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

@@ -109 +109 @@
         {
             *pcbSize  = 8;
-            *pu64Data = pParam->parval;
+            *pu64Data = pParam->uValue;
             return true;
         }
@@ -116 +116 @@
         {
             *pcbSize  = 4;
-            *pu64Data = (uint32_t)pParam->parval;
+            *pu64Data = (uint32_t)pParam->uValue;
             return true;
         }
@@ -123 +123 @@
         {
             *pcbSize  = 2;
-            *pu64Data = (uint16_t)pParam->parval;
+            *pu64Data = (uint16_t)pParam->uValue;
             return true;
         }
@@ -130 +130 @@
         {
             *pcbSize  = 1;
-            *pu64Data = (uint8_t)pParam->parval;
+            *pu64Data = (uint8_t)pParam->uValue;
             return true;
         }

trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp

@@ -3704 +3704 @@
                         uint32_t intInfo2;
 
-                        LogFlow(("Realmode: INT %x\n", pDis->Param1.parval & 0xff));
-                        intInfo2  = pDis->Param1.parval & 0xff;
+                        LogFlow(("Realmode: INT %x\n", pDis->Param1.uValue & 0xff));
+                        intInfo2  = pDis->Param1.uValue & 0xff;
                         intInfo2 |= (1 << VMX_EXIT_INTERRUPTION_INFO_VALID_SHIFT);
                         intInfo2 |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_SW << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT);

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;

trunk/src/VBox/VMM/VMMRC/TRPMRCHandlers.cpp

@@ -739 +739 @@
              */
             pCpu->Param1.fUse  = DISUSE_IMMEDIATE8;
-            pCpu->Param1.parval = 3;
+            pCpu->Param1.uValue = 3;
             /* fallthru */
         case OP_INT:
@@ -745 +745 @@
             Assert(pCpu->Param1.fUse & DISUSE_IMMEDIATE8);
             Assert(!(PATMIsPatchGCAddr(pVM, PC)));
-            if (pCpu->Param1.parval == 3)
+            if (pCpu->Param1.uValue == 3)
             {
                 /* Int 3 replacement patch? */
@@ -754 +754 @@
                 }
             }
-            rc = TRPMForwardTrap(pVCpu, pRegFrame, (uint32_t)pCpu->Param1.parval, pCpu->cbInstr, TRPM_TRAP_NO_ERRORCODE, TRPM_SOFTWARE_INT, 0xd);
+            rc = TRPMForwardTrap(pVCpu, pRegFrame, (uint32_t)pCpu->Param1.uValue, pCpu->cbInstr, TRPM_TRAP_NO_ERRORCODE, TRPM_SOFTWARE_INT, 0xd);
             if (RT_SUCCESS(rc) && rc != VINF_EM_RAW_GUEST_TRAP)
                 return trpmGCExitTrap(pVM, pVCpu, VINF_SUCCESS, pRegFrame);
@@ -841 +841 @@
              */
             pCpu->Param1.fUse  = DISUSE_IMMEDIATE8;
-            pCpu->Param1.parval = 3;
+            pCpu->Param1.uValue = 3;
             /* fall thru */
         case OP_INT:
         {
             Assert(pCpu->Param1.fUse & DISUSE_IMMEDIATE8);
-            rc = TRPMForwardTrap(pVCpu, pRegFrame, (uint32_t)pCpu->Param1.parval, pCpu->cbInstr, TRPM_TRAP_NO_ERRORCODE, TRPM_SOFTWARE_INT, 0xd);
+            rc = TRPMForwardTrap(pVCpu, pRegFrame, (uint32_t)pCpu->Param1.uValue, pCpu->cbInstr, TRPM_TRAP_NO_ERRORCODE, TRPM_SOFTWARE_INT, 0xd);
             if (RT_SUCCESS(rc) && rc != VINF_EM_RAW_GUEST_TRAP)
                 return trpmGCExitTrap(pVM, pVCpu, VINF_SUCCESS, pRegFrame);

trunk/src/VBox/VMM/include/CSAMInternal.h

@@ -253 +253 @@
     if (pCpu->Param1.fUse & DISUSE_IMMEDIATE8_REL)
     {
-        disp = (int32_t)(char)pCpu->Param1.parval;
+        disp = (int32_t)(char)pCpu->Param1.uValue;
     }
     else
     if (pCpu->Param1.fUse & DISUSE_IMMEDIATE16_REL)
     {
-        disp = (int32_t)(uint16_t)pCpu->Param1.parval;
+        disp = (int32_t)(uint16_t)pCpu->Param1.uValue;
     }
     else
     if (pCpu->Param1.fUse & DISUSE_IMMEDIATE32_REL)
     {
-        disp = (int32_t)pCpu->Param1.parval;
+        disp = (int32_t)pCpu->Param1.uValue;
     }
     else

trunk/src/VBox/VMM/include/PATMInternal.h

@@ -763 +763 @@
     if (pCpu->Param1.fUse & DISUSE_IMMEDIATE8_REL)
     {
-        disp = (int32_t)(char)pCpu->Param1.parval;
+        disp = (int32_t)(char)pCpu->Param1.uValue;
     }
     else
     if (pCpu->Param1.fUse & DISUSE_IMMEDIATE16_REL)
     {
-        disp = (int32_t)(uint16_t)pCpu->Param1.parval;
+        disp = (int32_t)(uint16_t)pCpu->Param1.uValue;
     }
     else
     if (pCpu->Param1.fUse & DISUSE_IMMEDIATE32_REL)
     {
-        disp = (int32_t)pCpu->Param1.parval;
+        disp = (int32_t)pCpu->Param1.uValue;
     }
     else