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

Timestamp:

May 25, 2013 7:51:19 PM (12 years ago)

Author:

vboxsync

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

86000

Message:

IPRT: Changed RTLDRSEG::pchName to pszName and make sure it's always set to something. Started on implementing a codeview reader.

Location:

trunk/src/VBox/Runtime/common/dbg

Files:

• dbgmod.cpp (modified) (1 diff)
• dbgmodcodeview.cpp (added)
• dbgmoddbghelp.cpp (modified) (1 diff)
• dbgmoddeferred.cpp (modified) (2 diffs)
• dbgmoddwarf.cpp (modified) (2 diffs)
• dbgmodexports.cpp (modified) (2 diffs)
• dbgmodldr.cpp (modified) (2 diffs)

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

@@ -280 +280 @@
         if (RT_SUCCESS(rc))
             rc = rtDbgModDebugInterpreterRegister(&g_rtDbgModVtDbgDwarf);
+#if 0 /* NOTE!! EXPERIMENTAL, SHOULDN'T BE ENABLED IN SVN YET!! */
+        if (RT_SUCCESS(rc))
+            rc = rtDbgModDebugInterpreterRegister(&g_rtDbgModVtDbgCodeView);
+#endif
 #ifdef RT_OS_WINDOWS
         if (RT_SUCCESS(rc))

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

@@ -366 +366 @@
 
     Log(("Segment %.*s: LinkAddress=%#llx RVA=%#llx cb=%#llx\n",
-         pSeg->cchName, pSeg->pchName, (uint64_t)pSeg->LinkAddress, (uint64_t)pSeg->RVA, pSeg->cb));
+         pSeg->cchName, pSeg->pszName, (uint64_t)pSeg->LinkAddress, (uint64_t)pSeg->RVA, pSeg->cb));
+
+    Assert(pSeg->cchName > 0);
+    Assert(!pSeg->pszName[pSeg->cchName]);
 
     if (!pSeg->RVA)
         pArgs->uModAddr = pSeg->LinkAddress;
 
-    NOREF(hLdrMod);
-    char *pszName = (char *)pSeg->pchName;
-    if (pszName[pSeg->cchName])
-    {
-        pszName = (char *)alloca(pSeg->cchName + 1);
-        memcpy(pszName, pSeg->pchName, pSeg->cchName);
-        pszName[pSeg->cchName] = '\0';
-    }
-
     RTLDRADDR cb = RT_MAX(pSeg->cb, pSeg->cbMapped);
-    return RTDbgModSegmentAdd(pArgs->hCnt, pSeg->RVA, cb, pszName, 0 /*fFlags*/, NULL);
+    return RTDbgModSegmentAdd(pArgs->hCnt, pSeg->RVA, cb, pSeg->pszName, 0 /*fFlags*/, NULL);
 }
 

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

@@ -467 +467 @@
 
 
+/** @interface_method_impl{RTDBGMODVTIMG,pfnReadAt} */
+static DECLCALLBACK(int) rtDbgModDeferredImg_ReadAt(PRTDBGMODINT pMod, uint32_t iDbgInfoHint, RTFOFF off, void *pvBuf, size_t cb)
+{
+    int rc = rtDbgModDeferredDoIt(pMod, false /*fForceRetry*/);
+    if (RT_SUCCESS(rc))
+        rc = pMod->pImgVt->pfnReadAt(pMod, iDbgInfoHint, off, pvBuf, cb);
+    return rc;
+}
+
+
 /** @interface_method_impl{RTDBGMODVTIMG,pfnUnmapPart} */
 static DECLCALLBACK(int) rtDbgModDeferredImg_UnmapPart(PRTDBGMODINT pMod, size_t cb, void const **ppvMap)
@@ -580 +590 @@
     /*.pfnMapPart = */                  rtDbgModDeferredImg_MapPart,
     /*.pfnUnmapPart = */                rtDbgModDeferredImg_UnmapPart,
+    /*.pfnReadAt = */                   rtDbgModDeferredImg_ReadAt,
     /*.pfnGetFormat = */                rtDbgModDeferredImg_GetFormat,
     /*.pfnGetArch = */                  rtDbgModDeferredImg_GetArch,

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

@@ -1177 +1177 @@
     PRTDBGMODDWARF pThis = (PRTDBGMODDWARF)pvUser;
     Log(("Segment %.*s: LinkAddress=%#llx RVA=%#llx cb=%#llx\n",
-         pSeg->cchName, pSeg->pchName, (uint64_t)pSeg->LinkAddress, (uint64_t)pSeg->RVA, pSeg->cb));
+         pSeg->cchName, pSeg->pszName, (uint64_t)pSeg->LinkAddress, (uint64_t)pSeg->RVA, pSeg->cb));
     NOREF(hLdrMod);
 
@@ -1193 +1193 @@
     PRTDBGMODDWARF pThis = (PRTDBGMODDWARF)pvUser;
     Log(("Segment %.*s: LinkAddress=%#llx RVA=%#llx cb=%#llx\n",
-         pSeg->cchName, pSeg->pchName, (uint64_t)pSeg->LinkAddress, (uint64_t)pSeg->RVA, pSeg->cb));
+         pSeg->cchName, pSeg->pszName, (uint64_t)pSeg->LinkAddress, (uint64_t)pSeg->RVA, pSeg->cb));
     NOREF(hLdrMod);
-    AssertReturn(!pSeg->pchName[pSeg->cchName], VERR_DWARF_IPE);
+    Assert(pSeg->cchName > 0);
+    Assert(!pSeg->pszName[pSeg->cchName]);
 
     /* If the segment doesn't have a mapping, just add a dummy so the indexing
        works out correctly (same as for the image). */
     if (pSeg->RVA == NIL_RTLDRADDR)
-        return RTDbgModSegmentAdd(pThis->hCnt, 0, 0, pSeg->pchName, 0 /*fFlags*/, NULL);
+        return RTDbgModSegmentAdd(pThis->hCnt, 0, 0, pSeg->pszName, 0 /*fFlags*/, NULL);
 
     /* The link address is 0 for all segments in a relocatable ELF image. */
     RTLDRADDR cb = RT_MAX(pSeg->cb, pSeg->cbMapped);
-    return RTDbgModSegmentAdd(pThis->hCnt, pSeg->RVA, cb, pSeg->pchName, 0 /*fFlags*/, NULL);
+    return RTDbgModSegmentAdd(pThis->hCnt, pSeg->RVA, cb, pSeg->pszName, 0 /*fFlags*/, NULL);
 }
 

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

@@ -79 +79 @@
     PRTDBGMODEXPORTARGS pArgs = (PRTDBGMODEXPORTARGS)pvUser;
     Log(("Segment %.*s: LinkAddress=%#llx RVA=%#llx cb=%#llx\n",
-         pSeg->cchName, pSeg->pchName, (uint64_t)pSeg->LinkAddress, (uint64_t)pSeg->RVA, pSeg->cb));
+         pSeg->cchName, pSeg->pszName, (uint64_t)pSeg->LinkAddress, (uint64_t)pSeg->RVA, pSeg->cb));
     NOREF(hLdrMod);
 
@@ -88 +88 @@
         pArgs->uImageBase = pSeg->LinkAddress;
 
-    /* Make sure the name is terminated before we add it. */
-    char *pszName = (char *)pSeg->pchName;
-    if (pszName[pSeg->cchName])
-    {
-        pszName = (char *)alloca(pSeg->cchName + 1);
-        memcpy(pszName, pSeg->pchName, pSeg->cchName);
-        pszName[pSeg->cchName] = '\0';
-    }
-
     /* Add dummy segments for segments that doesn't get mapped. */
     if (pSeg->LinkAddress == NIL_RTLDRADDR)
-        return RTDbgModSegmentAdd(pArgs->pDbgMod, 0, 0, pszName, 0 /*fFlags*/, NULL);
+        return RTDbgModSegmentAdd(pArgs->pDbgMod, 0, 0, pSeg->pszName, 0 /*fFlags*/, NULL);
 
     RTLDRADDR cb = RT_MAX(pSeg->cb, pSeg->cbMapped);
-    return RTDbgModSegmentAdd(pArgs->pDbgMod, pSeg->RVA, cb, pszName, 0 /*fFlags*/, NULL);
+    return RTDbgModSegmentAdd(pArgs->pDbgMod, pSeg->RVA, cb, pSeg->pszName, 0 /*fFlags*/, NULL);
 }
 

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

@@ -74 +74 @@
     PRTDBGMODLDR pThis = (PRTDBGMODLDR)pMod->pvImgPriv;
     return RTLdrGetFormat(pThis->hLdrMod);
+}
+
+
+/** @interface_method_impl{RTDBGMODVTIMG,pfnReadAt} */
+static DECLCALLBACK(int) rtDbgModLdr_ReadAt(PRTDBGMODINT pMod, uint32_t iDbgInfoHint, RTFOFF off, void *pvBuf, size_t cb)
+{
+    PRTDBGMODLDR pThis = (PRTDBGMODLDR)pMod->pvImgPriv;
+    return rtLdrReadAt(pThis->hLdrMod, pvBuf, UINT32_MAX /** @todo iDbgInfo*/, off, cb);
 }
 
@@ -205 +213 @@
     /*.pfnMapPart = */                  rtDbgModLdr_MapPart,
     /*.pfnUnmapPart = */                rtDbgModLdr_UnmapPart,
+    /*.pfnReadAt = */                   rtDbgModLdr_ReadAt,
     /*.pfnGetFormat = */                rtDbgModLdr_GetFormat,
     /*.pfnGetArch = */                  rtDbgModLdr_GetArch,