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

Timestamp:

Sep 2, 2008 1:00:58 PM (16 years ago)

Author:

vboxsync

Message:

Attempt to fix cpuid fixups (nasty code).

Location:

trunk/src/VBox/VMM/PATM

Files:

• PATMA.asm (modified) (1 diff)
• PATMPatch.cpp (modified) (3 diffs)
• PATMSSM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/PATM/PATMA.asm

@@ -1543 +1543 @@
     jb      cpuid_centaur
 
+    ; Dirty assumptions in patmCorrectFixup about the pointer fixup order!!!!
 cpuid_def:
     mov     eax, PATM_CPUID_DEF_PTR

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

@@ -156 +156 @@
 #endif
 
+                /**
+                 * BE VERY CAREFUL WITH THESE FIXUPS. TAKE INTO ACCOUNT THAT PROBLEMS MAY ARISE WHEN RESTORING A SAVED STATE WITH
+                 * A DIFFERENT HYPERVISOR LAYOUT.
+                 */
                 switch (pAsmRecord->uReloc[i])
                 {
@@ -231 +235 @@
 
                 case PATM_CPUID_STD_PTR:
+                    /* @todo dirty hack when correcting this fixup (state restore) */
                     dest = CPUMGetGuestCpuIdStdGCPtr(pVM);
                     break;
 
                 case PATM_CPUID_EXT_PTR:
+                    /* @todo dirty hack when correcting this fixup (state restore) */
                     dest = CPUMGetGuestCpuIdExtGCPtr(pVM);
                     break;
 
                 case PATM_CPUID_CENTAUR_PTR:
+                    /* @todo dirty hack when correcting this fixup (state restore) */
                     dest = CPUMGetGuestCpuIdCentaurGCPtr(pVM);
                     break;
 
                 case PATM_CPUID_DEF_PTR:
+                    /* @todo dirty hack when correcting this fixup (state restore) */
                     dest = CPUMGetGuestCpuIdDefGCPtr(pVM);
                     break;
@@ -278 +286 @@
 
                 case PATM_VM_FORCEDACTIONS:
+                    /* @todo dirty assumptions when correcting this fixup during saved state loading. */
                     dest = pVM->pVMGC + RT_OFFSETOF(VM, fForcedActions);
                     break;

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

@@ -872 +872 @@
         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);
+        }
+        else
+        if (    *pFixup >= pVM->pVMGC
+            &&  *pFixup < pVM->pVMGC + 8192)
+        {
+            static int cCpuidFixup = 0;
+#ifdef LOG_ENABLED
+            RTRCPTR oldFixup = *pFixup;
+#endif
+            /* very dirty assumptions about the cpuid patch */
+
+            switch(cCpuidFixup % 4)
+            {
+            case 0:
+                *pFixup = CPUMGetGuestCpuIdDefGCPtr(pVM);
+                break;
+            case 1:
+                *pFixup = CPUMGetGuestCpuIdStdGCPtr(pVM);
+                break;
+            case 2:
+                *pFixup = CPUMGetGuestCpuIdExtGCPtr(pVM);
+                break;
+            case 3:
+                *pFixup = CPUMGetGuestCpuIdCentaurGCPtr(pVM);
+                break;
+            }
+            LogFlow(("Changing cpuid fixup %d from %x to %x\n", cCpuidFixup, oldFixup, *pFixup));
+            cCpuidFixup++;
+        }
         else
             AssertMsgFailed(("Unexpected fixup value %x\n", *pFixup));