Changeset 13830 in vbox for trunk/src/VBox/VMM/PATM

Timestamp:

Nov 5, 2008 1:49:18 AM (16 years ago)

Author:

vboxsync

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

38821

Message:

VMM: Disabled VM:pVMGC, removed VM_GUEST_ADDR.

Location:

trunk/src/VBox/VMM/PATM

Files:

• PATM.cpp (modified) (1 diff)
• PATMPatch.cpp (modified) (2 diffs)
• PATMSSM.cpp (modified) (2 diffs)

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

@@ -346 +346 @@
 
     /* Needed for future patching of sldt/sgdt/sidt/str etc. */
-    rc = CPUMR3QueryGuestCtxGCPtr(pVM, &pVM->patm.s.pCPUMCtxGC);
+    rc = CPUMR3QueryGuestCtxRCPtr(pVM, &pVM->patm.s.pCPUMCtxGC);
     AssertRCReturn(rc, rc);
 

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

@@ -236 +236 @@
                 case PATM_CPUID_STD_PTR:
                     /* @todo dirty hack when correcting this fixup (state restore) */
-                    dest = CPUMGetGuestCpuIdStdGCPtr(pVM);
+                    dest = CPUMGetGuestCpuIdStdRCPtr(pVM);
                     break;
 
                 case PATM_CPUID_EXT_PTR:
                     /* @todo dirty hack when correcting this fixup (state restore) */
-                    dest = CPUMGetGuestCpuIdExtGCPtr(pVM);
+                    dest = CPUMGetGuestCpuIdExtRCPtr(pVM);
                     break;
 
                 case PATM_CPUID_CENTAUR_PTR:
                     /* @todo dirty hack when correcting this fixup (state restore) */
-                    dest = CPUMGetGuestCpuIdCentaurGCPtr(pVM);
+                    dest = CPUMGetGuestCpuIdCentaurRCPtr(pVM);
                     break;
 
                 case PATM_CPUID_DEF_PTR:
                     /* @todo dirty hack when correcting this fixup (state restore) */
-                    dest = CPUMGetGuestCpuIdDefGCPtr(pVM);
+                    dest = CPUMGetGuestCpuIdDefRCPtr(pVM);
                     break;
 
@@ -287 +287 @@
                 case PATM_VM_FORCEDACTIONS:
                     /* @todo dirty assumptions when correcting this fixup during saved state loading. */
-                    dest = pVM->pVMGC + RT_OFFSETOF(VM, fForcedActions);
+                    dest = pVM->pVMRC + RT_OFFSETOF(VM, fForcedActions);
                     break;
 

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

@@ -870 +870 @@
         else
         /* Note: rather assumptive! */
-        if (    *pFixup >= pVM->pVMGC
-            &&  *pFixup < pVM->pVMGC + 32)
-        {
-            LogFlow(("Changing fForcedActions fixup from %x to %x\n", *pFixup, pVM->pVMGC + RT_OFFSETOF(VM, fForcedActions)));
-            *pFixup = pVM->pVMGC + RT_OFFSETOF(VM, fForcedActions);
+        if (    *pFixup >= pVM->pVMRC
+            &&  *pFixup < pVM->pVMRC + 32)
+        {
+            LogFlow(("Changing fForcedActions fixup from %x to %x\n", *pFixup, pVM->pVMRC + RT_OFFSETOF(VM, fForcedActions)));
+            *pFixup = pVM->pVMRC + RT_OFFSETOF(VM, fForcedActions);
         }
         else
-        if (    *pFixup >= pVM->pVMGC
-            &&  *pFixup < pVM->pVMGC + 8192)
+        if (    *pFixup >= pVM->pVMRC
+            &&  *pFixup < pVM->pVMRC + 8192)
         {
             static int cCpuidFixup = 0;
@@ -888 +888 @@
             {
             case 0:
-                *pFixup = CPUMGetGuestCpuIdDefGCPtr(pVM);
+                *pFixup = CPUMGetGuestCpuIdDefRCPtr(pVM);
                 break;
             case 1:
-                *pFixup = CPUMGetGuestCpuIdStdGCPtr(pVM);
+                *pFixup = CPUMGetGuestCpuIdStdRCPtr(pVM);
                 break;
             case 2:
-                *pFixup = CPUMGetGuestCpuIdExtGCPtr(pVM);
+                *pFixup = CPUMGetGuestCpuIdExtRCPtr(pVM);
                 break;
             case 3:
-                *pFixup = CPUMGetGuestCpuIdCentaurGCPtr(pVM);
+                *pFixup = CPUMGetGuestCpuIdCentaurRCPtr(pVM);
                 break;
             }