Changeset 46078 in vbox for trunk

Timestamp:

May 14, 2013 6:22:53 PM (12 years ago)

Author:

vboxsync

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

85754

Message:

More debugging fixes.

Location:

trunk

Files:

• include/iprt/win/lazy-dbghelp.h (modified) (2 diffs)
• src/VBox/Debugger/DBGCEmulateCodeView.cpp (modified) (1 diff)
• src/VBox/Debugger/DBGConsole.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/dbg/dbgcfg.cpp (modified) (1 diff)
• src/VBox/Runtime/common/dbg/dbgmoddbghelp.cpp (modified) (3 diffs)
• src/VBox/Runtime/common/ldr/ldrPE.cpp (modified) (5 diffs)
• src/VBox/Runtime/tools/RTNtDbgHelp.cpp (modified) (2 diffs)

trunk/include/iprt/win/lazy-dbghelp.h

@@ -47 +47 @@
         rc = RTPathAppend(szPath, sizeof(szPath), "Debugging Tools for Windows (x86)\\dbghelp.dll");
 #else
-        rc = RTPathAppend(szPath, sizeof(szPath), "Debugging Tools for Windows (amd64)\\dbghelp.dll");
+        rc = RTPathAppend(szPath, sizeof(szPath), "Debugging Tools for Windows (x64)\\dbghelp.dll");
 #endif
         if (RTPathExists(szPath))
@@ -60 +60 @@
 }
 
-RTLDRLAZY_MODULE(dbghelp, "dbghelp.dll");
+RTLDRLAZY_MODULE_EX(dbghelp, "dbghelp.dll", rtLdrLazyLoadDbgHelp);
 
 RTLDRLAZY_FUNC(dbghelp, BOOL, WINAPI, SymInitialize, (HANDLE a1, PCWSTR a2, BOOL a3), (a1, a2, a3), FALSE);

trunk/src/VBox/Debugger/DBGCEmulateCodeView.cpp

@@ -3802 +3802 @@
             return pCmdHlp->pfnVBoxError(pCmdHlp, rc, "DBGFR3AsSymbolByName(,,%s,)\n", pArg->u.pszString);
 
-        rc = pCmdHlp->pfnPrintf(pCmdHlp, NULL, "%Rptr %s\n", Symbol.Value, Symbol.szName);
+        rc = pCmdHlp->pfnPrintf(pCmdHlp, NULL, "%RTptr %s\n", Symbol.Value, Symbol.szName);
     }
     else

trunk/src/VBox/Debugger/DBGConsole.cpp

@@ -1050 +1050 @@
         if (RT_SUCCESS(rc))
         {
-
             /*
              * Set debug config log callback.
@@ -1084 +1083 @@
             }
         }
-
     }
     else

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

@@ -1160 +1160 @@
     if (RT_SUCCESS(rc))
     {
-        if (   pThis->pfnLogCallback != NULL
-            && (   pfnCallback == NULL
-                || pfnCallback == pThis->pfnLogCallback) )
+        if (   pThis->pfnLogCallback == NULL
+            || pfnCallback == NULL
+            || pfnCallback == pThis->pfnLogCallback)
         {
             pThis->pfnLogCallback = NULL;

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

@@ -345 +345 @@
 static DECLCALLBACK(int) rtDbgModDbgHelpAddSegmentsCallback(RTLDRMOD hLdrMod, PCRTLDRSEG pSeg, void *pvUser)
 {
-    RTDBGMOD hCnt = (RTDBGMOD)pvUser;
+    RTDBGMODBGHELPARGS *pArgs = (RTDBGMODBGHELPARGS *)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));
+
+    if (!pSeg->RVA)
+        pArgs->uModAddr = pSeg->LinkAddress;
+
     NOREF(hLdrMod);
     char *pszName = (char *)pSeg->pchName;
@@ -359 +363 @@
 
     RTLDRADDR cb = RT_MAX(pSeg->cb, pSeg->cbMapped);
-    return RTDbgModSegmentAdd(hCnt, pSeg->RVA, cb, pszName, 0 /*fFlags*/, NULL);
+    return RTDbgModSegmentAdd(pArgs->hCnt, pSeg->RVA, cb, pszName, 0 /*fFlags*/, NULL);
 }
 
@@ -375 +379 @@
 
     /*
-     * Try load the module into an empty address space.
+     * Create a container for copying the information into.  We do this early
+     * so we can determine the image base address.
      */
-    static uint32_t volatile s_uFakeHandle = 0x3940000;
-    HANDLE hFake;
-    do
-        hFake = (HANDLE)(uintptr_t)ASMAtomicIncU32(&s_uFakeHandle);
-    while (hFake == NULL || hFake == INVALID_HANDLE_VALUE);
-
-    int rc;
-    if (SymInitialize(hFake, NULL /*SearchPath*/, FALSE /*fInvalidProcess*/))
+    RTDBGMOD hCnt;
+    int rc = RTDbgModCreate(&hCnt, pMod->pszName, 0 /*cbSeg*/, 0 /*fFlags*/);
+    if (RT_SUCCESS(rc))
     {
-        SymSetOptions(SYMOPT_LOAD_LINES | SymGetOptions());
-
-        PRTUTF16 pwszDbgFile;
-        rc = RTStrToUtf16(pMod->pszDbgFile, &pwszDbgFile);
+        RTDBGMODBGHELPARGS Args;
+        RT_ZERO(Args);
+        Args.hCnt = hCnt;
+        rc = pMod->pImgVt->pfnEnumSegments(pMod, rtDbgModDbgHelpAddSegmentsCallback, &Args);
         if (RT_SUCCESS(rc))
         {
-            uint64_t uModAddr = SymLoadModuleExW(hFake, NULL /*hFile*/, pwszDbgFile, NULL /*pszModName*/,
-                                                 0 /*uLoadAddr*/, 0 /*cbImage*/, NULL /*pModData*/, 0 /*fFlags*/);
-            if (uModAddr != 0)
+            uint32_t cbImage    = pMod->pImgVt->pfnImageSize(pMod);
+            uint64_t uImageBase = Args.uModAddr ? Args.uModAddr : 0x4000000;
+
+            /*
+             * Try load the module into an empty address space.
+             */
+            static uint32_t volatile s_uFakeHandle = 0x3940000;
+            HANDLE hFake;
+            do
+                hFake = (HANDLE)(uintptr_t)ASMAtomicIncU32(&s_uFakeHandle);
+            while (hFake == NULL || hFake == INVALID_HANDLE_VALUE);
+
+            if (SymInitialize(hFake, NULL /*SearchPath*/, FALSE /*fInvalidProcess*/))
             {
-                /*
-                 * Create a container for copying the information into.
-                 */
-                RTDBGMOD hCnt;
-                rc = RTDbgModCreate(&hCnt, pMod->pszName, 0 /*cbSeg*/, 0 /*fFlags*/);
+                SymSetOptions(SYMOPT_LOAD_LINES | SymGetOptions());
+
+                PRTUTF16 pwszDbgFile;
+                rc = RTStrToUtf16(pMod->pszDbgFile, &pwszDbgFile);
                 if (RT_SUCCESS(rc))
                 {
-                    rc = pMod->pImgVt->pfnEnumSegments(pMod, rtDbgModDbgHelpAddSegmentsCallback, hCnt);
-                    if (RT_SUCCESS(rc))
+                    uint64_t uModAddr = SymLoadModuleExW(hFake, NULL /*hFile*/, pwszDbgFile, NULL /*pszModName*/,
+                                                         uImageBase, cbImage, NULL /*pModData*/, 0 /*fFlags*/);
+                    if (uModAddr != 0)
+                    {
                         rc = rtDbgModDbgHelpCopySymbols(pMod, hCnt, hFake, uModAddr);
-                    if (RT_SUCCESS(rc))
-                        rc = rtDbgModDbgHelpCopyLineNumbers(pMod, hCnt, hFake, uModAddr);
-                    if (RT_SUCCESS(rc))
-                    {
-                        pMod->pvDbgPriv = hCnt;
-                        pMod->pDbgVt    = &g_rtDbgModVtDbgDbgHelp;
-                        hCnt = NIL_RTDBGMOD;
+                        if (RT_SUCCESS(rc))
+                            rc = rtDbgModDbgHelpCopyLineNumbers(pMod, hCnt, hFake, uModAddr);
+                        if (RT_SUCCESS(rc))
+                        {
+                            pMod->pvDbgPriv = hCnt;
+                            pMod->pDbgVt    = &g_rtDbgModVtDbgDbgHelp;
+                            hCnt = NIL_RTDBGMOD;
+                        }
+
+                        SymUnloadModule64(hFake, uModAddr);
                     }
-                    RTDbgModRelease(hCnt);
+                    else
+                        rc = RTErrConvertFromWin32(GetLastError());
+                    RTUtf16Free(pwszDbgFile);
                 }
 
-                SymUnloadModule64(hFake, uModAddr);
+                BOOL fRc2 = SymCleanup(hFake); Assert(fRc2); NOREF(fRc2);
             }
             else
                 rc = RTErrConvertFromWin32(GetLastError());
-            RTUtf16Free(pwszDbgFile);
         }
-
-        BOOL fRc2 = SymCleanup(hFake); Assert(fRc2); NOREF(fRc2);
+        RTDbgModRelease(hCnt);
     }
-    else
-        rc = RTErrConvertFromWin32(GetLastError());
     return rc;
 }

trunk/src/VBox/Runtime/common/ldr/ldrPE.cpp

@@ -942 +942 @@
     SegInfo.fProt       = RTMEM_PROT_READ;
     SegInfo.Alignment   = 1;
-    SegInfo.LinkAddress = 0;
-    SegInfo.RVA         = SegInfo.LinkAddress;
+    SegInfo.LinkAddress = pModPe->uImageBase;
+    SegInfo.RVA         = 0;
     SegInfo.offFile     = 0;
     SegInfo.cb          = pModPe->cbHeaders;
@@ -981 +981 @@
         else
         {
-            SegInfo.LinkAddress = pSh->VirtualAddress;
-            SegInfo.RVA         = SegInfo.LinkAddress;
+            SegInfo.LinkAddress = pSh->VirtualAddress + pModPe->uImageBase ;
+            SegInfo.RVA         = pSh->VirtualAddress;
             SegInfo.cbMapped    = RT_ALIGN(SegInfo.cb, SegInfo.Alignment);
             if (i + 1 < pModPe->cSections && !(pSh[1].Characteristics & IMAGE_SCN_TYPE_NOLOAD))
@@ -1012 +1012 @@
     PRTLDRMODPE pModPe = (PRTLDRMODPE)pMod;
 
-    /* Note! LinkAddress == RVA */
+    LinkAddress -= pModPe->uImageBase;
 
     /* Special header segment. */
@@ -1051 +1051 @@
     PRTLDRMODPE pModPe = (PRTLDRMODPE)pMod;
 
+    LinkAddress -= pModPe->uImageBase;
     if (LinkAddress > pModPe->cbImage)
         return VERR_LDR_INVALID_LINK_ADDRESS;
     *pRva = LinkAddress;
+
     return VINF_SUCCESS;
 }
@@ -1082 +1084 @@
                                                 uint32_t *piSeg, PRTLDRADDR poffSeg)
 {
-    int rc = rtldrPE_LinkAddressToSegOffset(pMod, Rva, piSeg, poffSeg);
+    PRTLDRMODPE pModPe = (PRTLDRMODPE)pMod;
+    int rc = rtldrPE_LinkAddressToSegOffset(pMod, Rva + pModPe->uImageBase, piSeg, poffSeg);
     if (RT_FAILURE(rc))
         rc = VERR_LDR_INVALID_RVA;

trunk/src/VBox/Runtime/tools/RTNtDbgHelp.cpp

@@ -264 +264 @@
             RTPrintf("    PdbSig          = %#010x\n", ModInfo.PdbSig);
             RTPrintf("    PdbSig70        = %RTuuid\n", &ModInfo.PdbSig70);
-            RTPrintf("    PdbSig          = %#010x\n", ModInfo.PdbAge);
+            RTPrintf("    PdbAge          = %#010x\n", ModInfo.PdbAge);
             RTPrintf("    PdbUnmatched    = %RTbool\n", ModInfo.PdbUnmatched);
             RTPrintf("    DbgUnmatched    = %RTbool\n", ModInfo.DbgUnmatched);
@@ -350 +350 @@
 
             case 'h':
-                RTPrintf("usage: %s [-v|--verbose] [-q|--quiet] [-f|--force] [-o|--output <file.h>] <dir1|pdb1> [...]\n"
+                RTPrintf("usage: %s [-v|--verbose] [-q|--quiet] [-a <addr>] [-l <file>] [-d] [...]\n"
                          "   or: %s [-V|--version]\n"
                          "   or: %s [-h|--help]\n",