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

Timestamp:

Aug 2, 2018 9:06:59 PM (6 years ago)

Author:

vboxsync

Message:

IPRT,DBGF,Diggers: Moved DBGFRETURNTYPE and the unwind state structure to IPRT (dbg.h) in prep for debug module interface and more. Added stack unwind assist callback for the OS diggers so they can identify special stack frames and supply more info via the sure-register-value array and frame flags. Identify and decode NT/AMD64 trap frames.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/DBGFOS.cpp (modified) (1 diff)
• VMMR3/DBGFStack.cpp (modified) (32 diffs)
• VMMR3/VMMGuruMeditation.cpp (modified) (1 diff)
• VMMR3/VMMR3.def (modified) (1 diff)
• include/DBGFInternal.h (modified) (6 diffs)

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

@@ -638 +638 @@
 }
 
+
+
+/**
+ * Internal wrapper for calling DBGFOSREG::pfnStackUnwindAssist.
+ */
+int dbgfR3OSStackUnwindAssist(PUVM pUVM, VMCPUID idCpu, PDBGFSTACKFRAME pFrame, PRTDBGUNWINDSTATE pState,
+                              PCCPUMCTX pInitialCtx, RTDBGAS hAs, uint64_t *puScratch)
+{
+    int rc = VINF_SUCCESS;
+    if (pUVM->dbgf.s.pCurOS)
+    {
+        ASMCompilerBarrier();
+        DBGF_OS_READ_LOCK(pUVM);
+        PDBGFOS pOS = pUVM->dbgf.s.pCurOS;
+        if (pOS)
+            rc = pOS->pReg->pfnStackUnwindAssist(pUVM, pUVM->dbgf.s.pCurOS->abData, idCpu, pFrame,
+                                                 pState, pInitialCtx, hAs, puScratch);
+        DBGF_OS_READ_UNLOCK(pUVM);
+    }
+    return rc;
+}
+

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

@@ -40 +40 @@
 *   Structures and Typedefs                                                                                                      *
 *********************************************************************************************************************************/
-/** Magic value for DBGFUNWINDSTATE::u32Magic (James Moody). */
-#define DBGFUNWINDSTATE_MAGIC           UINT32_C(0x19250326)
-/** Magic value for DBGFUNWINDSTATE::u32Magic after use. */
-#define DBGFUNWINDSTATE_MAGIC_DEAD      UINT32_C(0x20101209)
-
-/**
- * Register state.
- */
-typedef struct DBGFUNWINDSTATE
-{
-    /** Structure magic (DBGFUNWINDSTATE_MAGIC) */
-    uint32_t            u32Magic;
-    /** The state architecture. */
-    RTLDRARCH           enmArch;
-
-    /** The program counter register.
-     * amd64/x86: RIP/EIP/IP
-     * sparc: PC
-     * arm32: PC / R15
-     */
-    uint64_t            uPc;
-
-    /** Return type. */
-    DBGFRETRUNTYPE      enmRetType;
-
-    /** Register state (see enmArch). */
-    union
-    {
-        /** RTLDRARCH_AMD64, RTLDRARCH_X86_32 and RTLDRARCH_X86_16. */
-        struct
-        {
-            /** General purpose registers indexed by X86_GREG_XXX. */
-            uint64_t    auRegs[16];
-            /** The frame address. */
-            RTFAR64     FrameAddr;
-            /** Set if we're in real or virtual 8086 mode. */
-            bool        fRealOrV86;
-            /** The flags register. */
-            uint64_t    uRFlags;
-            /** Trap error code. */
-            uint64_t    uErrCd;
-            /** Segment registers (indexed by X86_SREG_XXX). */
-            uint16_t    auSegs[6];
-
-            /** Bitmap tracking register we've loaded and which content can possibly be trusted. */
-            union
-            {
-                /** For effective clearing of the bits. */
-                uint32_t    fAll;
-                /** Detailed view. */
-                struct
-                {
-                    /** Bitmap indicating whether a GPR was loaded (parallel to auRegs). */
-                    uint16_t    fRegs;
-                    /** Bitmap indicating whether a segment register was loaded (parallel to auSegs). */
-                    uint8_t     fSegs;
-                    /** Set if uPc was loaded. */
-                    uint8_t     fPc : 1;
-                    /** Set if FrameAddr was loaded. */
-                    uint8_t     fFrameAddr : 1;
-                    /** Set if uRFlags was loaded. */
-                    uint8_t     fRFlags : 1;
-                    /** Set if uErrCd was loaded. */
-                    uint8_t     fErrCd : 1;
-                } s;
-            } Loaded;
-        } x86;
-
-        /** @todo add ARM and others as needed. */
-    } u;
-
-    /**
-     * Stack read callback.
-     *
-     * @returns IPRT status code.
-     * @param   pThis       Pointer to this structure.
-     * @param   uSp         The stack pointer address.
-     * @param   cbToRead    The number of bytes to read.
-     * @param   pvDst       Where to put the bytes we read.
-     */
-    DECLCALLBACKMEMBER(int, pfnReadStack)(struct DBGFUNWINDSTATE *pThis, RTUINTPTR uSp, size_t cbToRead, void *pvDst);
-    /** User argument (usefule for pfnReadStack). */
-    void               *pvUser;
-
-} DBGFUNWINDSTATE;
-typedef struct DBGFUNWINDSTATE *PDBGFUNWINDSTATE;
-typedef struct DBGFUNWINDSTATE const *PCDBGFUNWINDSTATE;
-
-static DECLCALLBACK(int) dbgfR3StackReadCallback(PDBGFUNWINDSTATE pThis, RTUINTPTR uSp, size_t cbToRead, void *pvDst);
-
+static DECLCALLBACK(int) dbgfR3StackReadCallback(PRTDBGUNWINDSTATE pThis, RTUINTPTR uSp, size_t cbToRead, void *pvDst);
 
 /**
@@ -143 +54 @@
     VMCPUID     m_idCpu;
     RTDBGAS     m_hAs;
-
-    DBGFUNWINDSTATE m_State;
+    PCCPUMCTX   m_pInitialCtx;
+    uint64_t    m_uOsScratch; /**< For passing to DBGFOSREG::pfnStackUnwindAssist. */
+
+    RTDBGUNWINDSTATE m_State;
 
     RTDBGMOD    m_hCached;
@@ -159 +72 @@
     DBGFUNWINDCTX(PUVM pUVM, VMCPUID idCpu, PCCPUMCTX pInitialCtx, RTDBGAS hAs)
     {
-        m_State.u32Magic     = DBGFUNWINDSTATE_MAGIC;
+        m_State.u32Magic     = RTDBGUNWINDSTATE_MAGIC;
         m_State.enmArch      = RTLDRARCH_AMD64;
         m_State.pfnReadStack = dbgfR3StackReadCallback;
@@ -196 +109 @@
         m_idCpu           = idCpu;
         m_hAs             = DBGFR3AsResolveAndRetain(pUVM, hAs);
+        m_pInitialCtx     = pInitialCtx;
+        m_uOsScratch      = 0;
 
         m_hCached         = NIL_RTDBGMOD;
@@ -243 +158 @@
 
 /**
- * @interface_method_impl{DBGFUNWINDSTATE,pfnReadStack}
- */
-static DECLCALLBACK(int) dbgfR3StackReadCallback(PDBGFUNWINDSTATE pThis, RTUINTPTR uSp, size_t cbToRead, void *pvDst)
+ * @interface_method_impl{RTDBGUNWINDSTATE,pfnReadStack}
+ */
+static DECLCALLBACK(int) dbgfR3StackReadCallback(PRTDBGUNWINDSTATE pThis, RTUINTPTR uSp, size_t cbToRead, void *pvDst)
 {
     Assert(   pThis->enmArch == RTLDRARCH_AMD64
@@ -308 +223 @@
  * @param   puDst           The read destination.
  */
-DECLINLINE(int) dbgUnwindLoadStackU16(PDBGFUNWINDSTATE pThis, uint64_t uSrcAddr, uint16_t *puDst)
+DECLINLINE(int) dbgUnwindLoadStackU16(PRTDBGUNWINDSTATE pThis, uint64_t uSrcAddr, uint16_t *puDst)
 {
     return pThis->pfnReadStack(pThis, uSrcAddr, sizeof(*puDst), puDst);
@@ -322 +237 @@
  * @param   puDst           The read destination.
  */
-DECLINLINE(int) dbgUnwindLoadStackU64(PDBGFUNWINDSTATE pThis, uint64_t uSrcAddr, uint64_t *puDst)
+DECLINLINE(int) dbgUnwindLoadStackU64(PRTDBGUNWINDSTATE pThis, uint64_t uSrcAddr, uint64_t *puDst)
 {
     return pThis->pfnReadStack(pThis, uSrcAddr, sizeof(*puDst), puDst);
@@ -362 +277 @@
  * @param   fErrCd          Non-zero if there is an error code on the stack.
  */
-static bool dbgUnwindPeAmd64DoOneIRet(PDBGFUNWINDSTATE pThis, uint8_t fErrCd)
+static bool dbgUnwindPeAmd64DoOneIRet(PRTDBGUNWINDSTATE pThis, uint8_t fErrCd)
 {
     Assert(fErrCd <= 1);
@@ -375 +290 @@
     }
 
-    pThis->enmRetType = DBGFRETURNTYPE_IRET64;
+    pThis->enmRetType = RTDBGRETURNTYPE_IRET64;
     pThis->u.x86.FrameAddr.off = pThis->u.x86.auRegs[X86_GREG_xSP] - /* pretend rbp is pushed on the stack */ 8;
     pThis->u.x86.FrameAddr.sel = pThis->u.x86.auSegs[X86_SREG_SS];
@@ -419 +334 @@
  */
 static bool dbgUnwindPeAmd64DoOne(RTDBGMOD hMod, PCIMAGE_RUNTIME_FUNCTION_ENTRY paFunctions, size_t cFunctions,
-                                  PDBGFUNWINDSTATE pThis, uint32_t uRvaRip)
+                                  PRTDBGUNWINDSTATE pThis, uint32_t uRvaRip)
 {
     /*
@@ -681 +596 @@
          * RSP should now give us the return address, so perform a RET.
          */
-        pThis->enmRetType = DBGFRETURNTYPE_NEAR64;
+        pThis->enmRetType = RTDBGRETURNTYPE_NEAR64;
 
         pThis->u.x86.FrameAddr.off = pThis->u.x86.auRegs[X86_GREG_xSP] - /* pretend rbp is pushed on the stack */ 8;
@@ -794 +709 @@
 }
 
-static int dbgfR3StackWalkCollectRegisterChanges(PUVM pUVM, PDBGFSTACKFRAME pFrame, PDBGFUNWINDSTATE pState)
+/**
+ * Collects sure registers on frame exit.
+ *
+ * @returns VINF_SUCCESS or VERR_NO_MEMORY.
+ * @param   pUVM        The user mode VM handle for the allocation.
+ * @param   pFrame      The frame in question.
+ * @param   pState      The unwind state.
+ */
+static int dbgfR3StackWalkCollectRegisterChanges(PUVM pUVM, PDBGFSTACKFRAME pFrame, PRTDBGUNWINDSTATE pState)
 {
     pFrame->cSureRegs  = 0;
@@ -931 +854 @@
             pFrame->fFlags |= DBGFSTACKFRAME_FLAGS_USED_UNWIND_INFO;
             pFrame->fFlags &= ~DBGFSTACKFRAME_FLAGS_UNWIND_INFO_RET;
-            if (pFrame->enmReturnFrameReturnType != DBGFRETURNTYPE_INVALID)
+            if (pFrame->enmReturnFrameReturnType != RTDBGRETURNTYPE_INVALID)
             {
                 pFrame->enmReturnType = pFrame->enmReturnFrameReturnType;
-                pFrame->enmReturnFrameReturnType = DBGFRETURNTYPE_INVALID;
+                pFrame->enmReturnFrameReturnType = RTDBGRETURNTYPE_INVALID;
             }
         }
-    }
-
-    /*
-     * Enagage the OS layer and collect register changes.
-     */
-    if (pFrame->fFlags & DBGFSTACKFRAME_FLAGS_USED_UNWIND_INFO)
-    {
-        /** @todo engage the OS buggers to identify trap frames and update unwindctx accordingly. */
-        if (!fFirst)
-        {
-            int rc = dbgfR3StackWalkCollectRegisterChanges(pUnwindCtx->m_pUVM, pFrame, &pUnwindCtx->m_State);
-            if (RT_FAILURE(rc))
-                return rc;
-        }
+        pFrame->fFlags &= ~DBGFSTACKFRAME_FLAGS_TRAP_FRAME;
     }
 
@@ -957 +867 @@
      */
     /** @todo this is bogus... */
-    unsigned cbRetAddr = DBGFReturnTypeSize(pFrame->enmReturnType);
+    unsigned cbRetAddr = RTDbgReturnTypeSize(pFrame->enmReturnType);
     unsigned cbStackItem;
     switch (pFrame->AddrPC.fFlags & DBGFADDRESS_FLAGS_TYPE_MASK)
@@ -968 +878 @@
             switch (pFrame->enmReturnType)
             {
-                case DBGFRETURNTYPE_FAR16:
-                case DBGFRETURNTYPE_IRET16:
-                case DBGFRETURNTYPE_IRET32_V86:
-                case DBGFRETURNTYPE_NEAR16: cbStackItem = 2; break;
-
-                case DBGFRETURNTYPE_FAR32:
-                case DBGFRETURNTYPE_IRET32:
-                case DBGFRETURNTYPE_IRET32_PRIV:
-                case DBGFRETURNTYPE_NEAR32: cbStackItem = 4; break;
-
-                case DBGFRETURNTYPE_FAR64:
-                case DBGFRETURNTYPE_IRET64:
-                case DBGFRETURNTYPE_NEAR64: cbStackItem = 8; break;
+                case RTDBGRETURNTYPE_FAR16:
+                case RTDBGRETURNTYPE_IRET16:
+                case RTDBGRETURNTYPE_IRET32_V86:
+                case RTDBGRETURNTYPE_NEAR16: cbStackItem = 2; break;
+
+                case RTDBGRETURNTYPE_FAR32:
+                case RTDBGRETURNTYPE_IRET32:
+                case RTDBGRETURNTYPE_IRET32_PRIV:
+                case RTDBGRETURNTYPE_NEAR32: cbStackItem = 4; break;
+
+                case RTDBGRETURNTYPE_FAR64:
+                case RTDBGRETURNTYPE_IRET64:
+                case RTDBGRETURNTYPE_NEAR64: cbStackItem = 8; break;
 
                 default:
@@ -1024 +934 @@
     if (pFrame->fFlags & DBGFSTACKFRAME_FLAGS_USED_UNWIND_INFO)
     {
-        if (   pFrame->enmReturnType == DBGFRETURNTYPE_IRET32_PRIV
-            || pFrame->enmReturnType == DBGFRETURNTYPE_IRET64)
+        if (   pFrame->enmReturnType == RTDBGRETURNTYPE_IRET32_PRIV
+            || pFrame->enmReturnType == RTDBGRETURNTYPE_IRET64)
             DBGFR3AddrFromSelOff(pUnwindCtx->m_pUVM, pUnwindCtx->m_idCpu, &pFrame->AddrReturnFrame,
                                  pUnwindCtx->m_State.u.x86.auSegs[X86_SREG_SS], pUnwindCtx->m_State.u.x86.auRegs[X86_GREG_xBP]);
-        else if (pFrame->enmReturnType == DBGFRETURNTYPE_IRET32_V86)
+        else if (pFrame->enmReturnType == RTDBGRETURNTYPE_IRET32_V86)
             DBGFR3AddrFromFlat(pUnwindCtx->m_pUVM, &pFrame->AddrReturnFrame,
                                  ((uint32_t)pUnwindCtx->m_State.u.x86.auSegs[X86_SREG_SS] << 4)
@@ -1055 +965 @@
             {
                 pFrame->AddrReturnFrame.off &= ~(RTGCUINTPTR)1;
-                if (pFrame->enmReturnType == DBGFRETURNTYPE_NEAR16)
+                if (pFrame->enmReturnType == RTDBGRETURNTYPE_NEAR16)
                 {
                     pFrame->fFlags       |= DBGFSTACKFRAME_FLAGS_USED_ODD_EVEN;
-                    pFrame->enmReturnType = DBGFRETURNTYPE_FAR16;
+                    pFrame->enmReturnType = RTDBGRETURNTYPE_FAR16;
                     cbRetAddr = 4;
                 }
-                else if (pFrame->enmReturnType == DBGFRETURNTYPE_NEAR32)
+                else if (pFrame->enmReturnType == RTDBGRETURNTYPE_NEAR32)
                 {
                     pFrame->fFlags       |= DBGFSTACKFRAME_FLAGS_USED_ODD_EVEN;
-                    pFrame->enmReturnType = DBGFRETURNTYPE_FAR32;
+                    pFrame->enmReturnType = RTDBGRETURNTYPE_FAR32;
                     cbRetAddr = 8;
                 }
@@ -1070 +980 @@
             else if (pFrame->fFlags & DBGFSTACKFRAME_FLAGS_USED_ODD_EVEN)
             {
-                if (pFrame->enmReturnType == DBGFRETURNTYPE_FAR16)
+                if (pFrame->enmReturnType == RTDBGRETURNTYPE_FAR16)
                 {
-                    pFrame->enmReturnType = DBGFRETURNTYPE_NEAR16;
+                    pFrame->enmReturnType = RTDBGRETURNTYPE_NEAR16;
                     cbRetAddr = 2;
                 }
-                else if (pFrame->enmReturnType == DBGFRETURNTYPE_NEAR32)
+                else if (pFrame->enmReturnType == RTDBGRETURNTYPE_NEAR32)
                 {
-                    pFrame->enmReturnType = DBGFRETURNTYPE_FAR32;
+                    pFrame->enmReturnType = RTDBGRETURNTYPE_FAR32;
                     cbRetAddr = 4;
                 }
@@ -1094 +1004 @@
     if (pFrame->fFlags & DBGFSTACKFRAME_FLAGS_USED_UNWIND_INFO)
     {
-        if (   pFrame->enmReturnType == DBGFRETURNTYPE_IRET32_PRIV
-            || pFrame->enmReturnType == DBGFRETURNTYPE_IRET64)
+        if (   pFrame->enmReturnType == RTDBGRETURNTYPE_IRET32_PRIV
+            || pFrame->enmReturnType == RTDBGRETURNTYPE_IRET64)
             DBGFR3AddrFromSelOff(pUnwindCtx->m_pUVM, pUnwindCtx->m_idCpu, &pFrame->AddrReturnStack,
                                  pUnwindCtx->m_State.u.x86.auSegs[X86_SREG_SS], pUnwindCtx->m_State.u.x86.auRegs[X86_GREG_xSP]);
-        else if (pFrame->enmReturnType == DBGFRETURNTYPE_IRET32_V86)
+        else if (pFrame->enmReturnType == RTDBGRETURNTYPE_IRET32_V86)
             DBGFR3AddrFromFlat(pUnwindCtx->m_pUVM, &pFrame->AddrReturnStack,
                                  ((uint32_t)pUnwindCtx->m_State.u.x86.auSegs[X86_SREG_SS] << 4)
@@ -1120 +1030 @@
     if (pFrame->fFlags & DBGFSTACKFRAME_FLAGS_USED_UNWIND_INFO)
     {
-        if (DBGFReturnTypeIsNear(pFrame->enmReturnType))
+        if (RTDbgReturnTypeIsNear(pFrame->enmReturnType))
         {
             pFrame->AddrReturnPC.off      = pUnwindCtx->m_State.uPc;
@@ -1132 +1042 @@
         switch (pFrame->enmReturnType)
         {
-            case DBGFRETURNTYPE_NEAR16:
+            case RTDBGRETURNTYPE_NEAR16:
                 if (DBGFADDRESS_IS_VALID(&pFrame->AddrReturnPC))
                 {
@@ -1141 +1051 @@
                     DBGFR3AddrFromFlat(pUnwindCtx->m_pUVM, &pFrame->AddrReturnPC, *uRet.pu16);
                 break;
-            case DBGFRETURNTYPE_NEAR32:
+            case RTDBGRETURNTYPE_NEAR32:
                 if (DBGFADDRESS_IS_VALID(&pFrame->AddrReturnPC))
                 {
@@ -1150 +1060 @@
                     DBGFR3AddrFromFlat(pUnwindCtx->m_pUVM, &pFrame->AddrReturnPC, *uRet.pu32);
                 break;
-            case DBGFRETURNTYPE_NEAR64:
+            case RTDBGRETURNTYPE_NEAR64:
                 if (DBGFADDRESS_IS_VALID(&pFrame->AddrReturnPC))
                 {
@@ -1159 +1069 @@
                     DBGFR3AddrFromFlat(pUnwindCtx->m_pUVM, &pFrame->AddrReturnPC, *uRet.pu64);
                 break;
-            case DBGFRETURNTYPE_FAR16:
+            case RTDBGRETURNTYPE_FAR16:
                 DBGFR3AddrFromSelOff(pUnwindCtx->m_pUVM, pUnwindCtx->m_idCpu, &pFrame->AddrReturnPC, uRet.pu16[1], uRet.pu16[0]);
                 break;
-            case DBGFRETURNTYPE_FAR32:
+            case RTDBGRETURNTYPE_FAR32:
                 DBGFR3AddrFromSelOff(pUnwindCtx->m_pUVM, pUnwindCtx->m_idCpu, &pFrame->AddrReturnPC, uRet.pu16[2], uRet.pu32[0]);
                 break;
-            case DBGFRETURNTYPE_FAR64:
+            case RTDBGRETURNTYPE_FAR64:
                 DBGFR3AddrFromSelOff(pUnwindCtx->m_pUVM, pUnwindCtx->m_idCpu, &pFrame->AddrReturnPC, uRet.pu16[4], uRet.pu64[0]);
                 break;
-            case DBGFRETURNTYPE_IRET16:
+            case RTDBGRETURNTYPE_IRET16:
                 DBGFR3AddrFromSelOff(pUnwindCtx->m_pUVM, pUnwindCtx->m_idCpu, &pFrame->AddrReturnPC, uRet.pu16[1], uRet.pu16[0]);
                 break;
-            case DBGFRETURNTYPE_IRET32:
+            case RTDBGRETURNTYPE_IRET32:
                 DBGFR3AddrFromSelOff(pUnwindCtx->m_pUVM, pUnwindCtx->m_idCpu, &pFrame->AddrReturnPC, uRet.pu16[2], uRet.pu32[0]);
                 break;
-            case DBGFRETURNTYPE_IRET32_PRIV:
+            case RTDBGRETURNTYPE_IRET32_PRIV:
                 DBGFR3AddrFromSelOff(pUnwindCtx->m_pUVM, pUnwindCtx->m_idCpu, &pFrame->AddrReturnPC, uRet.pu16[2], uRet.pu32[0]);
                 break;
-            case DBGFRETURNTYPE_IRET32_V86:
+            case RTDBGRETURNTYPE_IRET32_V86:
                 DBGFR3AddrFromSelOff(pUnwindCtx->m_pUVM, pUnwindCtx->m_idCpu, &pFrame->AddrReturnPC, uRet.pu16[2], uRet.pu32[0]);
                 break;
-            case DBGFRETURNTYPE_IRET64:
+            case RTDBGRETURNTYPE_IRET64:
                 DBGFR3AddrFromSelOff(pUnwindCtx->m_pUVM, pUnwindCtx->m_idCpu, &pFrame->AddrReturnPC, uRet.pu16[4], uRet.pu64[0]);
                 break;
@@ -1214 +1124 @@
 
     /*
+     * Collect register changes.
+     * Then call the OS layer to assist us (e.g. NT trap frames).
+     */
+    if (pFrame->fFlags & DBGFSTACKFRAME_FLAGS_USED_UNWIND_INFO)
+    {
+        if (!fFirst)
+        {
+            int rc = dbgfR3StackWalkCollectRegisterChanges(pUnwindCtx->m_pUVM, pFrame, &pUnwindCtx->m_State);
+            if (RT_FAILURE(rc))
+                return rc;
+        }
+
+        if (   pUnwindCtx->m_pInitialCtx
+            && pUnwindCtx->m_hAs != NIL_RTDBGAS)
+        {
+            int rc = dbgfR3OSStackUnwindAssist(pUnwindCtx->m_pUVM, pUnwindCtx->m_idCpu, pFrame, &pUnwindCtx->m_State,
+                                               pUnwindCtx->m_pInitialCtx, pUnwindCtx->m_hAs, &pUnwindCtx->m_uOsScratch);
+            if (RT_FAILURE(rc))
+                return rc;
+        }
+    }
+
+    /*
      * Try use unwind information to locate the return frame pointer (for the
      * next loop iteration).
      */
     Assert(!(pFrame->fFlags & DBGFSTACKFRAME_FLAGS_UNWIND_INFO_RET));
-    pFrame->enmReturnFrameReturnType = DBGFRETURNTYPE_INVALID;
+    pFrame->enmReturnFrameReturnType = RTDBGRETURNTYPE_INVALID;
     if (!(pFrame->fFlags & DBGFSTACKFRAME_FLAGS_LAST))
     {
@@ -1258 +1191 @@
                                                 PCDBGFADDRESS pAddrStack,
                                                 PCDBGFADDRESS pAddrPC,
-                                                DBGFRETURNTYPE enmReturnType,
+                                                RTDBGRETURNTYPE enmReturnType,
                                                 PCDBGFSTACKFRAME *ppFirstFrame)
 {
@@ -1301 +1234 @@
             {
                 fAddrMask = UINT16_MAX;
-                if (enmReturnType == DBGFRETURNTYPE_INVALID)
-                    pCur->enmReturnType = DBGFRETURNTYPE_NEAR16;
+                if (enmReturnType == RTDBGRETURNTYPE_INVALID)
+                    pCur->enmReturnType = RTDBGRETURNTYPE_NEAR16;
             }
             else if (   enmCpuMode == CPUMMODE_PROTECTED
@@ -1308 +1241 @@
             {
                 fAddrMask = UINT32_MAX;
-                if (enmReturnType == DBGFRETURNTYPE_INVALID)
-                    pCur->enmReturnType = DBGFRETURNTYPE_NEAR32;
+                if (enmReturnType == RTDBGRETURNTYPE_INVALID)
+                    pCur->enmReturnType = RTDBGRETURNTYPE_NEAR32;
             }
             else
             {
                 fAddrMask = UINT64_MAX;
-                if (enmReturnType == DBGFRETURNTYPE_INVALID)
-                    pCur->enmReturnType = DBGFRETURNTYPE_NEAR64;
+                if (enmReturnType == RTDBGRETURNTYPE_INVALID)
+                    pCur->enmReturnType = RTDBGRETURNTYPE_NEAR64;
             }
         }
 
-        if (enmReturnType == DBGFRETURNTYPE_INVALID)
+        if (enmReturnType == RTDBGRETURNTYPE_INVALID)
             switch (pCur->AddrPC.fFlags & DBGFADDRESS_FLAGS_TYPE_MASK)
             {
-                case DBGFADDRESS_FLAGS_FAR16: pCur->enmReturnType = DBGFRETURNTYPE_NEAR16; break;
-                case DBGFADDRESS_FLAGS_FAR32: pCur->enmReturnType = DBGFRETURNTYPE_NEAR32; break;
-                case DBGFADDRESS_FLAGS_FAR64: pCur->enmReturnType = DBGFRETURNTYPE_NEAR64; break;
+                case DBGFADDRESS_FLAGS_FAR16: pCur->enmReturnType = RTDBGRETURNTYPE_NEAR16; break;
+                case DBGFADDRESS_FLAGS_FAR32: pCur->enmReturnType = RTDBGRETURNTYPE_NEAR32; break;
+                case DBGFADDRESS_FLAGS_FAR64: pCur->enmReturnType = RTDBGRETURNTYPE_NEAR64; break;
                 case DBGFADDRESS_FLAGS_RING0:
-                    pCur->enmReturnType = HC_ARCH_BITS == 64 ? DBGFRETURNTYPE_NEAR64 : DBGFRETURNTYPE_NEAR32;
+                    pCur->enmReturnType = HC_ARCH_BITS == 64 ? RTDBGRETURNTYPE_NEAR64 : RTDBGRETURNTYPE_NEAR32;
                     break;
                 default:
-                    pCur->enmReturnType = DBGFRETURNTYPE_NEAR32;
+                    pCur->enmReturnType = RTDBGRETURNTYPE_NEAR32;
                     break;
             }
@@ -1438 +1371 @@
                                       PCDBGFADDRESS pAddrStack,
                                       PCDBGFADDRESS pAddrPC,
-                                      DBGFRETURNTYPE enmReturnType,
+                                      RTDBGRETURNTYPE enmReturnType,
                                       PCDBGFSTACKFRAME *ppFirstFrame)
 {
@@ -1455 +1388 @@
     if (pAddrPC)
         AssertReturn(DBGFR3AddrIsValid(pUVM, pAddrPC), VERR_INVALID_PARAMETER);
-    AssertReturn(enmReturnType >= DBGFRETURNTYPE_INVALID && enmReturnType < DBGFRETURNTYPE_END, VERR_INVALID_PARAMETER);
+    AssertReturn(enmReturnType >= RTDBGRETURNTYPE_INVALID && enmReturnType < RTDBGRETURNTYPE_END, VERR_INVALID_PARAMETER);
 
     /*
@@ -1510 +1443 @@
                                       PCDBGFADDRESS pAddrStack,
                                       PCDBGFADDRESS pAddrPC,
-                                      DBGFRETURNTYPE enmReturnType,
+                                      RTDBGRETURNTYPE enmReturnType,
                                       PCDBGFSTACKFRAME *ppFirstFrame)
 {
@@ -1534 +1467 @@
 VMMR3DECL(int) DBGFR3StackWalkBegin(PUVM pUVM, VMCPUID idCpu, DBGFCODETYPE enmCodeType, PCDBGFSTACKFRAME *ppFirstFrame)
 {
-    return dbgfR3StackWalkBeginCommon(pUVM, idCpu, enmCodeType, NULL, NULL, NULL, DBGFRETURNTYPE_INVALID, ppFirstFrame);
+    return dbgfR3StackWalkBeginCommon(pUVM, idCpu, enmCodeType, NULL, NULL, NULL, RTDBGRETURNTYPE_INVALID, ppFirstFrame);
 }
 

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

@@ -473 +473 @@
                     PCDBGFSTACKFRAME pFirstFrame;
                     rc2 = DBGFR3StackWalkBeginEx(pVM->pUVM, pVCpu->idCpu, DBGFCODETYPE_RING0, &ebp, &esp, &pc,
-                                                 DBGFRETURNTYPE_INVALID, &pFirstFrame);
+                                                 RTDBGRETURNTYPE_INVALID, &pFirstFrame);
                     if (RT_SUCCESS(rc2))
                     {

trunk/src/VBox/VMM/VMMR3/VMMR3.def

@@ -207 +207 @@
     MMR3HeapFree
     MMR3HeapRealloc
+    MMR3HeapAllocU
 
     MMR3HyperAllocOnceNoRel

trunk/src/VBox/VMM/include/DBGFInternal.h

@@ -153 +153 @@
 
 
+#ifdef IN_RING3
 /**
  * Guest OS digger instance.
@@ -167 +168 @@
     uint8_t                     abData[16];
 } DBGFOS;
+#endif
 /** Pointer to guest OS digger instance. */
-typedef DBGFOS *PDBGFOS;
+typedef struct DBGFOS *PDBGFOS;
 /** Pointer to const guest OS digger instance. */
-typedef DBGFOS const *PCDBGFOS;
+typedef struct DBGFOS const *PCDBGFOS;
 
 
@@ -497 +499 @@
 
 
+#ifdef IN_RING3
 int  dbgfR3AsInit(PUVM pUVM);
 void dbgfR3AsTerm(PUVM pUVM);
@@ -506 +509 @@
 void dbgfR3OSTermPart1(PUVM pUVM);
 void dbgfR3OSTermPart2(PUVM pUVM);
+int  dbgfR3OSStackUnwindAssist(PUVM pUVM, VMCPUID idCpu, PDBGFSTACKFRAME pFrame, PRTDBGUNWINDSTATE pState,
+                               PCCPUMCTX pInitialCtx, RTDBGAS hAs, uint64_t *puScratch);
 int  dbgfR3RegInit(PUVM pUVM);
 void dbgfR3RegTerm(PUVM pUVM);
@@ -517 +522 @@
 int  dbgfR3BugCheckInit(PVM pVM);
 
-
-
-#ifdef IN_RING3
 /**
  * DBGF disassembler state (substate of DISSTATE).
@@ -541 +543 @@
                                         char *pszOutput, uint32_t cbOutput, PDBGFDISSTATE pDisState);
 
+#endif /* IN_RING3 */
+
+/** @} */
+
 #endif
-
-/** @} */
-
-#endif