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

Timestamp:

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

Author:

bird

Message:

Use the new type system.

File:

• trunk/kStuff/kLdr/kLdrDyldMod.c (modified) (22 diffs)

trunk/kStuff/kLdr/kLdrDyldMod.c

@@ -67 +67 @@
  * @param   ppMod   Where to put the pointer to the new module on success.
  */
-int kldrDyldModCreate(PKLDRRDR pRdr, uint32_t fFlags, PPKLDRDYLDMOD ppMod)
+int kldrDyldModCreate(PKLDRRDR pRdr, KU32 fFlags, PPKLDRDYLDMOD ppMod)
 {
     PKLDRDYLDMOD pMod;
@@ -198 +198 @@
  * @remark  This function ain't finalized yet.
  */
-int kldrDyldModCreateNative(uintptr_t hNativeModule)
+int kldrDyldModCreateNative(KUPTR hNativeModule)
 {
 #if 0
@@ -275 +275 @@
     if (pMod->papPrereqs)
     {
-        uint32_t i = pMod->cPrereqs;
+        KU32 i = pMod->cPrereqs;
         while (i-- > 0)
         {
@@ -609 +609 @@
  * @param   pMod    The module in  question.
  */
-static uint32_t kldrDyldModUnloadPrerequisitesOne(PKLDRDYLDMOD pMod)
+static KU32 kldrDyldModUnloadPrerequisitesOne(PKLDRDYLDMOD pMod)
 {
     PKLDRDYLDMOD    pMod2;
-    uint32_t        cToUnload = 0;
-    uint32_t        i;
+    KU32            cToUnload = 0;
+    KU32            i;
 
     KLDRDYLDMOD_ASSERT(pMod->papPrereqs || !pMod->cPrereqs);
@@ -683 +683 @@
 void kldrDyldModUnloadPrerequisites(PKLDRDYLDMOD pMod)
 {
-    uint32_t        cToUnload;
+    KU32            cToUnload;
 
     /* sanity */
@@ -738 +738 @@
                                  KLDRDYLDSEARCH enmSearch, unsigned fFlags)
 {
-    int32_t     cPrereqs;
-    uint32_t    i;
-    int         rc = 0;
+    KI32    cPrereqs;
+    KU32    i;
+    int     rc = 0;
 
     /* sanity */
@@ -932 +932 @@
  * pvUser points to the KLDRDYLDMOD.
  */
-static int kldrDyldModFixupGetImportCallback(PKLDRMOD pMod, uint32_t iImport, uint32_t iSymbol,
-                                             const char *pchSymbol, size_t cchSymbol, const char *pszVersion,
-                                             PKLDRADDR puValue, uint32_t *pfKind, void *pvUser)
+static int kldrDyldModFixupGetImportCallback(PKLDRMOD pMod, KU32 iImport, KU32 iSymbol,
+                                             const char *pchSymbol, KSIZE cchSymbol, const char *pszVersion,
+                                             PKLDRADDR puValue, KU32 *pfKind, void *pvUser)
 {
     static int s_cRecursiveCalls = 0;
@@ -979 +979 @@
         while (pBindMod)
         {
-            uint32_t fKind;
+            KU32 fKind;
             KLDRADDR uValue;
             rc = kLdrModQuerySymbol(pBindMod->pMod, NULL, KLDRMOD_BASEADDRESS_MAP,
@@ -1058 +1058 @@
 
     pMod->enmState = KLDRSTATE_INITIALIZING;
-    rc = kLdrModCallInit(pMod->pMod, (uintptr_t)pMod->hMod);
+    rc = kLdrModCallInit(pMod->pMod, (KUPTR)pMod->hMod);
     if (!rc)
     {
@@ -1090 +1090 @@
 
     pMod->enmState = KLDRSTATE_TERMINATING;
-    kLdrModCallTerm(pMod->pMod, (uintptr_t)pMod->hMod);
+    kLdrModCallTerm(pMod->pMod, (KUPTR)pMod->hMod);
     pMod->enmState = KLDRSTATE_PENDING_GC;
     /* unlinking on destruction. */
@@ -1106 +1106 @@
     KLDRDYLDMOD_ASSERT(pMod->enmState == KLDRSTATE_GOOD);
 
-    return kLdrModCallThread(pMod->pMod, (uintptr_t)pMod->hMod, 1 /* attach */);
+    return kLdrModCallThread(pMod->pMod, (KUPTR)pMod->hMod, 1 /* attach */);
 }
 
@@ -1120 +1120 @@
     KLDRDYLDMOD_ASSERT(pMod->enmState == KLDRSTATE_GOOD);
 
-    kLdrModCallThread(pMod->pMod, (uintptr_t)pMod->hMod, 0 /* detach */);
+    kLdrModCallThread(pMod->pMod, (KUPTR)pMod->hMod, 0 /* detach */);
 }
 
@@ -1132 +1132 @@
  * @param   pcbStack    Where to store the size of the stack.
  */
-int kldrDyldModGetMainStack(PKLDRDYLDMOD pMod, void **ppvStack, size_t *pcbStack)
+int kldrDyldModGetMainStack(PKLDRDYLDMOD pMod, void **ppvStack, KSIZE *pcbStack)
 {
     int rc = 0;
@@ -1148 +1148 @@
         {
             /* check if there is a stack size override/default. */
-            size_t cbDefOverride;
+            KSIZE cbDefOverride;
             if (kldrHlpGetEnvUZ("KLDR_MAIN_STACK_SIZE", &cbDefOverride))
                 cbDefOverride = 0;
@@ -1157 +1157 @@
                 ||  StackInfo.cbStack < cbDefOverride)
             {
-                size_t cbStack = (size_t)KLDR_MAX(StackInfo.cbStack, cbDefOverride);
+                KSIZE cbStack = (KSIZE)KLDR_MAX(StackInfo.cbStack, cbDefOverride);
 
                 g_pvkLdrDyldMainStack = kldrDyldOSAllocStack(cbStack);
@@ -1174 +1174 @@
 
                 g_fkLdrDyldMainStackAllocated = 0;
-                g_pvkLdrDyldMainStack = (void *)(uintptr_t)StackInfo.Address;
-                KLDRDYLDMOD_ASSERT((uintptr_t)g_pvkLdrDyldMainStack == StackInfo.Address);
-
-                g_cbkLdrDyldMainStack = (size_t)StackInfo.cbStack;
+                g_pvkLdrDyldMainStack = (void *)(KUPTR)StackInfo.Address;
+                KLDRDYLDMOD_ASSERT((KUPTR)g_pvkLdrDyldMainStack == StackInfo.Address);
+
+                g_cbkLdrDyldMainStack = (KSIZE)StackInfo.cbStack;
                 KLDRDYLDMOD_ASSERT(StackInfo.cbStack == g_cbkLdrDyldMainStack);
             }
@@ -1209 +1209 @@
     KLDRADDR    MainEPAddress;
     void       *pvStack;
-    size_t      cbStack;
+    KSIZE      cbStack;
     KLDRDYLDMOD_ASSERT(pMod->fExecutable);
 
@@ -1218 +1218 @@
     if (rc)
         return rc;
-    return kldrDyldOSStartExe((uintptr_t)MainEPAddress, pvStack, cbStack);
+    return kldrDyldOSStartExe((KUPTR)MainEPAddress, pvStack, cbStack);
 }
 
@@ -1230 +1230 @@
  * @param   cchName         The size of the name buffer.
  */
-int kldrDyldModGetName(PKLDRDYLDMOD pMod, char *pszName, size_t cchName)
-{
-    size_t cch = KLDR_MIN(cchName, pMod->pMod->cchName + 1);
+int kldrDyldModGetName(PKLDRDYLDMOD pMod, char *pszName, KSIZE cchName)
+{
+    KSIZE cch = KLDR_MIN(cchName, pMod->pMod->cchName + 1);
     if (cch)
     {
@@ -1250 +1250 @@
  * @param   cchFilename     The size of the filename buffer.
  */
-int kldrDyldModGetFilename(PKLDRDYLDMOD pMod, char *pszFilename, size_t cchFilename)
-{
-    size_t cch = KLDR_MIN(cchFilename, pMod->pMod->cchFilename + 1);
+int kldrDyldModGetFilename(PKLDRDYLDMOD pMod, char *pszFilename, KSIZE cchFilename)
+{
+    KSIZE cch = KLDR_MIN(cchFilename, pMod->pMod->cchFilename + 1);
     if (cch)
     {
@@ -1272 +1272 @@
  * @param   pfKind          Where to store the symbol kind. optional.
  */
-int kldrDyldModQuerySymbol(PKLDRDYLDMOD pMod, uint32_t uSymbolOrdinal, const char *pszSymbolName,
-                           uintptr_t *puValue, uint32_t *pfKind)
+int kldrDyldModQuerySymbol(PKLDRDYLDMOD pMod, KU32 uSymbolOrdinal, const char *pszSymbolName,
+                           KUPTR *puValue, KU32 *pfKind)
 {
     int         rc;
     KLDRADDR    uValue = 0;
-    uint32_t    fKind = 0;
+    KU32        fKind = 0;
 
     rc = kLdrModQuerySymbol(pMod->pMod, NULL, KLDRMOD_BASEADDRESS_MAP,
@@ -1287 +1287 @@
         if (puValue)
         {
-            *puValue = (uintptr_t)uValue;
+            *puValue = (KUPTR)uValue;
             KLDRDYLDMOD_ASSERT(*puValue == uValue);
         }