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

Timestamp:

Aug 31, 2007, 6:09:23 AM (18 years ago)

Author:

bird

Message:

kHlp work...

File:

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

trunk/kStuff/kLdr/kLdrDyldMod.c

@@ -32 +32 @@
 #include <k/kLdr.h>
 #include "kLdrInternal.h"
-#include "kLdrHlp.h"
 
 
@@ -46 +45 @@
  */
 #ifdef KLDRDYLDMOD_STRICT
-# define KLDRDYLDMOD_ASSERT(expr)  kldrHlpAssert(expr)
+# define KLDRDYLDMOD_ASSERT(expr)  kHlpAssert(expr)
 #else
 # define KLDRDYLDMOD_ASSERT(expr)  do {} while (0)
@@ -120 +119 @@
      * Allocate a new dyld module.
      */
-    pMod = (PKLDRDYLDMOD)kldrHlpAlloc(sizeof(*pMod));
+    pMod = (PKLDRDYLDMOD)kHlpAlloc(sizeof(*pMod));
     if (pMod)
     {
@@ -282 +281 @@
         }
 
-        kldrHlpFree(pMod->papPrereqs);
+        kHlpFree(pMod->papPrereqs);
         pMod->papPrereqs = NULL;
         pMod->cPrereqs = 0;
@@ -305 +304 @@
         pMod->u32MagicHead = 1;
         pMod->u32MagicTail = 2;
-        kldrHlpFree(pMod);
+        kHlpFree(pMod);
     }
 }
@@ -490 +489 @@
         pMod->u32MagicHead = 1;
         pMod->u32MagicTail = 2;
-        kldrHlpFree(pMod);
+        kHlpFree(pMod);
     }
 }
@@ -757 +756 @@
      */
     cPrereqs = kLdrModNumberOfImports(pMod->pMod, NULL);
-    kldrHlpAssert(cPrereqs >= 0);
+    kHlpAssert(cPrereqs >= 0);
     if (pMod->cPrereqs != cPrereqs)
     {
         KLDRDYLDMOD_ASSERT(!pMod->papPrereqs);
-        pMod->papPrereqs = (PPKLDRDYLDMOD)kldrHlpAllocZ(sizeof(pMod->papPrereqs[0]) * cPrereqs);
+        pMod->papPrereqs = (PPKLDRDYLDMOD)kHlpAllocZ(sizeof(pMod->papPrereqs[0]) * cPrereqs);
         if (!pMod->papPrereqs)
             return KLDR_ERR_NO_MEMORY;
@@ -1149 +1148 @@
             /* check if there is a stack size override/default. */
             KSIZE cbDefOverride;
-            if (kldrHlpGetEnvUZ("KLDR_MAIN_STACK_SIZE", &cbDefOverride))
+            if (kHlpGetEnvUZ("KLDR_MAIN_STACK_SIZE", &cbDefOverride))
                 cbDefOverride = 0;
 
@@ -1235 +1234 @@
     if (cch)
     {
-        kLdrHlpMemCopy(pszName, pMod->pMod->pszName, cch - 1);
+        kHlpMemCopy(pszName, pMod->pMod->pszName, cch - 1);
         pszName[cch - 1] = '\0';
     }
@@ -1255 +1254 @@
     if (cch)
     {
-        kLdrHlpMemCopy(pszFilename, pMod->pMod->pszFilename, cch - 1);
+        kHlpMemCopy(pszFilename, pMod->pMod->pszFilename, cch - 1);
         pszFilename[cch - 1] = '\0';
     }
@@ -1280 +1279 @@
 
     rc = kLdrModQuerySymbol(pMod->pMod, NULL, KLDRMOD_BASEADDRESS_MAP,
-                            uSymbolOrdinal, pszSymbolName, kLdrHlpStrLen(pszSymbolName), NULL,
+                            uSymbolOrdinal, pszSymbolName, kHlpStrLen(pszSymbolName), NULL,
                             kldrDyldModFixupGetImportCallback, pMod,
                             &uValue, &fKind);