Changeset 26271 in vbox for trunk/src/VBox/VMM/VMMGC

Timestamp:

Feb 5, 2010 4:04:36 AM (15 years ago)

Author:

vboxsync

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

57330

Message:

VMM: warnings. Changed PATMIsPatchGCAddr and CSAMIsKnownDangerousInstr to take RTRCUINTPTR instead of RTRCPTR so we can mostly avoid having to cast the parameter.

Location:

trunk/src/VBox/VMM/VMMGC

Files:

• PDMGCDevice.cpp (modified) (1 diff)
• SELMGC.cpp (modified) (2 diffs)
• TRPMGCHandlers.cpp (modified) (9 diffs)

trunk/src/VBox/VMM/VMMGC/PDMGCDevice.cpp

@@ -208 +208 @@
     LogFlow(("pdmRCDevHlp_PATMSetMMIOPatchInfo: caller=%p/%d:\n", pDevIns, pDevIns->iInstance));
 
-    return PATMSetMMIOPatchInfo(pDevIns->Internal.s.pVMRC, GCPhys, (RTRCPTR)pCachedData);
+    return PATMSetMMIOPatchInfo(pDevIns->Internal.s.pVMRC, GCPhys, (RTRCPTR)(uintptr_t)pCachedData);
 }
 

trunk/src/VBox/VMM/VMMGC/SELMGC.cpp

@@ -68 +68 @@
      */
     X86DESC Desc;
-    int rc = MMGCRamRead(pVM, &Desc, (uint8_t *)GdtrGuest.pGdt + offEntry, sizeof(X86DESC));
+    int rc = MMGCRamRead(pVM, &Desc, (uint8_t *)(uintptr_t)GdtrGuest.pGdt + offEntry, sizeof(X86DESC));
     if (RT_FAILURE(rc))
         return VINF_EM_RAW_EMULATE_INSTR_GDT_FAULT;
@@ -317 +317 @@
          * then check if any of these has changed.
          */
-        PCVBOXTSS pGuestTss = (PVBOXTSS)pVM->selm.s.GCPtrGuestTss;
+        PCVBOXTSS pGuestTss = (PVBOXTSS)(uintptr_t)pVM->selm.s.GCPtrGuestTss;
         if (    PAGE_ADDRESS(&pGuestTss->esp0) == PAGE_ADDRESS(&pGuestTss->padding_ss0)
             &&  PAGE_ADDRESS(&pGuestTss->esp0) == PAGE_ADDRESS((uint8_t *)pGuestTss + offRange)

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

@@ -406 +406 @@
          */
         if (    Cpu.pCurInstr->opcode == OP_ILLUD2
-            &&  PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip))
+            &&  PATMIsPatchGCAddr(pVM, pRegFrame->eip))
         {
             rc = PATMGCHandleIllegalInstrTrap(pVM, pRegFrame);
@@ -429 +429 @@
             Log(("TRPMGCTrap06Handler: pc=%08x op=%d\n", pRegFrame->eip, Cpu.pCurInstr->opcode));
 #ifdef DTRACE_EXPERIMENT /** @todo fix/remove/permanent-enable this when DIS/PATM handles invalid lock sequences. */
-            Assert(!PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip));
+            Assert(!PATMIsPatchGCAddr(pVM, pRegFrame->eip));
             rc = TRPMForwardTrap(pVCpu, pRegFrame, 0x6, 0, TRPM_TRAP_NO_ERRORCODE, TRPM_TRAP, 0x6);
             Assert(rc == VINF_EM_RAW_GUEST_TRAP);
@@ -618 +618 @@
         {
             Assert(pCpu->param1.flags & USE_IMMEDIATE8);
-            Assert(!(PATMIsPatchGCAddr(pVM, (RTRCPTR)PC)));
+            Assert(!(PATMIsPatchGCAddr(pVM, PC)));
             if (pCpu->param1.parval == 3)
             {
@@ -646 +646 @@
         case OP_HLT:
             /* If it's in patch code, defer to ring-3. */
-            if (PATMIsPatchGCAddr(pVM, (RTRCPTR)PC))
+            if (PATMIsPatchGCAddr(pVM, PC))
                 break;
 
@@ -662 +662 @@
         case OP_MOV_DR:
             /* We can safely emulate control/debug register move instructions in patched code. */
-            if (    !PATMIsPatchGCAddr(pVM, (RTRCPTR)PC)
-                &&  !CSAMIsKnownDangerousInstr(pVM, (RTRCPTR)PC))
+            if (    !PATMIsPatchGCAddr(pVM, PC)
+                &&  !CSAMIsKnownDangerousInstr(pVM, PC))
                 break;
         case OP_INVLPG:
@@ -938 +938 @@
         case VINF_EM_RAW_GUEST_TRAP:
         case VINF_EM_RAW_EXCEPTION_PRIVILEGED:
-            if (PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip))
+            if (PATMIsPatchGCAddr(pVM, pRegFrame->eip))
                 rc = VINF_PATM_PATCH_TRAP_GP;
             break;
@@ -962 +962 @@
 
         default:
-            AssertMsg(PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip) == false, ("return code %d\n", rc));
+            AssertMsg(PATMIsPatchGCAddr(pVM, pRegFrame->eip) == false, ("return code %d\n", rc));
             break;
         }
@@ -1003 +1003 @@
         case VINF_EM_RAW_EMULATE_INSTR_LDT_FAULT:
         case VINF_EM_RAW_EMULATE_INSTR_IDT_FAULT:
-            if (PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip))
+            if (PATMIsPatchGCAddr(pVM, pRegFrame->eip))
                 rc = VINF_PATCH_EMULATE_INSTR;
             break;
 
         case VINF_EM_RAW_GUEST_TRAP:
-            if (PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip))
+            if (PATMIsPatchGCAddr(pVM, pRegFrame->eip))
                 return VINF_PATM_PATCH_TRAP_PF;
 
@@ -1033 +1033 @@
 
         default:
-            AssertMsg(PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip) == false, ("Patch address for return code %d. eip=%08x\n", rc, pRegFrame->eip));
+            AssertMsg(PATMIsPatchGCAddr(pVM, pRegFrame->eip) == false, ("Patch address for return code %d. eip=%08x\n", rc, pRegFrame->eip));
             break;
     }