Changeset 11808 in vbox

Timestamp:

Aug 29, 2008 11:29:35 AM (16 years ago)

Author:

vboxsync

Message:

Deal with GCPtr differences between 1.6 & 2.0 saved states.

Location:

trunk

Files:

• include/VBox/ssm.h (modified) (1 diff)
• src/VBox/VMM/CPUM.cpp (modified) (2 diffs)
• src/VBox/VMM/SSM.cpp (modified) (6 diffs)

trunk/include/VBox/ssm.h

@@ -432 +432 @@
 SSMR3DECL(int) SSMR3HandleSetStatus(PSSMHANDLE pSSM, int iStatus);
 SSMR3DECL(SSMAFTER) SSMR3HandleGetAfter(PSSMHANDLE pSSM);
+SSMR3DECL(int) SSMR3SetGCPtrSize(PSSMHANDLE pSSM, unsigned cbGCPtr);
 
 

trunk/src/VBox/VMM/CPUM.cpp

@@ -727 +727 @@
 static DECLCALLBACK(int) cpumR3Save(PVM pVM, PSSMHANDLE pSSM)
 {
+    /* Set the size of RTGCPTR for use of SSMR3Get/PutGCPtr. */
+    SSMR3SetGCPtrSize(pSSM, sizeof(RTGCPTR));
+
     /*
      * Save.
@@ -861 +864 @@
         return VERR_SSM_UNSUPPORTED_DATA_UNIT_VERSION;
     }
+
+    /* Set the size of RTGCPTR for SSMR3GetGCPtr. */
+    if (u32Version == CPUM_SAVED_STATE_VERSION_VER1_6)
+        SSMR3SetGCPtrSize(pSSM, sizeof(RTGCPTR32));
+    else
+        SSMR3SetGCPtrSize(pSSM, sizeof(RTGCPTR));
 
     /*

trunk/src/VBox/VMM/SSM.cpp

@@ -132 +132 @@
     unsigned        uPercentDone;
 
+    /** RTGCPTR size in bytes */
+    unsigned        cbGCPtr;
 } SSMHANDLE;
 
@@ -2784 +2786 @@
 SSMR3DECL(int) SSMR3GetGCUInt(PSSMHANDLE pSSM, PRTGCUINT pu)
 {
+    Assert(pSSM->cbGCPtr == sizeof(RTGCPTR32) || pSSM->cbGCPtr == sizeof(RTGCPTR64));
+
     if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
+    {
+        if (sizeof(*pu) != pSSM->cbGCPtr)
+        {
+            uint32_t val;
+            Assert(sizeof(*pu) == sizeof(uint64_t) && pSSM->cbGCPtr == sizeof(uint32_t));
+            int rc = ssmr3Read(pSSM, &val, pSSM->cbGCPtr);
+            *pu = val;
+            return rc;
+        }
         return ssmr3Read(pSSM, pu, sizeof(*pu));
+    }
     AssertMsgFailed(("Invalid state %d\n", pSSM->enmOp));
     return VERR_SSM_INVALID_STATE;
@@ -2800 +2814 @@
 SSMR3DECL(int) SSMR3GetGCSInt(PSSMHANDLE pSSM, PRTGCINT pi)
 {
+    Assert(pSSM->cbGCPtr == sizeof(RTGCPTR32) || pSSM->cbGCPtr == sizeof(RTGCPTR64));
+
     if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
+    {
+        if (sizeof(*pi) != pSSM->cbGCPtr)
+        {
+            int32_t val;
+            Assert(sizeof(*pi) == sizeof(uint64_t) && pSSM->cbGCPtr == sizeof(uint32_t));
+            int rc = ssmr3Read(pSSM, &val, pSSM->cbGCPtr);
+            *pi = val;
+            return rc;
+        }
         return ssmr3Read(pSSM, pi, sizeof(*pi));
+    }
     AssertMsgFailed(("Invalid state %d\n", pSSM->enmOp));
     return VERR_SSM_INVALID_STATE;
@@ -2858 +2884 @@
  * Loads a GC virtual address item from the current data unit.
  *
+ * Note: only applies to:
+ * - SSMR3GetGCPtr 
+ * - SSMR3GetGCUIntPtr
+ * - SSMR3GetGCSInt
+ * - SSMR3GetGCUInt
+ *
+ * Put functions are not affected.
+ *
+ * @returns VBox status.
+ * @param   pSSM            SSM operation handle.
+ * @param   cbGCPtr         Size of RTGCPTR
+ */
+SSMR3DECL(int) SSMR3SetGCPtrSize(PSSMHANDLE pSSM, unsigned cbGCPtr)
+{
+    Assert(cbGCPtr == sizeof(RTGCPTR32) || cbGCPtr == sizeof(RTGCPTR64));
+    pSSM->cbGCPtr = cbGCPtr;
+    return VINF_SUCCESS;
+}
+
+/**
+ * Loads a GC virtual address item from the current data unit.
+ *
  * @returns VBox status.
  * @param   pSSM            SSM operation handle.
@@ -2864 +2912 @@
 SSMR3DECL(int) SSMR3GetGCPtr(PSSMHANDLE pSSM, PRTGCPTR pGCPtr)
 {
+    Assert(pSSM->cbGCPtr == sizeof(RTGCPTR32) || pSSM->cbGCPtr == sizeof(RTGCPTR64));
+
     if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
-        return ssmr3Read(pSSM, pGCPtr, sizeof(*pGCPtr));
+    {
+        if (sizeof(*pGCPtr) != pSSM->cbGCPtr)
+        {
+            RTGCPTR32 val;
+            Assert(sizeof(*pGCPtr) == sizeof(uint64_t) && pSSM->cbGCPtr == sizeof(uint32_t));
+            int rc = ssmr3Read(pSSM, &val, pSSM->cbGCPtr);
+            *pGCPtr = val;
+            return rc;
+        }
+        return ssmr3Read(pSSM, pGCPtr, pSSM->cbGCPtr);
+    }
     AssertMsgFailed(("Invalid state %d\n", pSSM->enmOp));
     return VERR_SSM_INVALID_STATE;
@@ -2880 +2940 @@
 SSMR3DECL(int) SSMR3GetGCUIntPtr(PSSMHANDLE pSSM, PRTGCUINTPTR pGCPtr)
 {
+    Assert(pSSM->cbGCPtr == sizeof(RTGCPTR32) || pSSM->cbGCPtr == sizeof(RTGCPTR64));
+
     if (pSSM->enmOp == SSMSTATE_LOAD_EXEC || pSSM->enmOp == SSMSTATE_OPEN_READ)
-        return ssmr3Read(pSSM, pGCPtr, sizeof(*pGCPtr));
+    {
+        if (sizeof(*pGCPtr) != pSSM->cbGCPtr)
+        {
+            RTGCUINTPTR32 val;
+            Assert(sizeof(*pGCPtr) == sizeof(uint64_t) && pSSM->cbGCPtr == sizeof(uint32_t));
+            int rc = ssmr3Read(pSSM, &val, pSSM->cbGCPtr);
+            *pGCPtr = val;
+            return rc;
+        }
+        return ssmr3Read(pSSM, pGCPtr, pSSM->cbGCPtr);
+    }
     AssertMsgFailed(("Invalid state %d\n", pSSM->enmOp));
     return VERR_SSM_INVALID_STATE;