Changeset 74643 in vbox for trunk/src/VBox/Runtime/common/ldr/ldrMachO.cpp

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

File:

• trunk/src/VBox/Runtime/common/ldr/ldrMachO.cpp (modified) (4 diffs)

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)