Changeset 9231 in vbox for trunk/src/VBox

Timestamp:

May 29, 2008 3:31:26 PM (17 years ago)

Author:

vboxsync

Message:

Missign updates

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/PGMAllPool.cpp (modified) (1 diff)
• VMMAll/TRPMAll.cpp (modified) (2 diffs)
• VMMGC/PDMGCDevice.cpp (modified) (1 diff)
• VMMGC/TRPMGCHandlers.cpp (modified) (9 diffs)

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

@@ -603 +603 @@
     {
 #ifdef IN_GC
-        if (PATMIsPatchGCAddr(pVM, (RTGCPTR)pRegFrame->eip))
+        if (PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip))
         {
             LogFlow(("pgmPoolAccessHandlerPTWorker: Interpretation failed for patch code %04x:%RGv, ignoring.\n",

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

@@ -422 +422 @@
         && !(eflags.Bits.u1VM) /** @todo implement when needed (illegal for same privilege level transfers). */
 #endif
-        && !PATMIsPatchGCAddr(pVM, (RTGCPTR)pRegFrame->eip)
+        && !PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip)
        )
     {
@@ -728 +728 @@
             STAM_COUNTER_INC(&pVM->trpm.s.StatForwardFailNoHandler);
         else
-        if (PATMIsPatchGCAddr(pVM, (RTGCPTR)pRegFrame->eip))
+        if (PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip))
             STAM_COUNTER_INC(&pVM->trpm.s.StatForwardFailPatchAddr);
 #endif

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

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

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

@@ -376 +376 @@
          */
         if (    Cpu.pCurInstr->opcode == OP_ILLUD2
-            &&  PATMIsPatchGCAddr(pVM, (RTGCPTR)pRegFrame->eip))
+            &&  PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip))
         {
             rc = PATMGCHandleIllegalInstrTrap(pVM, pRegFrame);
@@ -393 +393 @@
             Log(("TRPMGCTrap06Handler: pc=%RGv 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, (RTGCPTR)pRegFrame->eip));
+            Assert(!PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip));
             rc = TRPMForwardTrap(pVM, pRegFrame, 0x6, 0, TRPM_TRAP_NO_ERRORCODE, TRPM_TRAP, 0x6);
             Assert(rc == VINF_EM_RAW_GUEST_TRAP);
@@ -571 +571 @@
         {
             Assert(pCpu->param1.flags & USE_IMMEDIATE8);
-            Assert(!(PATMIsPatchGCAddr(pVM, PC)));
+            Assert(!(PATMIsPatchGCAddr(pVM, (RTRCPTR)PC)));
             if (pCpu->param1.parval == 3)
             {
@@ -599 +599 @@
         case OP_HLT:
             /* If it's in patch code, defer to ring-3. */
-            if (PATMIsPatchGCAddr(pVM, PC))
+            if (PATMIsPatchGCAddr(pVM, (RTRCPTR)PC))
                 break;
 
@@ -615 +615 @@
         case OP_MOV_DR:
             /* We can safely emulate control/debug register move instructions in patched code. */
-            if (    !PATMIsPatchGCAddr(pVM, PC)
+            if (    !PATMIsPatchGCAddr(pVM, (RTRCPTR)PC)
                 &&  !CSAMIsKnownDangerousInstr(pVM, PC))
                 break;
@@ -884 +884 @@
         case VINF_EM_RAW_GUEST_TRAP:
         case VINF_EM_RAW_EXCEPTION_PRIVILEGED:
-            if (PATMIsPatchGCAddr(pVM, (RTGCPTR)pRegFrame->eip))
+            if (PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip))
                 rc = VINF_PATM_PATCH_TRAP_GP;
             break;
@@ -907 +907 @@
 
         default:
-            AssertMsg(PATMIsPatchGCAddr(pVM, (RTGCPTR)pRegFrame->eip) == false, ("return code %d\n", rc));
+            AssertMsg(PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip) == false, ("return code %d\n", rc));
             break;
         }
@@ -945 +945 @@
     case VINF_EM_RAW_EMULATE_INSTR_LDT_FAULT:
     case VINF_EM_RAW_EMULATE_INSTR_IDT_FAULT:
-        if (PATMIsPatchGCAddr(pVM, (RTGCPTR)pRegFrame->eip))
+        if (PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip))
             rc = VINF_PATCH_EMULATE_INSTR;
         break;
 
     case VINF_EM_RAW_GUEST_TRAP:
-        if (PATMIsPatchGCAddr(pVM, (RTGCPTR)pRegFrame->eip))
+        if (PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip))
             return VINF_PATM_PATCH_TRAP_PF;
 
@@ -974 +974 @@
 
     default:
-        AssertMsg(PATMIsPatchGCAddr(pVM, (RTGCPTR)pRegFrame->eip) == false, ("Patch address for return code %d. eip=%08x\n", rc, pRegFrame->eip));
+        AssertMsg(PATMIsPatchGCAddr(pVM, (RTRCPTR)pRegFrame->eip) == false, ("Patch address for return code %d. eip=%08x\n", rc, pRegFrame->eip));
         break;
     }