Changeset 73491 in vbox for trunk/src/VBox/VMM/VMMR3

Timestamp:

Aug 3, 2018 2:51:55 PM (7 years ago)

Author:

vboxsync

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

124118

Message:

DBGF,DBGPluInWinNt: Produce more useful module names (e.g. stuff that works in DBGC).

File:

• trunk/src/VBox/VMM/VMMR3/DBGFR3ModInMem.cpp (modified) (12 diffs)

trunk/src/VBox/VMM/VMMR3/DBGFR3ModInMem.cpp

@@ -24 +24 @@
 
 #include <VBox/err.h>
+#include <iprt/ctype.h>
 #include <iprt/ldr.h>
 #include <iprt/mem.h>
+#include <iprt/path.h>
 #include <iprt/string.h>
 #include <iprt/formats/pecoff.h>
@@ -85 +87 @@
 
 /**
+ * Normalizes a debug module name.
+ *
+ * @returns Normalized debug module name.
+ * @param   pszName         The name.
+ * @param   pszBuf          Buffer to use if work is needed.
+ * @param   cbBuf           Size of buffer.
+ */
+const char *dbgfR3ModNormalizeName(const char *pszName, char *pszBuf, size_t cbBuf)
+{
+    /*
+     * Skip to the filename in case someone gave us a full filename path.
+     */
+    pszName = RTPathFilenameEx(pszName, RTPATH_STR_F_STYLE_DOS);
+
+    /*
+     * Is it okay?
+     */
+    size_t cchName = strlen(pszName);
+    size_t off = 0;
+    for (;; off++)
+    {
+        char ch = pszName[off];
+        if (ch == '\0')
+            return pszName;
+        if (!RT_C_IS_ALNUM(ch) && ch != '_')
+            break;
+    }
+
+    /*
+     * It's no okay, so morph it.
+     */
+    if (cchName >= cbBuf)
+        cchName = cbBuf - 1;
+    for (off = 0; off < cchName; off++)
+    {
+        char ch = pszName[off];
+        if (!RT_C_IS_ALNUM(ch))
+            ch = '_';
+        pszBuf[off] = ch;
+    }
+    pszBuf[off] = '\0';
+
+    return pszBuf;
+}
+
+
+/**
  * Handles in-memory ELF images.
  *
@@ -91 +140 @@
  * @param   pImageAddr      The image address.
  * @param   fFlags          Flags, DBGFMODINMEM_F_XXX.
- * @param   pszName         The image name, optional.
+ * @param   pszName         The module name, optional.
+ * @param   pszFilename     The image filename, optional.
  * @param   enmArch         The image arch if we force it, pass
  *                          RTLDRARCH_WHATEVER if you don't care.
@@ -99 +149 @@
  * @param   pErrInfo        Where to return extended error info on failure.
  */
-static int dbgfR3ModInMemElf(PUVM pUVM, PCDBGFADDRESS pImageAddr, uint32_t fFlags, const char *pszName,
+static int dbgfR3ModInMemElf(PUVM pUVM, PCDBGFADDRESS pImageAddr, uint32_t fFlags, const char *pszName, const char *pszFilename,
                              RTLDRARCH enmArch, uint32_t cbImage, PDBGFMODINMEMBUF puBuf,
                              PRTDBGMOD phDbgMod, PRTERRINFO pErrInfo)
 {
-    RT_NOREF(pUVM, fFlags, pszName, enmArch, cbImage, puBuf, phDbgMod);
+    RT_NOREF(pUVM, fFlags, pszName, pszFilename, enmArch, cbImage, puBuf, phDbgMod);
     return RTERRINFO_LOG_SET_F(pErrInfo, VERR_INVALID_EXE_SIGNATURE, "Found ELF magic at %RGv", pImageAddr->FlatPtr);
 }
@@ -422 +472 @@
  * @param   pImageAddr      The image address.
  * @param   fFlags          Flags, DBGFMODINMEM_F_XXX.
- * @param   pszName         The image name, optional.
+ * @param   pszName         The module name, optional.
+ * @param   pszFilename     The image filename, optional.
  * @param   enmArch         The image arch if we force it, pass
  *                          RTLDRARCH_WHATEVER if you don't care.
@@ -432 +483 @@
  * @param   pErrInfo        Where to return extended error info on failure.
  */
-static int dbgfR3ModInMemPe(PUVM pUVM, PCDBGFADDRESS pImageAddr, uint32_t fFlags, const char *pszName, RTLDRARCH enmArch,
-                            uint32_t cbImage, uint32_t offPeHdrs, uint32_t cbPeHdrsPart1, PDBGFMODINMEMBUF puBuf,
-                            PRTDBGMOD phDbgMod, PRTERRINFO pErrInfo)
+static int dbgfR3ModInMemPe(PUVM pUVM, PCDBGFADDRESS pImageAddr, uint32_t fFlags, const char *pszName, const char *pszFilename,
+                            RTLDRARCH enmArch, uint32_t cbImage, uint32_t offPeHdrs, uint32_t cbPeHdrsPart1,
+                            PDBGFMODINMEMBUF puBuf, PRTDBGMOD phDbgMod, PRTERRINFO pErrInfo)
 {
     /*
@@ -533 +584 @@
 
     /*
-     * Guess the image name if not specified.
-     */
-    //char szImageName[64];
+     * Guess the module name if not specified and make sure it conforms to DBGC expectations.
+     */
     if (!pszName)
     {
+        if (pszFilename)
+            pszName = RTPathFilenameEx(pszFilename, RTPATH_STR_F_STYLE_DOS);
         /** @todo */
     }
+
+    char szNormalized[128];
+    pszName = dbgfR3ModNormalizeName(pszName, szNormalized, sizeof(szNormalized));
 
     /*
@@ -552 +607 @@
 
     RTDBGMOD hMod;
-    rc = RTDbgModCreateFromPeImage(&hMod, pszName, NULL, &hLdrMod, cbImageFromHdr,
+    rc = RTDbgModCreateFromPeImage(&hMod, pszFilename, pszName, &hLdrMod, cbImageFromHdr,
                                    puBuf->Nt32.FileHeader.TimeDateStamp, DBGFR3AsGetConfig(pUVM));
     if (RT_SUCCESS(rc))
@@ -579 +634 @@
  * @param   pImageAddr      The image address.
  * @param   fFlags          Flags, DBGFMODINMEM_F_XXX.
- * @param   pszName         The image name, optional.
+ * @param   pszName         The module name, optional.
+ * @param   pszFilename     The image filename, optional.
  * @param   enmArch         The image arch if we force it, pass
  *                          RTLDRARCH_WHATEVER if you don't care.
@@ -586 +642 @@
  * @param   pErrInfo        Where to return extended error info on failure.
  */
-VMMR3DECL(int) DBGFR3ModInMem(PUVM pUVM, PCDBGFADDRESS pImageAddr, uint32_t fFlags, const char *pszName,
+VMMR3DECL(int) DBGFR3ModInMem(PUVM pUVM, PCDBGFADDRESS pImageAddr, uint32_t fFlags, const char *pszName, const char *pszFilename,
                               RTLDRARCH enmArch, uint32_t cbImage, PRTDBGMOD phDbgMod, PRTERRINFO pErrInfo)
 {
@@ -612 +668 @@
 
     if (uBuf.ab[0] == ELFMAG0 && uBuf.ab[1] == ELFMAG1 && uBuf.ab[2] == ELFMAG2 && uBuf.ab[3] == ELFMAG3)
-        return dbgfR3ModInMemElf(pUVM, pImageAddr, fFlags, pszName, enmArch, cbImage, &uBuf, phDbgMod, pErrInfo);
+        return dbgfR3ModInMemElf(pUVM, pImageAddr, fFlags, pszName, pszFilename, enmArch, cbImage, &uBuf, phDbgMod, pErrInfo);
 
     uint32_t offNewHdrs;
@@ -642 +698 @@
 
     if (uBuf.Nt32.Signature == IMAGE_NT_SIGNATURE)
-        return dbgfR3ModInMemPe(pUVM, pImageAddr, fFlags, pszName, enmArch, cbImage, offNewHdrs, cbPeHdrsPart1, &uBuf,
-                                phDbgMod, pErrInfo);
+        return dbgfR3ModInMemPe(pUVM, pImageAddr, fFlags, pszName, pszFilename, enmArch, cbImage, offNewHdrs, cbPeHdrsPart1,
+                                &uBuf, phDbgMod, pErrInfo);
 
     return RTERRINFO_LOG_SET_F(pErrInfo, VERR_INVALID_EXE_SIGNATURE, "No PE/LX/NE header at %RGv (off=%#RX32): %.8Rhxs",