Changeset 74643 in vbox for trunk

Timestamp:

Oct 6, 2018 7:39:41 PM (6 years ago)

Author:

vboxsync

Message:

IPRT: More adjustments to the LX and Mach-O loader code from kStuff. bugref:9232

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• common/ldr/ldrLX.cpp (modified) (5 diffs)
• common/ldr/ldrMachO.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -272 +272 @@
         IPRT_WITH_OPENSSL \
         NOFILEID
-#       += LDR_WITH_MACHO
+ifeq ($(USERNAME),bird)
+ RuntimeR3_DEFS += LDR_WITH_MACHO
+endif
 if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
  RuntimeR3_DEFS         += \

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

@@ -546 +546 @@
 
 
-/** @copydoc kLdrModQuerySymbol */
 static int kldrModLXQuerySymbol(PRTLDRMODINTERNAL pMod, const void *pvBits, RTLDRADDR BaseAddress, uint32_t iSymbol,
                                 const char *pchSymbol, size_t cchSymbol, const char *pszVersion,
@@ -1149 +1148 @@
 
 
-/** @copydoc kLdrModGetImport */
 static int kldrModLXGetImport(PKLDRMODLX pModLX, const void *pvBits, uint32_t iImport, char *pszName, size_t cchName,
                               size_t *pcbNeeded)
@@ -1292 +1290 @@
 
 
-/** @copydoc kLdrModHasDbgInfo */
 static int kldrModLXHasDbgInfo(PRTLDRMODINTERNAL pMod, const void *pvBits)
 {
@@ -2254 +2251 @@
                 union
                 {
-
                     const uint8_t          *pb;
                     const struct r32_rlc   *prlc;
@@ -2540 +2536 @@
  * @param   pbPage      The page in which to apply the fixup.
  * @param   off         Page relative offset of where to apply the offset.
+ * @param   PageAddress The page address.
+ * @param   prlc        The relocation record.
+ * @param   iSelector   Selector value, -1 if flat.
  * @param   uValue      The target value.
  * @param   fKind       The target kind.

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

@@ -508 +508 @@
  * @param   pRdr            The file reader.
  * @param   offImage        The image header (FAT fun).
+ * @param   fOpenFlags      RTLDR_O_XXX.
  * @param   pcSegments      Where to store the segment count.
  * @param   pcSegments      Where to store the section count.
@@ -514 +515 @@
  * @param   pLinkAddress    Where to store the image link address (i.e. the
  *                          lowest segment address).
- */
-static int  kldrModMachOPreParseLoadCommands(uint8_t *pbLoadCommands, const mach_header_32_t *pHdr, PRTLDRREADER pRdr, RTFOFF   offImage,
-                                             uint32_t fOpenFlags, uint32_t *pcSegments, uint32_t *pcSections, uint32_t *pcbStringPool,
-                                             bool *pfCanLoad, PRTLDRADDR pLinkAddress, uint8_t *puEffFileType)
+ * @param   puEffFileType   Where to store the effective file type.
+ */
+static int kldrModMachOPreParseLoadCommands(uint8_t *pbLoadCommands, const mach_header_32_t *pHdr, PRTLDRREADER pRdr,
+                                            RTFOFF offImage, uint32_t fOpenFlags, uint32_t *pcSegments, uint32_t *pcSections,
+                                            uint32_t *pcbStringPool, bool *pfCanLoad, PRTLDRADDR pLinkAddress,
+                                            uint8_t *puEffFileType)
 {
     union
@@ -2530 +2533 @@
  * @returns IPRT status code.
  * @param   pThis           The Mach-O module interpreter instance.
+ * @param   BaseAddress     The module base address.
  * @param   pfnGetImport    The callback for resolving an imported symbol.
  * @param   pvUser          User argument to the callback.
@@ -2679 +2683 @@
  * @param   pvMapping       The mapping to fixup.
  * @param   NewBaseAddress  The address to fixup the mapping to.
- * @param   OldBaseAddress  The address the mapping is currently fixed up to.
  */
 static int  kldrModMachOObjDoFixups(PKLDRMODMACHO pThis, void *pvMapping, RTLDRADDR NewBaseAddress)