Changeset 25 for trunk/include

Timestamp:

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

Author:

bird

Message:

A blind shot at FAT Mach-O images.

Location:

trunk/include/k

Files:

• kErrors.h (modified) (2 diffs)
• kLdr.h (modified) (2 diffs)

trunk/include/k/kErrors.h

@@ -196 +196 @@
 /** Not implemented yet. */
 #define KLDR_ERR_TODO                                   (KLDR_ERR_BASE + 34)
+/** No image matching the requested CPU. */
+#define KLDR_ERR_CPU_ARCH_MISMATCH                      (KLDR_ERR_BASE + 35)
+/** Invalid FAT image header. */
+#define KLDR_ERR_FAT_INVALID                            (KLDR_ERR_BASE + 36)
+/** Unsupported CPU subtype found in a FAT entry. */
+#define KLDR_ERR_FAT_UNSUPPORTED_CPU_SUBTYPE            (KLDR_ERR_BASE + 37)
 /** @} */
 
@@ -202 +208 @@
  */
 /** The base of the kLdrModPE specific status codes. */
-#define KLDR_ERR_PE_BASE                                (KLDR_ERR_BASE + 35)
+#define KLDR_ERR_PE_BASE                                (KLDR_ERR_BASE + 38)
 /** The machine isn't supported by the interpreter. */
 #define KLDR_ERR_PE_UNSUPPORTED_MACHINE                 (KLDR_ERR_PE_BASE + 0)

trunk/include/k/kLdr.h

@@ -582 +582 @@
 
 
-int     kLdrModOpen(const char *pszFilename, PPKLDRMOD ppMod);
-int     kLdrModOpenFromRdr(PKRDR pRdr, PPKLDRMOD ppMod);
+int     kLdrModOpen(const char *pszFilename, KU32 fFlags, KCPUARCH enmCpuArch, PPKLDRMOD ppMod);
+int     kLdrModOpenFromRdr(PKRDR pRdr, KU32 fFlags, KCPUARCH enmCpuArch, PPKLDRMOD ppMod);
 int     kLdrModOpenNative(const char *pszFilename, PPKLDRMOD ppMod);
 int     kLdrModOpenNativeByHandle(KUPTR uHandle, PPKLDRMOD ppMod);
@@ -647 +647 @@
      * @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.
      */
-    int (* pfnCreate)(PCKLDRMODOPS pOps, PKRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod);
+    int (* pfnCreate)(PCKLDRMODOPS pOps, PKRDR pRdr, KU32 fFlags, KCPUARCH enmCpuArch, KLDRFOFF offNewHdr, PPKLDRMOD ppMod);
     /**
      * Destroys an loader module instance.