Changeset 41904 in vbox for trunk/src/VBox

Timestamp:

Jun 24, 2012 1:16:49 AM (13 years ago)

Author:

vboxsync

Message:

CPUM: Fixed saved state bustage. Got two padding equally wrong and shifted the registers inbetween...

File:

• trunk/src/VBox/VMM/VMMR3/CPUM.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/VMMR3/CPUM.cpp

@@ -87 +87 @@
 #define CPUM_SAVED_STATE_VERSION_VER1_6         6
 
+//#define CPUM_WITH_CHANGED_CPUMCTX
 
 /*******************************************************************************
@@ -186 +187 @@
     SSMFIELD_ENTRY_OLD(              dsPadding, sizeof(uint16_t)),
     SSMFIELD_ENTRY(         CPUMCTX, cs),
-    SSMFIELD_ENTRY_OLD(              csPadding, sizeof(uint16_t)),
+    SSMFIELD_ENTRY_OLD(              csPadding, sizeof(uint16_t)*3),
     SSMFIELD_ENTRY(         CPUMCTX, rflags),
     SSMFIELD_ENTRY(         CPUMCTX, rip),
@@ -236 +237 @@
     SSMFIELD_ENTRY_OLD(              ldtrPadding, sizeof(uint16_t)),
     SSMFIELD_ENTRY(         CPUMCTX, tr),
-    SSMFIELD_ENTRY(         CPUMCTX, trPadding),
+    SSMFIELD_ENTRY_OLD(              trPadding, sizeof(uint16_t)),
     SSMFIELD_ENTRY(         CPUMCTX, SysEnter.cs),
     SSMFIELD_ENTRY(         CPUMCTX, SysEnter.eip),
@@ -316 +317 @@
     SSMFIELD_ENTRY_OLD(                  dsPadding, sizeof(uint16_t)),
     SSMFIELD_ENTRY(             CPUMCTX, cs),
-    SSMFIELD_ENTRY_OLD(                  csPadding, sizeof(uint16_t)),
+    SSMFIELD_ENTRY_OLD(                  csPadding, sizeof(uint16_t)*3),
     SSMFIELD_ENTRY(             CPUMCTX, rflags),
     SSMFIELD_ENTRY(             CPUMCTX, rip),
@@ -2225 +2226 @@
     {
         PVMCPU pVCpu = &pVM->aCpus[i];
+#ifdef CPUM_WITH_CHANGED_CPUMCTX
+        SSMR3PutStructEx(pSSM, &pVCpu->cpum.s.Hyper, sizeof(pVCpu->cpum.s.Hyper), SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED,
+                         g_aCpumCtxFields, NULL);
+#else
         SSMR3PutStructEx(pSSM, &pVCpu->cpum.s.Hyper, sizeof(pVCpu->cpum.s.Hyper), SSMSTRUCT_FLAGS_MEM_BAND_AID,
                          g_aCpumCtxFields, NULL);
+#endif
     }
 
@@ -2235 +2241 @@
         PVMCPU pVCpu = &pVM->aCpus[i];
 
+#ifdef CPUM_WITH_CHANGED_CPUMCTX
+        SSMR3PutStructEx(pSSM, &pVCpu->cpum.s.Guest, sizeof(pVCpu->cpum.s.Guest), SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED,
+                         g_aCpumCtxFields, NULL);
+#else
         SSMR3PutStructEx(pSSM, &pVCpu->cpum.s.Guest, sizeof(pVCpu->cpum.s.Guest), SSMSTRUCT_FLAGS_MEM_BAND_AID,
                          g_aCpumCtxFields, NULL);
+#endif
         SSMR3PutU32(pSSM, pVCpu->cpum.s.fUseFlags);
         SSMR3PutU32(pSSM, pVCpu->cpum.s.fChanged);
@@ -2296 +2307 @@
         uint32_t    fLoad   = 0;
         if (uVersion <= CPUM_SAVED_STATE_VERSION_MEM)
+#ifdef CPUM_WITH_CHANGED_CPUMCTX
+            fLoad = SSMSTRUCT_FLAGS_MEM_BAND_AID_RELAXED;
+#else
             fLoad = SSMSTRUCT_FLAGS_MEM_BAND_AID;
+#endif
 
         /*
@@ -3889 +3904 @@
 }
 
-#ifdef DEBUG
-
-/**
- * Debug helper - Saves guest context on raw mode entry (for fatal dump)
- *
- * @internal
- */
-VMMR3DECL(void) CPUMR3SaveEntryCtx(PVM pVM)
-{
-    /** @todo SMP support!! */
-    pVM->cpum.s.GuestEntry = *CPUMQueryGuestCtxPtr(VMMGetCpu(pVM));
-}
-
-#endif /* DEBUG */
+
 
 /**