Changeset 46109 in vbox

Timestamp:

May 15, 2013 7:54:06 PM (12 years ago)

Author:

vboxsync

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

85797

Message:

Made deferred loading work.

Location:

trunk

Files:

• include/iprt/dbg.h (modified) (1 diff)
• include/iprt/mangling.h (modified) (1 diff)
• src/VBox/Debugger/DBGCEmulateCodeView.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/dbg/dbgmod.cpp (modified) (1 diff)
• src/VBox/Runtime/common/dbg/dbgmoddeferred.cpp (modified) (5 diffs)

trunk/include/iprt/dbg.h

@@ -1001 +1001 @@
 
 /**
+ * Checks if the loading of the debug info has been postponed.
+ *
+ * @returns true if postponed, false if not or invalid handle.
+ * @param   hDbgMod         The module handle.
+ */
+RTDECL(bool)        RTDbgModIsDeferred(RTDBGMOD hDbgMod);
+
+/**
+ * Checks if the debug info is exports only.
+ *
+ * @returns true if exports only, false if not or invalid handle.
+ * @param   hDbgMod         The module handle.
+ */
+RTDECL(bool)        RTDbgModIsExports(RTDBGMOD hDbgMod);
+
+/**
  * Converts an image relative address to a segment:offset address.
  *

trunk/include/iprt/mangling.h

@@ -394 +394 @@
 # define RTDbgModGetTag                                 RT_MANGLER(RTDbgModGetTag)
 # define RTDbgModImageSize                              RT_MANGLER(RTDbgModImageSize)
+# define RTDbgModIsDeferred                             RT_MANGLER(RTDbgModIsDeferred)
+# define RTDbgModIsExports                              RT_MANGLER(RTDbgModIsExports)
 # define RTDbgModLineAdd                                RT_MANGLER(RTDbgModLineAdd)
 # define RTDbgModLineByAddr                             RT_MANGLER(RTDbgModLineByAddr)

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -3908 +3908 @@
         if (hMod != NIL_RTDBGMOD)
         {
-            uint32_t const      cSegs            = RTDbgModSegmentCount(hMod);
-            const char * const  pszName          = RTDbgModName(hMod);
-            const char * const  pszImgFile       = RTDbgModImageFile(hMod);
-            const char * const  pszImgFileUsed   = RTDbgModImageFileUsed(hMod);
-            const char * const  pszDbgFile       = RTDbgModDebugFile(hMod);
+            bool const          fDeferred       = RTDbgModIsDeferred(hMod);
+            bool const          fExports        = RTDbgModIsExports(hMod);
+            uint32_t const      cSegs           = fDeferred ? 1 : RTDbgModSegmentCount(hMod);
+            const char * const  pszName         = RTDbgModName(hMod);
+            const char * const  pszImgFile      = RTDbgModImageFile(hMod);
+            const char * const  pszImgFileUsed  = RTDbgModImageFileUsed(hMod);
+            const char * const  pszDbgFile      = RTDbgModDebugFile(hMod);
             if (    cArgs == 0
                 ||  dbgcCmdListModuleMatch(pszName, paArgs, cArgs))
@@ -3933 +3935 @@
                             uMin = aMappings[iMap].Address;
                     if (!fVerbose || !pszImgFile)
-                        DBGCCmdHlpPrintf(pCmdHlp, "%RGv %04x %s\n", (RTGCUINTPTR)uMin, cSegs, pszName);
+                        DBGCCmdHlpPrintf(pCmdHlp, "%RGv %04x %s%s\n", (RTGCUINTPTR)uMin, cSegs, pszName,
+                                         fExports ? " (exports)" : fDeferred ? " (deferred)" : "");
                     else
-                        DBGCCmdHlpPrintf(pCmdHlp, "%RGv %04x %-12s  %s\n", (RTGCUINTPTR)uMin, cSegs, pszName, pszImgFile);
+                        DBGCCmdHlpPrintf(pCmdHlp, "%RGv %04x %-12s  %s%s\n", (RTGCUINTPTR)uMin, cSegs, pszName, pszImgFile,
+                                         fExports ? "  (exports)" : fDeferred ? "  (deferred)" : "");
                     if (fVerbose && pszImgFileUsed)
                         DBGCCmdHlpPrintf(pCmdHlp, "    Local image: %s\n", pszImgFileUsed);

trunk/src/VBox/Runtime/common/dbg/dbgmod.cpp

@@ -1145 +1145 @@
 
 
+RTDECL(bool) RTDbgModIsDeferred(RTDBGMOD hDbgMod)
+{
+    PRTDBGMODINT pDbgMod = hDbgMod;
+    RTDBGMOD_VALID_RETURN_RC(pDbgMod, false);
+    return pDbgMod->fDeferred;
+}
+
+
+RTDECL(bool) RTDbgModIsExports(RTDBGMOD hDbgMod)
+{
+    PRTDBGMODINT pDbgMod = hDbgMod;
+    RTDBGMOD_VALID_RETURN_RC(pDbgMod, false);
+    return pDbgMod->fExports;
+}
+
+
 RTDECL(RTDBGSEGIDX) RTDbgModRvaToSegOff(RTDBGMOD hDbgMod, RTUINTPTR uRva, PRTUINTPTR poffSeg)
 {

trunk/src/VBox/Runtime/common/dbg/dbgmoddeferred.cpp

@@ -108 +108 @@
 
             rtDbgModDeferredReleaseInstanceData(pThis);
+            if (fImgVt && fDbgVt)
+                rtDbgModDeferredReleaseInstanceData(pThis);
         }
         else
@@ -116 +118 @@
             if (fDbgVt)
             {
+                Assert(!pMod->pDbgVt);
+                pMod->pDbgVt    = &g_rtDbgModVtDbgDeferred;
                 pMod->pvDbgPriv = pThis;
-                pMod->pDbgVt    = &g_rtDbgModVtDbgDeferred;
             }
 
             if (fImgVt)
             {
+                Assert(!pMod->pImgVt);
+                pMod->pImgVt    = &g_rtDbgModVtImgDeferred;
                 pMod->pvImgPriv = pThis;
-                pMod->pImgVt    = &g_rtDbgModVtImgDeferred;
             }
         }
@@ -544 +548 @@
 {
     AssertReturn(!pDbgMod->pDbgVt, VERR_DBG_MOD_IPE);
-    AssertReturn(!pDbgMod->pImgVt, VERR_DBG_MOD_IPE);
 
     PRTDBGMODDEFERRED pDeferred = (PRTDBGMODDEFERRED)RTMemAllocZ(sizeof(*pDeferred));
@@ -551 +554 @@
 
     pDeferred->cbImage     = cbImage;
-    pDeferred->cRefs       = 2;
+    pDeferred->cRefs       = 1 + (pDbgMod->pImgVt == NULL);
     if (hDbgCfg != NIL_RTDBGCFG)
         RTDbgCfgRetain(hDbgCfg);
@@ -557 +560 @@
     pDeferred->pfnDeferred = pfnDeferred;
 
-    pDbgMod->pImgVt              = &g_rtDbgModVtImgDeferred;
-    pDbgMod->pvImgPriv           = pDeferred;
-    pDbgMod->pDbgVt              = &g_rtDbgModVtDbgDeferred;
-    pDbgMod->pvDbgPriv           = pDeferred;
-    pDbgMod->fDeferred           = true;
-    pDbgMod->fDeferredFailed     = false;
+    pDbgMod->pDbgVt             = &g_rtDbgModVtDbgDeferred;
+    pDbgMod->pvDbgPriv          = pDeferred;
+    if (!pDbgMod->pImgVt)
+    {
+        pDbgMod->pImgVt         = &g_rtDbgModVtImgDeferred;
+        pDbgMod->pvImgPriv      = pDeferred;
+    }
+    pDbgMod->fDeferred          = true;
+    pDbgMod->fDeferredFailed    = false;
 
     if (ppDeferred)