Changeset 38515 in vbox for trunk/src/VBox/Runtime/common/dbg/dbgmod.cpp

Timestamp:

Aug 24, 2011 2:33:32 PM (13 years ago)

Author:

vboxsync

Message:

IPRT: Working on debug info again.

File:

• trunk/src/VBox/Runtime/common/dbg/dbgmod.cpp (modified) (4 diffs)

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

@@ -137 +137 @@
         g_hDbgModStrCache = NIL_RTSTRCACHE;
 
-        PRTDBGMODREGDBG pCur = g_pDbgHead;
+        PRTDBGMODREGDBG pDbg = g_pDbgHead;
         g_pDbgHead = NULL;
-        while (pCur)
+        while (pDbg)
         {
-            PRTDBGMODREGDBG pNext = pCur->pNext;
-            AssertMsg(pCur->cUsers == 0, ("%#x %s\n", pCur->cUsers, pCur->pVt->pszName));
-            RTMemFree(pCur);
-            pCur = pNext;
+            PRTDBGMODREGDBG pNext = pDbg->pNext;
+            AssertMsg(pDbg->cUsers == 0, ("%#x %s\n", pDbg->cUsers, pDbg->pVt->pszName));
+            RTMemFree(pDbg);
+            pDbg = pNext;
         }
 
-        Assert(!g_pImgHead);
+        PRTDBGMODREGIMG pImg = g_pImgHead;
+        g_pImgHead = NULL;
+        while (pImg)
+        {
+            PRTDBGMODREGIMG pNext = pImg->pNext;
+            AssertMsg(pImg->cUsers == 0, ("%#x %s\n", pImg->cUsers, pImg->pVt->pszName));
+            RTMemFree(pImg);
+            pImg = pNext;
+        }
     }
 }
@@ -197 +205 @@
 
 /**
+ * Internal worker for register a image interpreter.
+ *
+ * Called while owning the write lock or when locking isn't required.
+ *
+ * @returns IPRT status code.
+ * @retval  VERR_NO_MEMORY
+ * @retval  VERR_ALREADY_EXISTS
+ *
+ * @param   pVt                 The virtual function table of the image
+ *                              interpreter.
+ */
+static int rtDbgModImageInterpreterRegister(PCRTDBGMODVTIMG pVt)
+{
+    /*
+     * Search or duplicate registration.
+     */
+    PRTDBGMODREGIMG pPrev = NULL;
+    for (PRTDBGMODREGIMG pCur = g_pImgHead; pCur; pCur = pCur->pNext)
+    {
+        if (pCur->pVt == pVt)
+            return VERR_ALREADY_EXISTS;
+        if (!strcmp(pCur->pVt->pszName, pVt->pszName))
+            return VERR_ALREADY_EXISTS;
+        pPrev = pCur;
+    }
+
+    /*
+     * Create a new record and add it to the end of the list.
+     */
+    PRTDBGMODREGIMG pReg = (PRTDBGMODREGIMG)RTMemAlloc(sizeof(*pReg));
+    if (!pReg)
+        return VERR_NO_MEMORY;
+    pReg->pVt    = pVt;
+    pReg->cUsers = 0;
+    pReg->pNext  = NULL;
+    if (pPrev)
+        pPrev->pNext = pReg;
+    else
+        g_pImgHead   = pReg;
+    return VINF_SUCCESS;
+}
+
+
+/**
  * Do-once callback that initializes the read/write semaphore and registers
  * the built-in interpreters.
@@ -219 +271 @@
          */
         rc = rtDbgModDebugInterpreterRegister(&g_rtDbgModVtDbgNm);
+        if (RT_SUCCESS(rc))
+            rc = rtDbgModDebugInterpreterRegister(&g_rtDbgModVtDbgDwarf);
+        if (RT_SUCCESS(rc))
+            rc = rtDbgModImageInterpreterRegister(&g_rtDbgModVtImgLdr);
         if (RT_SUCCESS(rc))
         {
@@ -313 +369 @@
 
 
-RTDECL(int)         RTDbgModCreateFromImage(PRTDBGMOD phDbgMod, const char *pszFilename, const char *pszName, uint32_t fFlags)
-{
-
-    return VERR_NOT_IMPLEMENTED;
+RTDECL(int) RTDbgModCreateFromImage(PRTDBGMOD phDbgMod, const char *pszFilename, const char *pszName, uint32_t fFlags)
+{
+    /*
+     * Input validation and lazy initialization.
+     */
+    AssertPtrReturn(phDbgMod, VERR_INVALID_POINTER);
+    *phDbgMod = NIL_RTDBGMOD;
+    AssertPtrReturn(pszFilename, VERR_INVALID_POINTER);
+    AssertReturn(*pszFilename, VERR_INVALID_PARAMETER);
+    AssertPtrNullReturn(pszName, VERR_INVALID_POINTER);
+    AssertReturn(fFlags == 0, VERR_INVALID_PARAMETER);
+
+    int rc = rtDbgModLazyInit();
+    if (RT_FAILURE(rc))
+        return rc;
+
+    if (!pszName)
+        pszName = RTPathFilename(pszFilename);
+
+    /*
+     * Allocate a new module instance.
+     */
+    PRTDBGMODINT pDbgMod = (PRTDBGMODINT)RTMemAllocZ(sizeof(*pDbgMod));
+    if (!pDbgMod)
+        return VERR_NO_MEMORY;
+    pDbgMod->u32Magic = RTDBGMOD_MAGIC;
+    pDbgMod->cRefs = 1;
+    rc = RTCritSectInit(&pDbgMod->CritSect);
+    if (RT_SUCCESS(rc))
+    {
+        pDbgMod->pszName = RTStrCacheEnter(g_hDbgModStrCache, pszName);
+        if (pDbgMod->pszName)
+        {
+            pDbgMod->pszImgFile = RTStrCacheEnter(g_hDbgModStrCache, pszFilename);
+            if (pDbgMod->pszImgFile)
+            {
+                /*
+                 * Find an image reader which groks the file.
+                 */
+                rc = RTSemRWRequestRead(g_hDbgModRWSem, RT_INDEFINITE_WAIT);
+                if (RT_SUCCESS(rc))
+                {
+                    rc = VERR_DBG_NO_MATCHING_INTERPRETER;
+                    PRTDBGMODREGIMG pImg;
+                    for (pImg = g_pImgHead; pImg; pImg = pImg->pNext)
+                    {
+                        pDbgMod->pImgVt    = pImg->pVt;
+                        pDbgMod->pvImgPriv = NULL;
+                        rc = pImg->pVt->pfnTryOpen(pDbgMod);
+                        if (RT_SUCCESS(rc))
+                        {
+                            /*
+                             * Find a debug info interpreter.
+                             */
+                            rc = VERR_DBG_NO_MATCHING_INTERPRETER;
+                            for (PRTDBGMODREGDBG pDbg = g_pDbgHead; pDbg; pDbg = pDbg->pNext)
+                            {
+                                pDbgMod->pDbgVt = pDbg->pVt;
+                                pDbgMod->pvDbgPriv = NULL;
+                                rc = pDbg->pVt->pfnTryOpen(pDbgMod);
+                                if (RT_SUCCESS(rc))
+                                {
+                                    /*
+                                     * That's it!
+                                     */
+                                    ASMAtomicIncU32(&pDbg->cUsers);
+                                    ASMAtomicIncU32(&pImg->cUsers);
+                                    RTSemRWReleaseRead(g_hDbgModRWSem);
+
+                                    *phDbgMod = pDbgMod;
+                                    return rc;
+                                }
+                            }
+
+                            /*
+                             * Image detected, but found no debug info we were
+                             * able to understand.
+                             */
+                            /** @todo Fall back on exported symbols! */
+                            pDbgMod->pImgVt->pfnClose(pDbgMod);
+                            break;
+                        }
+                    }
+
+                    /*
+                     * Could it be a file containing raw debug info?
+                     */
+                    if (!pImg)
+                    {
+                        pDbgMod->pImgVt     = NULL;
+                        pDbgMod->pvImgPriv  = NULL;
+                        pDbgMod->pszDbgFile = pDbgMod->pszImgFile;
+                        pDbgMod->pszImgFile = NULL;
+
+                        for (PRTDBGMODREGDBG pDbg = g_pDbgHead; pDbg; pDbg = pDbg->pNext)
+                        {
+                            pDbgMod->pDbgVt = pDbg->pVt;
+                            pDbgMod->pvDbgPriv = NULL;
+                            rc = pDbg->pVt->pfnTryOpen(pDbgMod);
+                            if (RT_SUCCESS(rc))
+                            {
+                                /*
+                                 * That's it!
+                                 */
+                                ASMAtomicIncU32(&pDbg->cUsers);
+                                RTSemRWReleaseRead(g_hDbgModRWSem);
+
+                                *phDbgMod = pDbgMod;
+                                return rc;
+                            }
+                        }
+
+                        pDbgMod->pszImgFile = pDbgMod->pszDbgFile;
+                        pDbgMod->pszDbgFile = NULL;
+                    }
+
+                    /* bail out */
+                    RTSemRWReleaseRead(g_hDbgModRWSem);
+                }
+                RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszName);
+            }
+            RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszImgFile);
+        }
+        RTCritSectDelete(&pDbgMod->CritSect);
+    }
+
+    RTMemFree(pDbgMod);
+    return rc;
 }
 RT_EXPORT_SYMBOL(RTDbgModCreateFromImage);