Changeset 46109 in vbox for trunk/src/VBox/Runtime

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/src/VBox/Runtime/common/dbg

Files:

• dbgmod.cpp (modified) (1 diff)
• dbgmoddeferred.cpp (modified) (5 diffs)

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)