Changeset 45984 in vbox for trunk/src/VBox/VMM

Timestamp:

May 11, 2013 12:46:30 PM (12 years ago)

Author:

vboxsync

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

85642

Message:

RTDbgCfg: Debugging configuration, like symbol search paths and such.

Location:

trunk/src/VBox/VMM

Files:

• VMMR3/DBGFAddrSpace.cpp (modified) (6 diffs)
• VMMR3/PATM.cpp (modified) (1 diff)
• include/DBGFInternal.h (modified) (2 diffs)

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

@@ -139 +139 @@
 int dbgfR3AsInit(PUVM pUVM)
 {
+    Assert(pUVM->pVM);
+
     /*
      * Create the semaphore.
@@ -144 +146 @@
     int rc = RTSemRWCreate(&pUVM->dbgf.s.hAsDbLock);
     AssertRCReturn(rc, rc);
+
+    /*
+     * Create the debugging config instance and set it up.
+     */
+    rc = RTDbgCfgCreate(&pUVM->dbgf.s.hDbgCfg, NULL);
+    AssertRCReturn(rc, rc);
+
+    static struct
+    {
+        RTDBGCFGPROP    enmProp;
+        const char     *pszEnvName;
+        const char     *pszCfgName;
+    } const s_aProps[] =
+    {
+        { RTDBGCFGPROP_FLAGS,               "VBOXDBG_FLAGS",            "Flags"             },
+        { RTDBGCFGPROP_PATH,                "VBOXDBG_PATH",             "Path"              },
+        { RTDBGCFGPROP_SUFFIXES,            "VBOXDBG_SUFFIXES",         "Suffixes"          },
+        { RTDBGCFGPROP_SRC_PATH,            "VBOXDBG_SRC_PATH",         "SrcPath"           },
+    };
+    PCFGMNODE pCfgDbgf = CFGMR3GetChild(CFGMR3GetRootU(pUVM), "/DBGF");
+    for (unsigned i = 0; i < RT_ELEMENTS(s_aProps); i++)
+    {
+        const char *pszEnvValue = RTEnvGet(s_aProps[i].pszEnvName);
+        if (pszEnvValue)
+        {
+            rc = RTDbgCfgChangeString(pUVM->dbgf.s.hDbgCfg, s_aProps[i].enmProp, RTDBGCFGOP_PREPEND, pszEnvValue);
+            if (RT_FAILURE(rc))
+                return VMR3SetError(pUVM, rc, RT_SRC_POS,
+                                    "DBGF Config Error: %s=%s -> %Rrc", s_aProps[i].pszEnvName, pszEnvValue, rc);
+        }
+
+        char *pszCfgValue;
+        int rc = CFGMR3QueryStringAllocDef(pCfgDbgf, s_aProps[i].pszCfgName, &pszCfgValue, NULL);
+        if (RT_FAILURE(rc))
+            return VMR3SetError(pUVM, rc, RT_SRC_POS,
+                                "DBGF Config Error: Querying /DBGF/%s -> %Rrc", s_aProps[i].pszCfgName, rc);
+        if (pszCfgValue)
+        {
+            rc = RTDbgCfgChangeString(pUVM->dbgf.s.hDbgCfg, s_aProps[i].enmProp, RTDBGCFGOP_PREPEND, pszCfgValue);
+            if (RT_FAILURE(rc))
+                return VMR3SetError(pUVM, rc, RT_SRC_POS,
+                                    "DBGF Config Error: /DBGF/%s=%s -> %Rrc", s_aProps[i].pszCfgName, pszCfgValue, rc);
+        }
+    }
 
     /*
@@ -419 +465 @@
     {
         RTDBGMOD hDbgMod;
-        int rc = RTDbgModCreateFromImage(&hDbgMod, pszFilename, pszName, 0 /*fFlags*/);
+        int rc = RTDbgModCreateFromImage(&hDbgMod, pszFilename, pszName, pVM->pUVM->dbgf.s.hDbgCfg);
         if (RT_SUCCESS(rc))
         {
@@ -740 +786 @@
 
 /**
- * Callback function used by DBGFR3AsLoadImage.
- *
- * @returns VBox status code.
- * @param   pszFilename     The filename under evaluation.
- * @param   pvUser          Use arguments (DBGFR3ASLOADOPENDATA).
- */
-static DECLCALLBACK(int) dbgfR3AsLoadImageOpen(const char *pszFilename, void *pvUser)
-{
-    DBGFR3ASLOADOPENDATA *pData = (DBGFR3ASLOADOPENDATA *)pvUser;
-    return RTDbgModCreateFromImage(&pData->hMod, pszFilename, pData->pszModName, pData->fFlags);
-}
-
-
-/**
  * Load symbols from an executable module into the specified address space.
  *
@@ -785 +817 @@
         return VERR_INVALID_HANDLE;
 
-    /*
-     * Do the work.
-     */
-    DBGFR3ASLOADOPENDATA Data;
-    Data.pszModName = pszModName;
-    Data.uSubtrahend = 0;
-    Data.fFlags = 0;
-    Data.hMod = NIL_RTDBGMOD;
-    int rc = dbgfR3AsSearchCfgPath(pUVM, pszFilename, "ImagePath", dbgfR3AsLoadImageOpen, &Data);
-    if (RT_FAILURE(rc))
-        rc = dbgfR3AsSearchEnvPath(pszFilename, "VBOXDBG_IMAGE_PATH", dbgfR3AsLoadImageOpen, &Data);
-    if (RT_FAILURE(rc))
-        rc = dbgfR3AsSearchCfgPath(pUVM, pszFilename, "Path", dbgfR3AsLoadImageOpen, &Data);
-    if (RT_FAILURE(rc))
-        rc = dbgfR3AsSearchEnvPath(pszFilename, "VBOXDBG_PATH", dbgfR3AsLoadImageOpen, &Data);
+    RTDBGMOD hDbgMod;
+    int rc = RTDbgModCreateFromImage(&hDbgMod, pszFilename, pszModName, pUVM->dbgf.s.hDbgCfg);
     if (RT_SUCCESS(rc))
     {
-        rc = DBGFR3AsLinkModule(pUVM, hRealAS, Data.hMod, pModAddress, iModSeg, 0);
+        rc = DBGFR3AsLinkModule(pUVM, hRealAS, hDbgMod, pModAddress, iModSeg, 0);
         if (RT_FAILURE(rc))
-            RTDbgModRelease(Data.hMod);
+            RTDbgModRelease(hDbgMod);
     }
 
     RTDbgAsRelease(hRealAS);
     return rc;
-}
-
-
-/**
- * Callback function used by DBGFR3AsLoadMap.
- *
- * @returns VBox status code.
- * @param   pszFilename     The filename under evaluation.
- * @param   pvUser          Use arguments (DBGFR3ASLOADOPENDATA).
- */
-static DECLCALLBACK(int) dbgfR3AsLoadMapOpen(const char *pszFilename, void *pvUser)
-{
-    DBGFR3ASLOADOPENDATA *pData = (DBGFR3ASLOADOPENDATA *)pvUser;
-    return RTDbgModCreateFromMap(&pData->hMod, pszFilename, pData->pszModName, pData->uSubtrahend, pData->fFlags);
 }
 
@@ -862 +867 @@
         return VERR_INVALID_HANDLE;
 
-    /*
-     * Do the work.
-     */
-    DBGFR3ASLOADOPENDATA Data;
-    Data.pszModName = pszModName;
-    Data.uSubtrahend = uSubtrahend;
-    Data.fFlags = 0;
-    Data.hMod = NIL_RTDBGMOD;
-    int rc = dbgfR3AsSearchCfgPath(pUVM, pszFilename, "MapPath", dbgfR3AsLoadMapOpen, &Data);
-    if (RT_FAILURE(rc))
-        rc = dbgfR3AsSearchEnvPath(pszFilename, "VBOXDBG_MAP_PATH", dbgfR3AsLoadMapOpen, &Data);
-    if (RT_FAILURE(rc))
-        rc = dbgfR3AsSearchCfgPath(pUVM, pszFilename, "Path", dbgfR3AsLoadMapOpen, &Data);
-    if (RT_FAILURE(rc))
-        rc = dbgfR3AsSearchEnvPath(pszFilename, "VBOXDBG_PATH", dbgfR3AsLoadMapOpen, &Data);
+    RTDBGMOD hDbgMod;
+    int rc = RTDbgModCreateFromMap(&hDbgMod, pszFilename, pszModName, uSubtrahend, pUVM->dbgf.s.hDbgCfg);
     if (RT_SUCCESS(rc))
     {
-        rc = DBGFR3AsLinkModule(pUVM, hRealAS, Data.hMod, pModAddress, iModSeg, 0);
+        rc = DBGFR3AsLinkModule(pUVM, hRealAS, hDbgMod, pModAddress, iModSeg, 0);
         if (RT_FAILURE(rc))
-            RTDbgModRelease(Data.hMod);
+            RTDbgModRelease(hDbgMod);
     }
 

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

@@ -4148 +4148 @@
         return VERR_PATCHING_REFUSED;
 
-#if 0 /* DONT COMMIT ENABLED! */
+#if 1 /* DONT COMMIT ENABLED! */
     /* Blacklisted NT4SP1 areas - debugging why we sometimes crash early on, */
     if (  0

trunk/src/VBox/VMM/include/DBGFInternal.h

@@ -25 +25 @@
 #include <iprt/string.h>
 #include <iprt/avl.h>
+#include <iprt/dbg.h>
 #include <VBox/vmm/dbgf.h>
 
@@ -307 +308 @@
     /** Alignment padding. */
     bool                        afAlignment1[2];
+    /** Debug configuration. */
+    R3PTRTYPE(RTDBGCFG)         hDbgCfg;
 
     /** The register database lock. */