Changeset 49044 in vbox for trunk/src/VBox/Runtime/include/internal

Timestamp:

Oct 11, 2013 1:06:28 AM (12 years ago)

Author:

vboxsync

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

89827

Message:

Darwin guest OS digger hacking in progress. Adding symbol cache util to iprt and started on the Mach-O code that'll make use of it (RTDbgModCreateFromMachOImage++). Updates kStuff from 53 to 55 for UUID query and 64-bit kext loading.

Location:

trunk/src/VBox/Runtime/include/internal

Files:

• dbgmod.h (modified) (4 diffs)
• ldr.h (modified) (2 diffs)

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

@@ -227 +227 @@
      */
     DECLCALLBACKMEMBER(RTLDRARCH, pfnGetArch)(PRTDBGMODINT pMod);
+
+    /**
+     * Generic method for querying image properties.
+     *
+     * @returns IPRT status code.
+     * @param   pMod            Pointer to the module structure.
+     * @param   enmLdrProp      The property to query.
+     * @param   pvBuf           Pointer to the return buffer.
+     * @param   cbBuf           The size of the return buffer.
+     * @sa      RTLdrQueryProp
+     */
+    DECLCALLBACKMEMBER(int, pfnQueryProp)(PRTDBGMODINT pMod, RTLDRPROP enmProp, void *pvBuf, size_t cbBuf);
 
     /** For catching initialization errors (RTDBGMODVTIMG_MAGIC). */
@@ -559 +571 @@
             uint32_t    uCrc32;
         }   GnuDebugLink;
+
+        struct
+        {
+            /** The image UUID. */
+            RTUUID          Uuid;
+            /** Image architecture. */
+            RTLDRARCH       enmArch;
+            /** Number of segment mappings. */
+            uint32_t        cSegs;
+            /** Segment mappings. */
+            RTDBGSEGMENT    aSegs[1];
+        }   MachO;
     } u;
 } RTDBGMODDEFERRED;
@@ -617 +641 @@
 
 
+/**
+ * Special segment package used passing segment order information for mach-o
+ * images (mainly mach_kernel, really).
+ *
+ * Passes to rtDbgModDwarf_TryOpen via RTDBGMODINF::pvDbgPriv.
+ */
+typedef struct RTDBGDWARFSEGPKG
+{
+    /** Pointer to the segment array. */
+    PCRTDBGSEGMENT      paSegs;
+    /** Number of segments. */
+    uint32_t            cSegs;
+    /** For use more internal use in file locator callbacks. */
+    RTLDRARCH           enmArch;
+    /** For use more internal use in file locator callbacks. */
+    PCRTUUID            pUuid;
+} RTDBGDWARFSEGPKG;
+/** Pointer to a const segment package. */
+typedef RTDBGDWARFSEGPKG const *PCRTDBGDWARFSEGPKG;
+
+
 extern DECLHIDDEN(RTSTRCACHE)           g_hDbgModStrCache;
 extern DECLHIDDEN(RTDBGMODVTDBG const)  g_rtDbgModVtDbgCodeView;
@@ -637 +682 @@
 DECLHIDDEN(int) rtDbgModCreateForExports(PRTDBGMODINT pDbgMod);
 DECLHIDDEN(int) rtDbgModDeferredCreate(PRTDBGMODINT pDbgMod, PFNRTDBGMODDEFERRED pfnDeferred, RTUINTPTR cbImage,
-                                       RTDBGCFG hDbgCfg, PRTDBGMODDEFERRED *ppDeferred);
+                                       RTDBGCFG hDbgCfg, size_t cbDeferred, PRTDBGMODDEFERRED *ppDeferred);
 
 DECLHIDDEN(int) rtDbgModLdrOpenFromHandle(PRTDBGMODINT pDbgMod, RTLDRMOD hLdrMod);

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

@@ -312 +312 @@
      * @returns IPRT status code.
      *
+     * @param   pMod            Pointer to the loader module structure.
      * @param   pvBuf           The buffer to read into.
      * @param   iDbgInfo        The debug info ordinal number if the request
@@ -321 +322 @@
      */
     DECLCALLBACKMEMBER(int, pfnReadDbgInfo)(PRTLDRMODINTERNAL pMod, uint32_t iDbgInfo, RTFOFF off, size_t cb, void *pvBuf);
+
+
+
+    /**
+     * Generic method for querying image properties.
+     *
+     * @returns IPRT status code.
+     * @retval  VERR_NOT_SUPPORTED if the property query isn't supported (either all
+     *          or that specific property).
+     * @retval  VERR_NOT_FOUND the property was not found in the module.
+     *
+     * @param   pMod            Pointer to the loader module structure.
+     * @param   enmLdrProp      The property to query (valid).
+     * @param   pvBuf           Pointer to the return buffer (valid).
+     * @param   cbBuf           The size of the return buffer (valid as per
+     *                          property).
+     */
+    DECLCALLBACKMEMBER(int, pfnQueryProp)(PRTLDRMODINTERNAL pMod, RTLDRPROP enmProp, void *pvBuf, size_t cbBuf);
 
     /** Dummy entry to make sure we've initialized it all. */