Changeset 23783 in vbox

Timestamp:

Oct 14, 2009 11:21:29 PM (15 years ago)

Author:

vboxsync

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

53521

Message:

SSM: Added _HCPTR_HACK_U32 to deal with two PATM fields.

Location:

trunk

Files:

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

trunk/include/VBox/err.h

@@ -611 +611 @@
 /** The field contains an invalid padding size. */
 #define VERR_SSM_FIELD_INVALID_PADDING_SIZE     (-1869)
+/** The field contains a value that is out of range. */
+#define VERR_SSM_FIELD_INVALID_VALUE            (-1870)
 /** @} */
 

trunk/include/VBox/ssm.h

@@ -147 +147 @@
     /** Array of SSMFIELDTRANS_HCPTR_NI. */
     SSMFIELDTRANS_HCPTR_NI_ARRAY,
+    /** Host context (HC) virtual address used to hold a unsigned 32-bit value. */
+    SSMFIELDTRANS_HCPTR_HACK_U32,
 
     /** Ignorable field. See SSMFIELD_ENTRY_IGNORE. */
@@ -250 +252 @@
 /** Same as SSMFIELD_ENTRY_HCPTR_NI, except it's an array of the buggers. */
 #define SSMFIELD_ENTRY_HCPTR_NI_ARRAY(Type, Field)  SSMFIELD_ENTRY_INT(Type, Field, SSMFIELDTRANS_HCPTR_NI_ARRAY)
+/** Emit a SSMFIELD array entry for a ring-0 or ring-3 pointer type that has
+ * been hacked such that it will never exceed 32-bit.  No sign extenending. */
+#define SSMFIELD_ENTRY_HCPTR_HACK_U32(Type, Field)  SSMFIELD_ENTRY_INT(Type, Field, SSMFIELDTRANS_HCPTR_HACK_U32)
 
 /** Emit a SSMFIELD array entry for a field that can be ignored.

trunk/src/VBox/VMM/SSM.cpp

@@ -3404 +3404 @@
             }
 
+            case SSMFIELDTRANS_HCPTR_HACK_U32:
+                AssertMsgReturn(cbField == sizeof(void *), ("%#x (%s)\n", cbField, pCur->pszName), VERR_SSM_FIELD_INVALID_SIZE);
+                AssertMsgReturn(*(uintptr_t *)pbField <= UINT32_MAX, ("%p (%s)\n", *(uintptr_t *)pbField, pCur->pszName), VERR_SSM_FIELD_INVALID_VALUE);
+                rc = ssmR3DataWrite(pSSM, pbField, sizeof(uint32_t));
+                if ((fFlags & SSMSTRUCT_FLAGS_DONT_IGNORE) && sizeof(void *) != sizeof(uint32_t))
+                    rc = ssmR3DataWrite(pSSM, s_abZero, sizeof(uint32_t));
+                break;
+
+
             case SSMFIELDTRANS_IGNORE:
                 if (fFlags & SSMSTRUCT_FLAGS_DONT_IGNORE)
@@ -3439 +3448 @@
                     rc = ssmR3DataWrite(pSSM, s_abZero, sizeof(void *));
                 break;
+
 
             case SSMFIELDTRANS_PAD_HC:
@@ -6054 +6064 @@
             }
 
+            case SSMFIELDTRANS_HCPTR_HACK_U32:
+                AssertMsgReturn(cbField == sizeof(void *), ("%#x (%s)\n", cbField, pCur->pszName), VERR_SSM_FIELD_INVALID_SIZE);
+                *(uintptr_t *)pbField = 0;
+                rc = ssmR3DataRead(pSSM, pbField, sizeof(uint32_t));
+                if ((fFlags & SSMSTRUCT_FLAGS_DONT_IGNORE) && ssmR3GetHostBits(pSSM) == 64)
+                {
+                    uint32_t u32;
+                    rc = ssmR3DataRead(pSSM, &u32, sizeof(uint32_t));
+                    AssertMsgReturn(u32 == 0 || RT_FAILURE(rc), ("%#x\n", u32), VERR_SSM_FIELD_INVALID_VALUE);
+                }
+                break;
+
+
             case SSMFIELDTRANS_IGNORE:
                 if (fFlags & SSMSTRUCT_FLAGS_DONT_IGNORE)
@@ -6082 +6105 @@
                     rc = SSMR3Skip(pSSM, ssmR3GetHostBits(pSSM) / 8);
                 break;
+
 
             case SSMFIELDTRANS_PAD_HC: