Changeset 83084 in vbox for trunk/src/VBox/Debugger

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.

File:

• trunk/src/VBox/Debugger/DBGPlugInDarwin.cpp (modified) (6 diffs)

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))