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

Timestamp:

Feb 15, 2020 9:19:54 PM (5 years ago)

Author:

vboxsync

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

136140

Message:

IPRT,VMM,DBGPlugInDarwin: Implemented in-memory guest kernel and kext image loading for OS X / Mach-O. Requires LINKEDIT to not be jettisoned to work.

File:

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

trunk/src/VBox/Debugger/DBGPlugInDarwin.cpp

@@ -407 +407 @@
  * @param   uMaxAddr            Highest allowed address.
  */
-static int dbgDiggerDarwinIsSegmentPresent(PUVM pUVM, uint64_t uSegAddr, uint64_t cbSeg, uint64_t uMinAddr, uint64_t uMaxAddr)
+static bool dbgDiggerDarwinIsSegmentPresent(PUVM pUVM, uint64_t uSegAddr, uint64_t cbSeg, uint64_t uMinAddr, uint64_t uMaxAddr)
 {
     /*
@@ -657 +657 @@
      */
     RTDBGMOD hMod;
-    rc = RTDbgModCreateFromMachOImage(&hMod, pszName, NULL, f64Bit ? RTLDRARCH_AMD64 : RTLDRARCH_X86_32, 0 /*cbImage*/,
-                                      cSegs, aSegs, &Uuid, DBGFR3AsGetConfig(pUVM),
+    rc = RTDbgModCreateFromMachOImage(&hMod, pszName, NULL, f64Bit ? RTLDRARCH_AMD64 : RTLDRARCH_X86_32, NULL /*phLdrModIn*/,
+                                      0 /*cbImage*/, cSegs, aSegs, &Uuid, DBGFR3AsGetConfig(pUVM),
                                       RTDBGMOD_F_NOT_DEFERRED | (fHasLinkEdit ? RTDBGMOD_F_MACHO_LOAD_LINKEDIT : 0));
 
+
+    /*
+     * If module creation failed and we've got a linkedit segment, try open the
+     * image in-memory, because that will at a minimum give us symbol table symbols.
+     */
+    if (RT_FAILURE(rc) && fHasLinkEdit)
+    {
+        DBGFADDRESS DbgfAddr;
+        RTERRINFOSTATIC ErrInfo;
+        rc = DBGFR3ModInMem(pUVM, DBGFR3AddrFromFlat(pUVM, &DbgfAddr, uModAddr),
+                            DBGFMODINMEM_F_NO_CONTAINER_FALLBACK,
+                            pszName, NULL /*pszFilename*/, f64Bit ? RTLDRARCH_AMD64 : RTLDRARCH_X86_32, 0 /*cbImage */,
+                            &hMod, RTErrInfoInitStatic(&ErrInfo));
+        if (RT_FAILURE(rc))
+            LogRel(("OSXDig: Failed to do an in-memory-opening of '%s' at %#RX64: %Rrc%s%s\n", pszName, uModAddr, rc,
+                    RTErrInfoIsSet(&ErrInfo.Core) ? " - " : "", RTErrInfoIsSet(&ErrInfo.Core) ? ErrInfo.Core.pszMsg : ""));
+    }
+
+    /*
+     * Final fallback is a container module.
+     */
     if (RT_FAILURE(rc))
     {
-        /** @todo try open in memory. */
-
-        /*
-         * Final fallback is a container module.
-         */
         rc = RTDbgModCreate(&hMod, pszName, 0, 0);
         if (RT_FAILURE(rc))