Changeset 49808 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Dec 6, 2013 10:09:30 AM (11 years ago)

Author:

vboxsync

Message:

PATMSSM.cpp: Don't try convert non-patch memory addresses to offsets. Dropped the conversion macros since they're only used in these one cases anyway.

File:

• trunk/src/VBox/VMM/VMMR3/PATMSSM.cpp (modified) (3 diffs)

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

@@ -138 +138 @@
 } PATMPATCHRECSSM, *PPATMPATCHRECSSM;
 
-/*******************************************************************************
-*   Defined Constants And Macros                                               *
-*******************************************************************************/
-#define PATM_SUBTRACT_PTR(a, b) *(uintptr_t *)&(a) = (uintptr_t)(a) - (uintptr_t)(b)
-#define PATM_ADD_PTR(a, b)      *(uintptr_t *)&(a) = (uintptr_t)(a) + (uintptr_t)(b)
 
 /*******************************************************************************
@@ -555 +550 @@
     RTRCPTR            *pFixup = (RTRCPTR *)rec.pRelocPos;
 
+    /* Convert pointer to an offset into patch memory.  May not be applicable
+       to all fixup types, thus the UINT32_MAX. */
     Assert(rec.pRelocPos);
-    /* Convert pointer to an offset into patch memory. */
-    PATM_SUBTRACT_PTR(rec.pRelocPos, pVM->patm.s.pPatchMemHC);
+    uintptr_t offRelocPos = (uintptr_t)rec.pRelocPos - (uintptr_t)pVM->patm.s.pPatchMemHC;
+    if (offRelocPos > pVM->patm.s.cbPatchMem)
+        offRelocPos = UINT32_MAX;
+    rec.pRelocPos = (uint8_t *)offRelocPos;
 
     /* Zero rec.Core.Key since it's unused and may trigger SSM check due to the hack below. */
@@ -991 +990 @@
                 offset = (int32_t)(intptr_t)rec.pRelocPos;
                 /* Convert to HC pointer again. */
-                PATM_ADD_PTR(rec.pRelocPos, pVM->patm.s.pPatchMemHC);
+                if ((uintptr_t)rec.pRelocPos < pVM->patm.s.cbPatchMem)
+                    rec.pRelocPos = pVM->patm.s.pPatchMemHC + (uintptr_t)rec.pRelocPos;
+                else
+                    rec.pRelocPos = NULL;
                 pFixup = (RTRCPTR *)rec.pRelocPos;