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

Timestamp:

Jul 23, 2010 2:39:32 PM (14 years ago)

Author:

vboxsync

Message:

PATM.cpp: Quick workaround for logging crash in FIXUP_REL_JMPTOPATCH.

File:

• trunk/src/VBox/VMM/PATM/PATM.cpp (modified) (9 diffs)

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

@@ -552 +552 @@
 
     if (    !pDisInfo->pInstrHC
-        ||  (   PAGE_ADDRESS(pDisInfo->pInstrGC) != PAGE_ADDRESS(pSrc + size - 1) 
+        ||  (   PAGE_ADDRESS(pDisInfo->pInstrGC) != PAGE_ADDRESS(pSrc + size - 1)
              && !PATMIsPatchGCAddr(pDisInfo->pVM, pSrc)))
     {
@@ -632 +632 @@
         case FIXUP_ABSOLUTE:
             Log(("Absolute fixup at %RRv %RHv -> %RHv at %RRv\n", pRec->pSource, *(RTRCUINTPTR *)pRec->pRelocPos, *(RTRCINTPTR*)pRec->pRelocPos + delta, pRec->pRelocPos));
-            if (    !pRec->pSource 
+            if (    !pRec->pSource
                 ||  PATMIsPatchGCAddr(pVM, pRec->pSource))
             {
@@ -653 +653 @@
                 pRec->pDest = (RTRCPTR)((RTRCUINTPTR)pRec->pDest + delta);
 
-                if (    rc == VERR_PAGE_NOT_PRESENT 
+                if (    rc == VERR_PAGE_NOT_PRESENT
                     ||  rc == VERR_PAGE_TABLE_NOT_PRESENT)
                 {
@@ -695 +695 @@
                 RTRCINTPTR displOld= (RTRCINTPTR)pRec->pDest - (RTRCINTPTR)pRec->pSource;
 
+#if 0 /** @todo '*(int32_t*)pRec->pRelocPos' crashes on restore of an XP VM here. pRelocPos=0x8000dbe2180a (bird) */
                 Log(("Relative fixup (g2p) %08X -> %08X at %08X (source=%08x, target=%08x)\n", *(int32_t*)pRec->pRelocPos, displ, pRec->pRelocPos, pRec->pSource, pRec->pDest));
+#else
+                Log(("Relative fixup (g2p) ???????? -> %08X at %08X (source=%08x, target=%08x)\n", displ, pRec->pRelocPos, pRec->pSource, pRec->pDest));
+#endif
 
                 Assert(pRec->pSource - pPatch->patch.cbPatchJump == pPatch->patch.pPrivInstrGC);
@@ -729 +733 @@
                 Assert(RT_SUCCESS(rc) || rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT);
 
-                if (    rc == VERR_PAGE_NOT_PRESENT 
+                if (    rc == VERR_PAGE_NOT_PRESENT
                     ||  rc == VERR_PAGE_TABLE_NOT_PRESENT)
                 {
@@ -3904 +3908 @@
     RT_ZERO(cacheRec);
     cacheRec.pPatch = pPatch;
-   
+
     rc = patmGenJumpToPatch(pVM, pPatch, &cacherec, true);
     /* Free leftover lock if any. */
@@ -3982 +3986 @@
     PVMCPU pVCpu = VMMGetCpu0(pVM);
 
-    if (    !pVM 
-        ||  pInstrGC == 0 
+    if (    !pVM
+        ||  pInstrGC == 0
         || (flags & ~(PATMFL_CODE32|PATMFL_IDTHANDLER|PATMFL_INTHANDLER|PATMFL_SYSENTER|PATMFL_TRAPHANDLER|PATMFL_DUPLICATE_FUNCTION|PATMFL_REPLACE_FUNCTION_CALL|PATMFL_GUEST_SPECIFIC|PATMFL_INT3_REPLACEMENT|PATMFL_TRAPHANDLER_WITH_ERRORCODE|PATMFL_IDTHANDLER_WITHOUT_ENTRYPOINT|PATMFL_MMIO_ACCESS|PATMFL_TRAMPOLINE|PATMFL_INSTR_HINT|PATMFL_JUMP_CONFLICT)))
     {
@@ -4140 +4144 @@
     pInstrHC = PATMGCVirtToHCVirt(pVM, &cacheRec, pInstrGC);
     AssertReturn(pInstrHC, VERR_PATCHING_REFUSED);
-    
+
     /* Allocate patch record. */
     rc = MMHyperAlloc(pVM, sizeof(PATMPATCHREC), 0, MM_TAG_PATM_PATCH, (void **)&pPatchRec);
@@ -6178 +6182 @@
                 /* The guest page *must* be present. */
                 rc = PGMGstGetPage(pVCpu, pCtx->esp, &fFlags, NULL);
-                if (    rc == VINF_SUCCESS 
+                if (    rc == VINF_SUCCESS
                     &&  (fFlags & X86_PTE_P))
                 {