Changeset 25 for trunk/kLdr/kLdrModMachO.c

Timestamp:

Feb 19, 2009, 1:56:15 AM (16 years ago)

Author:

bird

Message:

A blind shot at FAT Mach-O images.

File:

• trunk/kLdr/kLdrModMachO.c (modified) (17 diffs)

trunk/kLdr/kLdrModMachO.c

@@ -127 +127 @@
     void                   *pvMapping;
 
+    /** The offset of the image. (FAT fun.) */
+    KLDRFOFF                offImage;
     /** The link address. */
     KLDRADDR                LinkAddress;
@@ -184 +186 @@
                                     PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
 
-static int  kldrModMachODoCreate(PKRDR pRdr, PKLDRMODMACHO *ppMod);
-static int  kldrModMachOPreParseLoadCommands(KU8 *pbLoadCommands, const mach_header_32_t *pHdr, PKRDR pRdr,
+static int  kldrModMachODoCreate(PKRDR pRdr, KLDRFOFF offImage, PKLDRMODMACHO *ppMod);
+static int  kldrModMachOPreParseLoadCommands(KU8 *pbLoadCommands, const mach_header_32_t *pHdr, PKRDR pRdr, KLDRFOFF offImage,
                                              KU32 *pcSegments, KU32 *pcSections, KU32 *pcbStringPool);
 static int  kldrModMachOParseLoadCommands(PKLDRMODMACHO pModMachO, char *pbStringPool, KU32 cbStringPool);
@@ -228 +230 @@
  * @param   pOps            Pointer to the registered method table.
  * @param   pRdr            The file provider instance to use.
+ * @param   fFlags          Flags, MBZ.
+ * @param   enmCpuArch      The desired CPU architecture. KCPUARCH_UNKNOWN means
+ *                          anything goes, but with a preference for the current
+ *                          host architecture.
  * @param   offNewHdr       The offset of the new header in MZ files. -1 if not found.
  * @param   ppMod           Where to store the module instance pointer.
  */
-static int kldrModMachOCreate(PCKLDRMODOPS pOps, PKRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
+static int kldrModMachOCreate(PCKLDRMODOPS pOps, PKRDR pRdr, KU32 fFlags, KCPUARCH enmCpuArch, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
 {
     PKLDRMODMACHO pModMachO;
@@ -239 +245 @@
      * Create the instance data and do a minimal header validation.
      */
-    rc = kldrModMachODoCreate(pRdr, &pModMachO);
+    rc = kldrModMachODoCreate(pRdr, offNewHdr == -1 ? 0 : offNewHdr, &pModMachO);
     if (!rc)
     {
-        pModMachO->pMod->pOps = pOps;
-        pModMachO->pMod->u32Magic = KLDRMOD_MAGIC;
-        *ppMod = pModMachO->pMod;
-        return 0;
+
+        /*
+         * Match up against the requested CPU architecture.
+         */
+        if (    enmCpuArch == KCPUARCH_UNKNOWN
+            ||  pModMachO->pMod->enmArch == enmCpuArch)
+        {
+            pModMachO->pMod->pOps = pOps;
+            pModMachO->pMod->u32Magic = KLDRMOD_MAGIC;
+            *ppMod = pModMachO->pMod;
+            return 0;
+        }
+        rc = KLDR_ERR_CPU_ARCH_MISMATCH;
     }
     if (pModMachO)
@@ -260 +275 @@
  * simplify cleanup on failure.
  */
-static int kldrModMachODoCreate(PKRDR pRdr, PKLDRMODMACHO *ppModMachO)
+static int kldrModMachODoCreate(PKRDR pRdr, KLDRFOFF offImage, PKLDRMODMACHO *ppModMachO)
 {
     union
@@ -286 +301 @@
      * Read the Mach-O header.
      */
-    rc = kRdrRead(pRdr, &s, sizeof(s), 0);
+    rc = kRdrRead(pRdr, &s, sizeof(s), offImage);
     if (rc)
         return rc;
@@ -327 +342 @@
         return KERR_NO_MEMORY;
     rc = kRdrRead(pRdr, pbLoadCommands, s.Hdr32.sizeofcmds,
-                        s.Hdr32.magic == IMAGE_MACHO32_SIGNATURE
-                     || s.Hdr32.magic == IMAGE_MACHO32_SIGNATURE_OE
-                     ? sizeof(mach_header_32_t) : sizeof(mach_header_64_t));
+                     s.Hdr32.magic == IMAGE_MACHO32_SIGNATURE
+                  || s.Hdr32.magic == IMAGE_MACHO32_SIGNATURE_OE
+                  ? sizeof(mach_header_32_t) + offImage
+                  : sizeof(mach_header_64_t) + offImage);
     if (!rc)
-        rc = kldrModMachOPreParseLoadCommands(pbLoadCommands, &s.Hdr32, pRdr, &cSegments, &cSections, &cbStringPool);
+        rc = kldrModMachOPreParseLoadCommands(pbLoadCommands, &s.Hdr32, pRdr, offImage, &cSegments, &cSections, &cbStringPool);
     if (rc)
     {
@@ -354 +370 @@
     *ppModMachO = pModMachO;
     pModMachO->pbLoadCommands = pbLoadCommands;
+    pModMachO->offImage = offImage;
 
     /* KLDRMOD */
@@ -475 +492 @@
  * @param   pHdr            The header.
  * @param   pRdr            The file reader.
+ * @param   offImage        The image header (FAT fun).
  * @param   pcSegments      Where to store the segment count.
  * @param   pcSegments      Where to store the section count.
  * @param   pcbStringPool   Where to store the string pool size.
  */
-static int  kldrModMachOPreParseLoadCommands(KU8 *pbLoadCommands, const mach_header_32_t *pHdr, PKRDR pRdr,
+static int  kldrModMachOPreParseLoadCommands(KU8 *pbLoadCommands, const mach_header_32_t *pHdr, PKRDR pRdr, KLDRFOFF offImage,
                                              KU32 *pcSegments, KU32 *pcSections, KU32 *pcbStringPool)
 {
@@ -492 +510 @@
         uuid_command_t       *pUuid;
     } u;
-    const KU64 cbFile = kRdrSize(pRdr);
+    const KU64 cbFile = kRdrSize(pRdr) - offImage;
     KU32 cSegments = 0;
     KU32 cSections = 0;
@@ -1062 +1080 @@
                             pSectExtra->RVA = pSect->addr;
                             pSectExtra->LinkAddress = pSect->addr;
-                            pSectExtra->offFile = pSect->offset ? pSect->offset : -1;
+                            pSectExtra->offFile = pSect->offset ? pSect->offset + pModMachO->offImage : -1;
                             pSectExtra->cFixups = pSect->nreloc;
                             pSectExtra->paFixups = NULL;
-                            pSectExtra->offFixups = pSect->nreloc ? pSect->reloff : -1;
+                            pSectExtra->offFixups = pSect->nreloc ? pSect->reloff + pModMachO->offImage : -1;
                             pSectExtra->fFlags = pSect->flags;
                             pSectExtra->iSegment = pSegExtra - &pModMachO->aSegments[0];
@@ -1099 +1117 @@
                                 pSeg->Alignment = (1 << pSect->align);
                                 pSeg->LinkAddress = pSect->addr;
-                                pSeg->offFile = pSect->offset ? pSect->offset : -1;
+                                pSeg->offFile = pSect->offset ? pSect->offset + pModMachO->offImage : -1;
                                 pSeg->cbFile  = pSect->offset ? pSect->size : -1;
                                 pSeg->RVA = pSect->addr - pModMachO->LinkAddress;
@@ -1125 +1143 @@
                                     &&  pSeg[-1].cbFile == pSeg[-1].cb)
                                 {
-                                    int fOk = pSeg[-1].offFile + (pSect->addr - pSeg[-1].LinkAddress) == pSect->offset
+                                    int fOk = pSeg[-1].offFile + (pSect->addr - pSeg[-1].LinkAddress) == pSect->offset + pModMachO->offImage
                                            && pSect[-1].offset
-                                           && pSeg[-1].offFile + pSeg[-1].cbFile == pSect[-1].offset + pSect[-1].size;
+                                           && pSeg[-1].offFile + pSeg[-1].cbFile == pSect[-1].offset + pModMachO->offImage + pSect[-1].size;
                                     /* more checks? */
                                     if (fOk)
@@ -1179 +1197 @@
                             pSectExtra->RVA = pSect->addr;
                             pSectExtra->LinkAddress = pSect->addr;
-                            pSectExtra->offFile = pSect->offset ? pSect->offset : -1;
+                            pSectExtra->offFile = pSect->offset ? pSect->offset + pModMachO->offImage : -1;
                             pSectExtra->cFixups = pSect->nreloc;
                             pSectExtra->paFixups = NULL;
-                            pSectExtra->offFixups = pSect->nreloc ? pSect->reloff : -1;
+                            pSectExtra->offFixups = pSect->nreloc ? pSect->reloff + pModMachO->offImage : -1;
                             pSectExtra->fFlags = pSect->flags;
                             pSectExtra->iSegment = pSegExtra - &pModMachO->aSegments[0];
@@ -1216 +1234 @@
                                 pSeg->Alignment = (1 << pSect->align);
                                 pSeg->LinkAddress = pSect->addr;
-                                pSeg->offFile = pSect->offset ? pSect->offset : -1;
+                                pSeg->offFile = pSect->offset ? pSect->offset + pModMachO->offImage : -1;
                                 pSeg->cbFile  = pSect->offset ? pSect->size : -1;
                                 pSeg->RVA = pSect->addr - pModMachO->LinkAddress;
@@ -1242 +1260 @@
                                     &&  pSeg[-1].cbFile == pSeg[-1].cb)
                                 {
-                                    int fOk = pSeg[-1].offFile + (pSect->addr - pSeg[-1].LinkAddress) == pSect->offset
+                                    int fOk = pSeg[-1].offFile + (pSect->addr - pSeg[-1].LinkAddress) == pSect->offset + pModMachO->offImage
                                            && pSect[-1].offset
-                                           && pSeg[-1].offFile + pSeg[-1].cbFile == pSect[-1].offset + pSect[-1].size;
+                                           && pSeg[-1].offFile + pSeg[-1].cbFile == pSect[-1].offset + pModMachO->offImage + pSect[-1].size;
                                     /* more checks? */
                                     if (fOk)
@@ -1277 +1295 @@
                 {
                     case MH_OBJECT:
-                        pModMachO->offSymbols = u.pSymTab->symoff;
+                        pModMachO->offSymbols = u.pSymTab->symoff + pModMachO->offImage;
                         pModMachO->cSymbols = u.pSymTab->nsyms;
-                        pModMachO->offStrings = u.pSymTab->stroff;
+                        pModMachO->offStrings = u.pSymTab->stroff + pModMachO->offImage;
                         pModMachO->cchStrings = u.pSymTab->strsize;
                         break;