Changeset 3567 for trunk/kStuff/kLdr/kLdrMod.c

Timestamp:

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

Author:

bird

Message:

Use the new type system.

File:

• trunk/kStuff/kLdr/kLdrMod.c (modified) (10 diffs)

trunk/kStuff/kLdr/kLdrMod.c

@@ -140 +140 @@
     union
     {
-        uint32_t    u32;
-        uint16_t    u16;
-        uint16_t    au16[2];
-        uint8_t     au8[4];
+        KU32        u32;
+        KU16        u16;
+        KU16        au16[2];
+        KU8         au8[4];
     }           u;
     KLDRFOFF    offHdr = 0;
@@ -258 +258 @@
  *                          On output the symbol kind. (optional)
  */
-int     kLdrModQuerySymbol(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t iSymbol,
-                           const char *pchSymbol, size_t cchSymbol, const char *pszVersion,
-                           PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser, PKLDRADDR puValue, uint32_t *pfKind)
+int     kLdrModQuerySymbol(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, KU32 iSymbol,
+                           const char *pchSymbol, KSIZE cchSymbol, const char *pszVersion,
+                           PFNKLDRMODGETIMPORT pfnGetForwarder, void *pvUser, PKLDRADDR puValue, KU32 *pfKind)
 {
     KLDRMOD_VALIDATE(pMod);
@@ -288 +288 @@
  * @param   pvUser          The user argument to the callback function.
  */
-int     kLdrModEnumSymbols(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t fFlags,
+int     kLdrModEnumSymbols(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, KU32 fFlags,
                            PFNKLDRMODENUMSYMS pfnCallback, void *pvUser)
 {
@@ -310 +310 @@
  * @param   cchName         The size of the name buffer.
  */
-int     kLdrModGetImport(PKLDRMOD pMod, const void *pvBits, uint32_t iImport, char *pszName, size_t cchName)
+int     kLdrModGetImport(PKLDRMOD pMod, const void *pvBits, KU32 iImport, char *pszName, KSIZE cchName)
 {
     KLDRMOD_VALIDATE(pMod);
@@ -325 +325 @@
  *                          This can be used by some module interpreters to reduce memory consumption.
  */
-int32_t kLdrModNumberOfImports(PKLDRMOD pMod, const void *pvBits)
+KI32 kLdrModNumberOfImports(PKLDRMOD pMod, const void *pvBits)
 {
     KLDRMOD_VALIDATE(pMod);
@@ -417 +417 @@
  * @param   pvUser          The user argument for the callback.
  */
-int     kLdrModQueryResource(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t idType, const char *pszType,
-                             uint32_t idName, const char *pszName, uint32_t idLang, PKLDRADDR pAddrRsrc, size_t *pcbRsrc)
+int     kLdrModQueryResource(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, KU32 idType, const char *pszType,
+                             KU32 idName, const char *pszName, KU32 idLang, PKLDRADDR pAddrRsrc, KSIZE *pcbRsrc)
 {
     KLDRMOD_VALIDATE(pMod);
@@ -453 +453 @@
  * @param   pvUser          The user argument for the callback.
  */
-int     kLdrModEnumResources(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, uint32_t idType, const char *pszType,
-                             uint32_t idName, const char *pszName, uint32_t idLang, PFNKLDRENUMRSRC pfnCallback, void *pvUser)
+int     kLdrModEnumResources(PKLDRMOD pMod, const void *pvBits, KLDRADDR BaseAddress, KU32 idType, const char *pszType,
+                             KU32 idName, const char *pszName, KU32 idLang, PFNKLDRENUMRSRC pfnCallback, void *pvUser)
 {
     KLDRMOD_VALIDATE(pMod);
@@ -615 +615 @@
  * @param   uHandle         The module handle to use if any of the init functions requires the module handle.
  */
-int     kLdrModCallInit(PKLDRMOD pMod, uintptr_t uHandle)
+int     kLdrModCallInit(PKLDRMOD pMod, KUPTR uHandle)
 {
     KLDRMOD_VALIDATE(pMod);
@@ -631 +631 @@
  * @remark  Termination function failure will be ignored by the module interpreter.
  */
-int     kLdrModCallTerm(PKLDRMOD pMod, uintptr_t uHandle)
+int     kLdrModCallTerm(PKLDRMOD pMod, KUPTR uHandle)
 {
     KLDRMOD_VALIDATE(pMod);
@@ -650 +650 @@
  * @remark  Detach function failure will be ignored by the module interpreter.
  */
-int     kLdrModCallThread(PKLDRMOD pMod, uintptr_t uHandle, unsigned fAttachingOrDetaching)
+int     kLdrModCallThread(PKLDRMOD pMod, KUPTR uHandle, unsigned fAttachingOrDetaching)
 {
     KLDRMOD_VALIDATE(pMod);