Changeset 83084 in vbox

Timestamp:

Feb 15, 2020 3:16:11 PM (5 years ago)

Author:

vboxsync

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

136139

Message:

IPRT,DBGPlugInDarwin: Added flags for indicating that the LINKEDIT segment should be loaded in Mach-O images and debug files.

Location:

trunk

Files:

• include/iprt/dbg.h (modified) (1 diff)
• include/iprt/ldr.h (modified) (1 diff)
• src/VBox/Debugger/DBGPlugInDarwin.cpp (modified) (6 diffs)
• src/VBox/Runtime/common/dbg/dbgmod.cpp (modified) (12 diffs)
• src/VBox/Runtime/common/dbg/dbgmoddeferred.cpp (modified) (3 diffs)
• src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp (modified) (1 diff)
• src/VBox/Runtime/common/dbg/dbgmodldr.cpp (modified) (1 diff)
• src/VBox/Runtime/common/ldr/ldrMachO.cpp (modified) (2 diffs)
• src/VBox/Runtime/include/internal/dbgmod.h (modified) (3 diffs)

trunk/include/iprt/dbg.h

@@ -1245 +1245 @@
 /** Overrides the hDbgCfg settings and forces an image and/or symbol file
  *  search.  RTDbgModCreate will quietly ignore this flag. */
-#define RTDBGMOD_F_NOT_DEFERRED     RT_BIT_32(0)
+#define RTDBGMOD_F_NOT_DEFERRED         RT_BIT_32(0)
+/** Mach-O: Load the __LINKEDIT segment (@sa RTLDR_O_MACHO_LOAD_LINKEDIT). */
+#define RTDBGMOD_F_MACHO_LOAD_LINKEDIT  RT_BIT_32(1)
+/** Valid flag mask. */
+#define RTDBGMOD_F_VALID_MASK           UINT32_C(0x00000003)
 /** @} */
 

trunk/include/iprt/ldr.h

@@ -443 +443 @@
 /** Ignore the architecture specification if there is no code. */
 #define RTLDR_O_IGNORE_ARCH_IF_NO_CODE      RT_BIT_32(3)
+/** Mach-O: Include the __LINKEDIT segment (ignored by the others). */
+#define RTLDR_O_MACHO_LOAD_LINKEDIT         RT_BIT_32(4)
 /** Mask of valid flags. */
-#define RTLDR_O_VALID_MASK                  UINT32_C(0x0000000f)
+#define RTLDR_O_VALID_MASK                  UINT32_C(0x0000001f)
 /** @} */
 

trunk/src/VBox/Debugger/DBGPlugInDarwin.cpp

@@ -548 +548 @@
      * Process the load commands.
      */
+    RTUUID          Uuid   = RTUUID_INITIALIZE_NULL;
     RTDBGSEGMENT    aSegs[24];
     uint32_t        cSegs  = 0;
-    RTUUID          Uuid   = RTUUID_INITIALIZE_NULL;
+    bool            fHasLinkEdit = false;
     uint32_t        cLeft  = uBuf.Hdr32.ncmds;
     uint32_t        cbLeft = uBuf.Hdr32.sizeofcmds;
@@ -559 +560 @@
         segment_command_32_t const *pSeg32;
         segment_command_64_t const *pSeg64;
-        section_32_t const         *pSect32;
-        section_64_t const         *pSect64;
-        symtab_command_t const     *pSymTab;
         uuid_command_t const       *pUuid;
     } uLCmd;
@@ -580 +578 @@
                     return VERR_INVALID_NAME;
                 if (   !strcmp(uLCmd.pSeg32->segname, "__LINKEDIT")
-                    && !dbgDiggerDarwinIsSegmentPresent(pUVM, uLCmd.pSeg32->vmaddr, uLCmd.pSeg32->vmsize,
-                                                        uModAddr, uModAddr + _64M))
+                    && !(fHasLinkEdit = dbgDiggerDarwinIsSegmentPresent(pUVM, uLCmd.pSeg32->vmaddr, uLCmd.pSeg32->vmsize,
+                                                                        uModAddr, uModAddr + _64M)))
                     break; /* This usually is discarded or not loaded at all. */
                 if (cSegs >= RT_ELEMENTS(aSegs))
@@ -601 +599 @@
                     return VERR_INVALID_NAME;
                 if (   !strcmp(uLCmd.pSeg64->segname, "__LINKEDIT")
-                    && !dbgDiggerDarwinIsSegmentPresent(pUVM, uLCmd.pSeg64->vmaddr, uLCmd.pSeg64->vmsize,
-                                                        uModAddr, uModAddr + _128M))
+                    && !(fHasLinkEdit = dbgDiggerDarwinIsSegmentPresent(pUVM, uLCmd.pSeg64->vmaddr, uLCmd.pSeg64->vmsize,
+                                                                        uModAddr, uModAddr + _128M)))
                     break; /* This usually is discarded or not loaded at all. */
                 if (cSegs >= RT_ELEMENTS(aSegs))
@@ -637 +635 @@
 
     if (cbLeft != 0)
+    {
+        LogRel(("OSXDig: uModAddr=%#RX64 - %u bytes of command left over!\n", uModAddr, cbLeft));
         return VERR_BAD_EXE_FORMAT;
+    }
 
     /*
@@ -657 +658 @@
     RTDBGMOD hMod;
     rc = RTDbgModCreateFromMachOImage(&hMod, pszName, NULL, f64Bit ? RTLDRARCH_AMD64 : RTLDRARCH_X86_32, 0 /*cbImage*/,
-                                      cSegs, aSegs, &Uuid, DBGFR3AsGetConfig(pUVM), RTDBGMOD_F_NOT_DEFERRED);
+                                      cSegs, aSegs, &Uuid, DBGFR3AsGetConfig(pUVM),
+                                      RTDBGMOD_F_NOT_DEFERRED | (fHasLinkEdit ? RTDBGMOD_F_MACHO_LOAD_LINKEDIT : 0));
 
     if (RT_FAILURE(rc))

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

@@ -329 +329 @@
     AssertPtrReturn(pszName, VERR_INVALID_POINTER);
     AssertReturn(*pszName, VERR_INVALID_PARAMETER);
-    AssertReturn(fFlags == 0 || fFlags == RTDBGMOD_F_NOT_DEFERRED, VERR_INVALID_PARAMETER);
+    AssertReturn(fFlags == 0 || fFlags == RTDBGMOD_F_NOT_DEFERRED, VERR_INVALID_FLAGS);
 
     int rc = rtDbgModLazyInit();
@@ -842 +842 @@
                         pDbgMod->pvImgPriv = NULL;
                         /** @todo need to specify some arch stuff here. */
-                        rc = pImg->pVt->pfnTryOpen(pDbgMod, enmArch);
+                        rc = pImg->pVt->pfnTryOpen(pDbgMod, enmArch, 0 /*fLdrFlags*/);
                         if (RT_SUCCESS(rc))
                         {
@@ -980 +980 @@
             pDbgMod->pImgVt    = pImg->pVt;
             pDbgMod->pvImgPriv = NULL;
-            int rc2 = pImg->pVt->pfnTryOpen(pDbgMod, RTLDRARCH_WHATEVER);
+            int rc2 = pImg->pVt->pfnTryOpen(pDbgMod, RTLDRARCH_WHATEVER, 0 /*fLdrFlags*/);
             if (RT_SUCCESS(rc2))
             {
@@ -1159 +1159 @@
                     {
                         PRTDBGMODDEFERRED pDeferred;
-                        rc = rtDbgModDeferredCreate(pDbgMod, rtDbgModFromPeImageDeferredCallback, cbImage, hDbgCfg, 0,
-                                                    &pDeferred);
+                        rc = rtDbgModDeferredCreate(pDbgMod, rtDbgModFromPeImageDeferredCallback, cbImage, hDbgCfg,
+                                                    0 /*cbDeferred*/, 0 /*fFlags*/, &pDeferred);
                         if (RT_SUCCESS(rc))
                             pDeferred->u.PeImage.uTimestamp = uTimestamp;
@@ -1217 +1217 @@
     /** For use more internal use in file locator callbacks. */
     bool                fOpenImage;
+    /** RTDBGMOD_F_XXX. */
+    uint32_t            fFlags;
 } RTDBGMODMACHOARGS;
 /** Pointer to a const segment package. */
@@ -1259 +1261 @@
             pDbgMod->pImgVt    = pImg->pVt;
             pDbgMod->pvImgPriv = NULL;
-            int rc2 = pImg->pVt->pfnTryOpen(pDbgMod, pArgs->enmArch);
+            int rc2 = pImg->pVt->pfnTryOpen(pDbgMod, pArgs->enmArch,
+                                            pArgs->fFlags & RTDBGMOD_F_MACHO_LOAD_LINKEDIT ? RTLDR_O_MACHO_LOAD_LINKEDIT : 0);
             if (RT_SUCCESS(rc2))
             {
@@ -1350 +1353 @@
 
 static int rtDbgModFromMachOImageWorker(PRTDBGMODINT pDbgMod, RTLDRARCH enmArch, uint32_t cbImage,
-                                        uint32_t cSegs, PCRTDBGSEGMENT paSegs, PCRTUUID pUuid, RTDBGCFG hDbgCfg)
+                                        uint32_t cSegs, PCRTDBGSEGMENT paSegs, PCRTUUID pUuid, RTDBGCFG hDbgCfg, uint32_t fFlags)
 {
     RT_NOREF_PV(cbImage); RT_NOREF_PV(cSegs); RT_NOREF_PV(paSegs);
@@ -1358 +1361 @@
     Args.pUuid      = pUuid && RTUuidIsNull(pUuid) ? pUuid : NULL;
     Args.fOpenImage = false;
+    Args.fFlags     = fFlags;
 
     /*
@@ -1382 +1386 @@
     return rtDbgModFromMachOImageWorker(pDbgMod, pDeferred->u.MachO.enmArch, pDeferred->cbImage,
                                         pDeferred->u.MachO.cSegs, pDeferred->u.MachO.aSegs,
-                                        &pDeferred->u.MachO.Uuid, pDeferred->hDbgCfg);
+                                        &pDeferred->u.MachO.Uuid, pDeferred->hDbgCfg, pDeferred->fFlags);
 }
 
@@ -1408 +1412 @@
     AssertReturn(cbImage || cSegs, VERR_INVALID_PARAMETER);
     AssertPtrNullReturn(pUuid, VERR_INVALID_POINTER);
-    AssertReturn(!(fFlags & ~(RTDBGMOD_F_NOT_DEFERRED)), VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~RTDBGMOD_F_VALID_MASK), VERR_INVALID_FLAGS);
 
     int rc = rtDbgModLazyInit();
@@ -1448 +1452 @@
                     || (!cbImage && !cSegs)
                     || (fFlags & RTDBGMOD_F_NOT_DEFERRED) )
-                    rc = rtDbgModFromMachOImageWorker(pDbgMod, enmArch, cbImage, cSegs, paSegs, pUuid, hDbgCfg);
+                    rc = rtDbgModFromMachOImageWorker(pDbgMod, enmArch, cbImage, cSegs, paSegs, pUuid, hDbgCfg, fFlags);
                 else
                 {
@@ -1457 +1461 @@
                     rc = rtDbgModDeferredCreate(pDbgMod, rtDbgModFromMachOImageDeferredCallback, cbImage, hDbgCfg,
                                                 RT_UOFFSETOF_DYN(RTDBGMODDEFERRED, u.MachO.aSegs[cSegs]),
-                                                &pDeferred);
+                                                0 /*fFlags*/, &pDeferred);
                     if (RT_SUCCESS(rc))
                     {

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

@@ -636 +636 @@
 
 /** @interface_method_impl{RTDBGMODVTIMG,pfnTryOpen} */
-static DECLCALLBACK(int) rtDbgModDeferredImg_TryOpen(PRTDBGMODINT pMod, RTLDRARCH enmArch)
-{
-    NOREF(enmArch);
+static DECLCALLBACK(int) rtDbgModDeferredImg_TryOpen(PRTDBGMODINT pMod, RTLDRARCH enmArch, uint32_t fLdrFlags)
+{
+    RT_NOREF(enmArch, fLdrFlags);
     return rtDbgModDeferredDoIt(pMod, true /*fForceRetry*/);
 }
@@ -681 +681 @@
  * @param   cbDeferred          The size of the deferred instance data, 0 if the
  *                              default structure is good enough.
+ * @param   fFlags              RTDBGMOD_F_XXX.
  * @param   ppDeferred          Where to return the instance data. Can be NULL.
  */
 DECLHIDDEN(int) rtDbgModDeferredCreate(PRTDBGMODINT pDbgMod, PFNRTDBGMODDEFERRED pfnDeferred, RTUINTPTR cbImage,
-                                       RTDBGCFG hDbgCfg, size_t cbDeferred, PRTDBGMODDEFERRED *ppDeferred)
+                                       RTDBGCFG hDbgCfg, size_t cbDeferred, uint32_t fFlags, PRTDBGMODDEFERRED *ppDeferred)
 {
     AssertReturn(!pDbgMod->pDbgVt, VERR_DBG_MOD_IPE);
@@ -701 +702 @@
     pDeferred->hDbgCfg     = hDbgCfg;
     pDeferred->pfnDeferred = pfnDeferred;
+    pDeferred->fFlags      = fFlags;
 
     pDbgMod->pDbgVt             = &g_rtDbgModVtDbgDeferred;

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

@@ -6077 +6077 @@
             pDbgInfoMod->pszName = pDbgMod->pszName;
             pDbgInfoMod->pImgVt  = &g_rtDbgModVtImgLdr;
-            rc = pDbgInfoMod->pImgVt->pfnTryOpen(pDbgInfoMod, enmArch);
+            rc = pDbgInfoMod->pImgVt->pfnTryOpen(pDbgInfoMod, enmArch, 0 /*fLdrFlags*/);
             if (RT_SUCCESS(rc))
             {

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

@@ -216 +216 @@
 
 /** @interface_method_impl{RTDBGMODVTIMG,pfnTryOpen} */
-static DECLCALLBACK(int) rtDbgModLdr_TryOpen(PRTDBGMODINT pMod, RTLDRARCH enmArch)
+static DECLCALLBACK(int) rtDbgModLdr_TryOpen(PRTDBGMODINT pMod, RTLDRARCH enmArch, uint32_t fLdrFlags)
 {
     RTLDRMOD hLdrMod;
-    int rc = RTLdrOpen(pMod->pszImgFile, RTLDR_O_FOR_DEBUG, enmArch, &hLdrMod);
+    int rc = RTLdrOpen(pMod->pszImgFile, RTLDR_O_FOR_DEBUG | fLdrFlags, enmArch, &hLdrMod);
     if (RT_SUCCESS(rc))
     {

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

@@ -1525 +1525 @@
      */
     {
-        bool                fLoadLinkEdit = false;
+        bool                fLoadLinkEdit = RT_BOOL(pThis->fOpenFlags & RTLDR_O_MACHO_LOAD_LINKEDIT);
         PRTLDRMODMACHOSECT  pSectExtraItr;
         RTLDRADDR           uNextRVA = 0;
@@ -1547 +1547 @@
             /* If we're skipping the __LINKEDIT segment, check for it and adjust
                the number of segments we'll be messing with here.  ASSUMES it's
-               last (by now anyway). */
+               last (typcially is, but not always for mach_kernel). */
             if (   !fLoadLinkEdit
                 && cSegmentsToAdjust > 0

trunk/src/VBox/Runtime/include/internal/dbgmod.h

@@ -79 +79 @@
      *                      initialize pImgOps and pvImgPriv.
      * @param   enmArch     The desired architecture.
-     */
-    DECLCALLBACKMEMBER(int, pfnTryOpen)(PRTDBGMODINT pMod, RTLDRARCH enmArch);
+     * @param   fLdrFlags   Extra loader flags (RTLDR_O_XXX).
+     */
+    DECLCALLBACKMEMBER(int, pfnTryOpen)(PRTDBGMODINT pMod, RTLDRARCH enmArch, uint32_t fLdrFlags);
 
     /**
@@ -586 +587 @@
     /** Reference counter. */
     uint32_t volatile   cRefs;
+    /** RTDBGMOD_F_XXX */
+    uint32_t            fFlags;
     /** The image size.
      * Deferred loading is almost pointless without knowing the module size, as
@@ -708 +711 @@
 DECLHIDDEN(int) rtDbgModCreateForExports(PRTDBGMODINT pDbgMod);
 DECLHIDDEN(int) rtDbgModDeferredCreate(PRTDBGMODINT pDbgMod, PFNRTDBGMODDEFERRED pfnDeferred, RTUINTPTR cbImage,
-                                       RTDBGCFG hDbgCfg, size_t cbDeferred, PRTDBGMODDEFERRED *ppDeferred);
+                                       RTDBGCFG hDbgCfg, size_t cbDeferred, uint32_t fFlags, PRTDBGMODDEFERRED *ppDeferred);
 
 DECLHIDDEN(int) rtDbgModLdrOpenFromHandle(PRTDBGMODINT pDbgMod, RTLDRMOD hLdrMod);