Changeset 3585 for trunk/kStuff/include/k/kLdr.h

Timestamp:

Sep 3, 2007, 3:18:26 AM (18 years ago)

Author:

bird

Message:

Cpu / architecture cleanup...

File:

• trunk/kStuff/include/k/kLdr.h (modified) (5 diffs)

trunk/kStuff/include/k/kLdr.h

@@ -37 +37 @@
 #include <k/kDefs.h>
 #include <k/kTypes.h>
+#include <k/kCpus.h>
 
 
@@ -166 +167 @@
 /** @defgroup grp_kLdrMod   kLdrMod - The executable image intepreter
  * @{ */
-
-/**
- * CPU Architecture.
- * @todo Double check the non intel architectures.
- */
-typedef enum KLDRARCH
-{
-    /** The usual invalid one. */
-    KLDRARCH_INVALID = 0,
-    /** Clone or Intel 16-bit x86. */
-    KLDRARCH_X86_16,
-    /** Clone or Intel 32-bit x86. */
-    KLDRARCH_X86_32,
-    /** AMD64 (including clones). */
-    KLDRARCH_AMD64,
-    /** Itanic (64-bit). */
-    KLDRARCH_IA64,
-    /** ALPHA (64-bit). */
-    KLDRARCH_ALPHA,
-    /** ALPHA limited to 32-bit. */
-    KLDRARCH_ALPHA_32,
-    /** 32-bit ARM. */
-    KLDRARCH_ARM_32,
-    /** 64-bit ARM. */
-    KLDRARCH_ARM_64,
-    /** 32-bit MIPS. */
-    KLDRARCH_MIPS_32,
-    /** 64-bit MIPS. */
-    KLDRARCH_MIPS_64,
-    /** 32-bit PowerPC. */
-    KLDRARCH_POWERPC_32,
-    /** 64-bit PowerPC. */
-    KLDRARCH_POWERPC_64,
-    /** 32-bit SPARC. */
-    KLDRARCH_SPARC_32,
-    /** 64-bit SPARC. */
-    KLDRARCH_SPARC_64,
-    /** The end of the valid architecture values (exclusive). */
-    KLDRARCH_END,
-    /** Hack to blow the type up to 32-bit. */
-    KLDRARCH_32BIT_HACK = 0x7fffffff
-} KLDRARCH;
-/** Pointer to a CPU architecture type. */
-typedef KLDRARCH *PKLDRARCH;
-
-/**
- * CPU models.
- */
-typedef enum KLDRCPU
-{
-    /** The usual invalid cpu. */
-    KLDRCPU_INVALID = 0,
-    /** @name KLDRARCH_X86_16
-     * @{ */
-    KLDRCPU_I8086,
-    KLDRCPU_I8088,
-    KLDRCPU_I80186,
-    KLDRCPU_I80286,
-    KLDRCPU_I386_16,
-    KLDRCPU_I486_16,
-    KLDRCPU_I486SX_16,
-    KLDRCPU_I586_16,
-    KLDRCPU_I686_16,
-    KLDRCPU_P4_16,
-    KLDRCPU_CORE2_16,
-    KLDRCPU_K6_16,
-    KLDRCPU_K7_16,
-    KLDRCPU_K8_16,
-    KLDRCPU_FIRST_X86_16 = KLDRCPU_I8086,
-    KLDRCPU_LAST_X86_16 = KLDRCPU_K8_16,
-    /** @} */
-
-    /** @name KLDRARCH_X86_32
-     * @{ */
-    KLDRCPU_X86_32_BLEND,
-    KLDRCPU_I386,
-    KLDRCPU_I486,
-    KLDRCPU_I486SX,
-    KLDRCPU_I586,
-    KLDRCPU_I686,
-    KLDRCPU_P4,
-    KLDRCPU_CORE2_32,
-    KLDRCPU_K6,
-    KLDRCPU_K7,
-    KLDRCPU_K8_32,
-    KLDRCPU_FIRST_X86_32 = KLDRCPU_I386,
-    KLDRCPU_LAST_X86_32 = KLDRCPU_K8_32,
-    /** @} */
-
-    /** @name KLDRARCH_AMD64
-     * @{ */
-    KLDRCPU_AMD64_BLEND,
-    KLDRCPU_K8,
-    KLDRCPU_P4_64,
-    KLDRCPU_CORE2,
-    KLDRCPU_FIRST_AMD64 = KLDRCPU_K8,
-    KLDRCPU_LAST_AMD64 = KLDRCPU_CORE2,
-    /** @} */
-
-    /** The end of the valid cpu values (exclusive). */
-    KLDRCPU_END,
-    /** Hack to blow the type up to 32-bit. */
-    KLDRCPU_32BIT_HACK = 0x7fffffff
-} KLDRCPU;
-/** Pointer to a CPU type. */
-typedef KLDRCPU *PKLDRCPU;
-
-void kLdrGetArchCpu(PKLDRARCH penmArch, PKLDRCPU penmCpu);
-int kLdrCompareCpus(KLDRARCH enmCodeArch, KLDRCPU enmCodeCpu, KLDRARCH enmArch, KLDRCPU enmCpu);
-
 
 /**
@@ -486 +377 @@
     /** The type of module. */
     KLDRTYPE            enmType;
-    /** The architecture this module was built for. */
-    KLDRARCH            enmArch;
+    /** The CPU architecture this module was built for. */
+    KCPUARCH            enmArch;
     /** The minium cpu this module was built for.
      * This might not be accurate, so use kLdrModCanExecuteOn() to check. */
-    KLDRARCH            enmCpu;
+    KCPU                enmCpu;
     /** The endian used by the module. */
     KLDRENDIAN          enmEndian;
@@ -704 +595 @@
 int     kLdrModGetImport(PKLDRMOD pMod, const void *pvBits, KU32 iImport, char *pszName, KSIZE cchName);
 KI32    kLdrModNumberOfImports(PKLDRMOD pMod, const void *pvBits);
-int     kLdrModCanExecuteOn(PKLDRMOD pMod, const void *pvBits, KLDRARCH enmArch, KLDRCPU enmCpu);
+int     kLdrModCanExecuteOn(PKLDRMOD pMod, const void *pvBits, KCPUARCH enmArch, KCPU enmCpu);
 int     kLdrModGetStackInfo(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, PKLDRSTACKINFO pStackInfo);
 int     kLdrModQueryMainEntrypoint(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, PKLDRADDR pMainEPAddress);
@@ -783 +674 @@
     KI32 (* pfnNumberOfImports)(PKLDRMOD pMod, const void *pvBits);
     /** @copydoc kLdrModCanExecuteOn */
-    int (* pfnCanExecuteOn)(PKLDRMOD pMod, const void *pvBits, KLDRARCH enmArch, KLDRCPU enmCpu);
+    int (* pfnCanExecuteOn)(PKLDRMOD pMod, const void *pvBits, KCPUARCH enmArch, KCPU enmCpu);
     /** @copydoc kLdrModGetStackInfo */
     int (* pfnGetStackInfo)(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, PKLDRSTACKINFO pStackInfo);