Changeset 19580 in vbox for trunk

Timestamp:

May 11, 2009 1:02:45 PM (16 years ago)

Author:

vboxsync

Message:

Updates

Location:

trunk/src/VBox/VMM

Files:

• VMM.cpp (modified) (1 diff)
• VMMGuruMeditation.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMM.cpp

@@ -1297 +1297 @@
     AssertReturn(pVCpu, VERR_INVALID_PARAMETER);
 
-    RTHCUINTPTR offset = pAddress - pVCpu->vmm.s.CallHostR0JmpBuf.SpCheck;
+    RTHCUINTPTR offset = pVCpu->vmm.s.CallHostR0JmpBuf.SpCheck - pAddress;
     if (offset >= pVCpu->vmm.s.CallHostR0JmpBuf.cbSavedStack)
         return VERR_INVALID_POINTER;

trunk/src/VBox/VMM/VMMGuruMeditation.cpp

@@ -295 +295 @@
                 eip.fFlags   = DBGFADDRESS_FLAGS_RING0 | DBGFADDRESS_FLAGS_VALID;
 #if HC_ARCH_BITS == 64
-                eip.FlatPtr = pVCpu->vmm.s.CallHostR0JmpBuf.rip;
+                eip.FlatPtr = eip.off = pVCpu->vmm.s.CallHostR0JmpBuf.rip;
 #else
-                eip.FlatPtr = pVCpu->vmm.s.CallHostR0JmpBuf.eip;
+                eip.FlatPtr = eip.off = pVCpu->vmm.s.CallHostR0JmpBuf.eip;
 #endif
                 ebp.fFlags   = DBGFADDRESS_FLAGS_RING0 | DBGFADDRESS_FLAGS_VALID;
-                ebp.FlatPtr = pVCpu->vmm.s.CallHostR0JmpBuf.SavedEbp;
+                ebp.FlatPtr  = ebp.off = pVCpu->vmm.s.CallHostR0JmpBuf.SavedEbp;
                 esp.fFlags   = DBGFADDRESS_FLAGS_RING0 | DBGFADDRESS_FLAGS_VALID;
-                esp.FlatPtr = pVCpu->vmm.s.CallHostR0JmpBuf.SavedEsp;
+                esp.FlatPtr  = esp.off = pVCpu->vmm.s.CallHostR0JmpBuf.SavedEsp;
 
                 rc2 = DBGFR3StackWalkBeginEx(pVM, pVCpu->idCpu, DBGFCODETYPE_RING0, &ebp, &esp, &eip,