Changeset 25 for trunk/kLdr/kLdrModPE.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/kLdrModPE.c (modified) (2 diffs)

trunk/kLdr/kLdrModPE.c

@@ -136 +136 @@
  * @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 kldrModPECreate(PCKLDRMODOPS pOps, PKRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
+static int kldrModPECreate(PCKLDRMODOPS pOps, PKRDR pRdr, KU32 fFlags, KCPUARCH enmCpuArch, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
 {
     PKLDRMODPE pModPE;
@@ -150 +154 @@
     if (!rc)
     {
-        pModPE->pMod->pOps = pOps;
-        pModPE->pMod->u32Magic = KLDRMOD_MAGIC;
-        *ppMod = pModPE->pMod;
-        return 0;
+        /*
+         * Match up against the requested CPU architecture.
+         */
+        if (    enmCpuArch == KCPUARCH_UNKNOWN
+            ||  pModPE->pMod->enmArch == enmCpuArch)
+        {
+            pModPE->pMod->pOps = pOps;
+            pModPE->pMod->u32Magic = KLDRMOD_MAGIC;
+            *ppMod = pModPE->pMod;
+            return 0;
+        }
+        rc = KLDR_ERR_CPU_ARCH_MISMATCH;
     }
     kHlpFree(pModPE);