Changeset 3567 for trunk/kStuff/kLdr/kLdrInternal.h

Timestamp:

Aug 27, 2007, 9:54:05 PM (18 years ago)

Author:

bird

Message:

Use the new type system.

File:

• trunk/kStuff/kLdr/kLdrInternal.h (modified) (10 diffs)

trunk/kStuff/kLdr/kLdrInternal.h

@@ -50 +50 @@
  * @{ */
 /** ELF signature ("\x7fELF"). */
-#define IMAGE_ELF_SIGNATURE         KLDR_LE2H_U32(0x7f | ('E' << 8) | ((uint32_t)'L' << 16) | ((uint32_t)'F' << 24))
+#define IMAGE_ELF_SIGNATURE         KLDR_LE2H_U32(0x7f | ('E' << 8) | ((KU32)'L' << 16) | ((KU32)'F' << 24))
 /** PE signature ("PE\0\0"). */
 #define IMAGE_NT_SIGNATURE          KLDR_LE2H_U32('P' | ('E' << 8))
@@ -62 +62 @@
 #define IMAGE_DOS_SIGNATURE         KLDR_LE2H_U16('M' | ('Z' << 8))
 /** The FAT signature (universal binaries). */
-#define IMAGE_FAT_SIGNATURE         UINT32_C(0xcafebabe)
+#define IMAGE_FAT_SIGNATURE         KU32_C(0xcafebabe)
 /** The FAT signature (universal binaries), other endian. */
-#define IMAGE_FAT_SIGNATURE_OE      UINT32_C(0xbebafeca)
+#define IMAGE_FAT_SIGNATURE_OE      KU32_C(0xbebafeca)
 /** The 32-bit Mach-O signature. */
-#define IMAGE_MACHO32_SIGNATURE     UINT32_C(0xfeedface)
+#define IMAGE_MACHO32_SIGNATURE     KU32_C(0xfeedface)
 /** The 32-bit Mach-O signature, other endian. */
-#define IMAGE_MACHO32_SIGNATURE_OE  UINT32_C(0xcefaedfe)
+#define IMAGE_MACHO32_SIGNATURE_OE  KU32_C(0xcefaedfe)
 /** The 64-bit Mach-O signature. */
-#define IMAGE_MACHO64_SIGNATURE     UINT32_C(0xfeedfacf)
+#define IMAGE_MACHO64_SIGNATURE     KU32_C(0xfeedfacf)
 /** The 64-bit Mach-O signature, other endian. */
-#define IMAGE_MACHO64_SIGNATURE_OE  UINT32_C(0xfefaedfe)
+#define IMAGE_MACHO64_SIGNATURE_OE  KU32_C(0xfefaedfe)
 /** @} */
 
@@ -245 +245 @@
 {
     /** Magic number. */
-    uint32_t            u32MagicHead;
+    KU32                u32MagicHead;
     /** The module state. */
     KLDRSTATE           enmState;
@@ -253 +253 @@
     HKLDRMOD            hMod;
     /** The total number of references. */
-    uint32_t            cRefs;
+    KU32                cRefs;
     /** The number of dependency references. */
-    uint32_t            cDepRefs;
+    KU32                cDepRefs;
     /** The number of dynamic load references. */
-    uint32_t            cDynRefs;
+    KU32                cDynRefs;
     /** Set if this is the executable module.
      * When clear, the module is a shared object or relocatable object. */
-    uint32_t            fExecutable : 1;
+    KU32                fExecutable : 1;
     /** Global DLL (set) or specific DLL (clear). */
-    uint32_t            fGlobalOrSpecific : 1;
+    KU32                fGlobalOrSpecific : 1;
     /** Whether the module contains bindable symbols in the global unix namespace. */
-    uint32_t            fBindable : 1;
+    KU32                fBindable : 1;
     /** Set if linked into the global init list. */
-    uint32_t            fInitList : 1;
+    KU32                fInitList : 1;
     /** Already loaded or checked prerequisites.
      * This flag is used when loading prerequisites, when set it means that
      * this module is already seen and shouldn't be processed again. */
-    uint32_t            fAlreadySeen : 1;
+    KU32                fAlreadySeen : 1;
     /** Set if the module is currently mapped.
      * This is used to avoid unnecessary calls to kLdrModUnmap during cleanup. */
-    uint32_t            fMapped : 1;
+    KU32                fMapped : 1;
     /** Set if TLS allocation has been done. (part of the mapping). */
-    uint32_t            fAllocatedTLS : 1;
+    KU32                fAllocatedTLS : 1;
     /** Reserved for future use. */
-    uint32_t            f25Reserved : 25;
+    KU32                f25Reserved : 25;
     /** The load list linkage. */
     struct
@@ -309 +309 @@
 
     /** The number of prerequisite modules in the prereq array. */
-    uint32_t            cPrereqs;
+    KU32                cPrereqs;
     /** Pointer to an array of prerequisite module pointers.
      * This array is only filled when in the states starting with
@@ -317 +317 @@
 
     /** Magic number. */
-    uint32_t            u32MagicTail;
+    KU32                u32MagicTail;
 } KLDRDYLDMOD, *PKLDRDYLDMOD, **PPKLDRDYLDMOD;
 
@@ -344 +344 @@
 int kldrDyldFailure(int rc, const char *pszFormat, ...);
 
-int kldrDyldOSStartExe(uintptr_t uMainEntrypoint, void *pvStack, size_t cbStack);
-void *kldrDyldOSAllocStack(size_t cb);
+int kldrDyldOSStartExe(KUPTR uMainEntrypoint, void *pvStack, KSIZE cbStack);
+void *kldrDyldOSAllocStack(KSIZE cb);
 
 int kldrDyldFindInit(void);
@@ -357 +357 @@
 
 
-int kldrDyldModCreate(PKLDRRDR pRdr, uint32_t fFlags, PPKLDRDYLDMOD ppMod);
+int kldrDyldModCreate(PKLDRRDR pRdr, KU32 fFlags, PPKLDRDYLDMOD ppMod);
 void kldrDyldModDestroy(PKLDRDYLDMOD pMod);
 void kldrDyldModAddRef(PKLDRDYLDMOD pMod);
@@ -381 +381 @@
 int kldrDyldModAttachThread(PKLDRDYLDMOD pMod);
 void kldrDyldModDetachThread(PKLDRDYLDMOD pMod);
-int kldrDyldModGetMainStack(PKLDRDYLDMOD pMod, void **ppvStack, size_t *pcbStack);
+int kldrDyldModGetMainStack(PKLDRDYLDMOD pMod, void **ppvStack, KSIZE *pcbStack);
 int kldrDyldModStartExe(PKLDRDYLDMOD pMod);
 
-int kldrDyldModGetName(PKLDRDYLDMOD pMod, char *pszName, size_t cchName);
-int kldrDyldModGetFilename(PKLDRDYLDMOD pMod, char *pszFilename, size_t cchFilename);
-int kldrDyldModQuerySymbol(PKLDRDYLDMOD pMod, uint32_t uSymbolOrdinal, const char *pszSymbolName, uintptr_t *puValue, uint32_t *pfKind);
+int kldrDyldModGetName(PKLDRDYLDMOD pMod, char *pszName, KSIZE cchName);
+int kldrDyldModGetFilename(PKLDRDYLDMOD pMod, char *pszFilename, KSIZE cchFilename);
+int kldrDyldModQuerySymbol(PKLDRDYLDMOD pMod, KU32 uSymbolOrdinal, const char *pszSymbolName, KUPTR *puValue, KU32 *pfKind);
 
 
@@ -421 +421 @@
 extern void            *g_pvkLdrDyldMainStack;
 /** The size of the main stack object. */
-extern size_t           g_cbkLdrDyldMainStack;
+extern KSIZE            g_cbkLdrDyldMainStack;
 
 /** The global error buffer. */