Changeset 46165 in vbox for trunk/src/VBox/Runtime/common/dbg

Timestamp:

May 19, 2013 7:07:50 PM (12 years ago)

Author:

vboxsync

Message:

Made dSYM-bundle loading work as well as line numbers in the stack traces (when possible).

Location:

trunk/src/VBox/Runtime/common/dbg

Files:

• dbgas.cpp (modified) (4 diffs)
• dbgmod.cpp (modified) (3 diffs)
• dbgmoddwarf.cpp (modified) (1 diff)

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

@@ -1696 +1696 @@
 
 
-/**
- * Query a line number by address.
- *
- * @returns IPRT status code. See RTDbgModSymbolAddrA for more specific ones.
- * @retval  VERR_INVALID_HANDLE if hDbgAs is invalid.
- * @retval  VERR_NOT_FOUND if the address couldn't be mapped to a module.
- *
- * @param   hDbgAs          The address space handle.
- * @param   Addr            The address which closest symbol is requested.
- * @param   poffDisp        Where to return the distance between the line
- *                          number and address.
- * @param   pLine           Where to return the line number information.
- */
-RTDECL(int) RTDbgAsLineByAddr(RTDBGAS hDbgAs, RTUINTPTR Addr, PRTINTPTR poffDisp, PRTDBGLINE pLine)
+RTDECL(int) RTDbgAsLineByAddr(RTDBGAS hDbgAs, RTUINTPTR Addr, PRTINTPTR poffDisp, PRTDBGLINE pLine, PRTDBGMOD phMod)
 {
     /*
@@ -1729 +1716 @@
     int rc = RTDbgModLineByAddr(hMod, iSeg, offSeg, poffDisp, pLine);
     if (RT_SUCCESS(rc))
+    {
         rtDbgAsAdjustLineAddress(pLine, hMod, MapAddr, iSeg);
-    RTDbgModRelease(hMod);
+        if (phMod)
+            *phMod = hMod;
+        else
+            RTDbgModRelease(hMod);
+    }
+    else
+        RTDbgModRelease(hMod);
     return rc;
 }
@@ -1736 +1730 @@
 
 
-/**
- * Query a line number by address.
- *
- * @returns IPRT status code. See RTDbgModSymbolAddrA for more specific ones.
- * @retval  VERR_INVALID_HANDLE if hDbgAs is invalid.
- * @retval  VERR_NOT_FOUND if the address couldn't be mapped to a module.
- *
- * @param   hDbgAs          The address space handle.
- * @param   Addr            The address which closest symbol is requested.
- * @param   poffDisp        Where to return the distance between the line
- *                          number and address.
- * @param   ppLine          Where to return the pointer to the allocated line
- *                          number info. Always set. Free with RTDbgLineFree.
- */
-RTDECL(int) RTDbgAsLineByAddrA(RTDBGAS hDbgAs, RTUINTPTR Addr, PRTINTPTR poffDisp, PRTDBGLINE *ppLine)
+RTDECL(int) RTDbgAsLineByAddrA(RTDBGAS hDbgAs, RTUINTPTR Addr, PRTINTPTR poffDisp, PRTDBGLINE *ppLine, PRTDBGMOD phMod)
 {
     /*
@@ -1770 +1750 @@
     int rc = RTDbgModLineByAddrA(hMod, iSeg, offSeg, poffDisp, ppLine);
     if (RT_SUCCESS(rc))
+    {
         rtDbgAsAdjustLineAddress(*ppLine, hMod, MapAddr, iSeg);
-    RTDbgModRelease(hMod);
+        if (phMod)
+            *phMod = hMod;
+        else
+            RTDbgModRelease(hMod);
+    }
+    else
+        RTDbgModRelease(hMod);
     return rc;
 }

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

@@ -486 +486 @@
                 return VINF_SUCCESS;
             }
-            pDbgMod->pDbgVt    = NULL;
+
+            pDbgMod->pDbgVt = NULL;
             Assert(pDbgMod->pvDbgPriv == NULL);
         }
@@ -530 +531 @@
                 return VINF_CALLBACK_RETURN;
             }
-            pDbgMod->pDbgVt    = NULL;
+
+            pDbgMod->pDbgVt = NULL;
             Assert(pDbgMod->pvDbgPriv == NULL);
         }
+        RTSemRWReleaseRead(g_hDbgModRWSem);
     }
 
     /* No joy. */
-    RTSemRWReleaseRead(g_hDbgModRWSem);
     RTStrCacheRelease(g_hDbgModStrCache, pDbgMod->pszDbgFile);
     pDbgMod->pszDbgFile = NULL;
@@ -843 +845 @@
                             if (RT_SUCCESS(rc))
                             {
+                                /*
+                                 * We're done!
+                                 */
+                                ASMAtomicIncU32(&pImg->cUsers);
+                                RTSemRWReleaseRead(g_hDbgModRWSem);
+
                                 *phDbgMod = pDbgMod;
                                 return VINF_SUCCESS;

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

@@ -3696 +3696 @@
                                                        pSubProgram->PcRange.uHighAddress - pSubProgram->PcRange.uLowAddress,
                                                        0 /*fFlags*/, NULL /*piOrdinal*/);
-                                AssertRC(rc);
+                                AssertMsg(RT_SUCCESS(rc) || rc == VERR_DBG_DUPLICATE_SYMBOL, ("%Rrc\n", rc));
                             }
                             else