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

Timestamp:

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

Author:

bird

Message:

kHlp work...

File:

• trunk/kStuff/kLdr/kLdrDyld.c (modified) (16 diffs)

trunk/kStuff/kLdr/kLdrDyld.c

@@ -30 +30 @@
 *******************************************************************************/
 #include <k/kLdr.h>
-#include "kLdrHlp.h"
 #include "kLdrInternal.h"
 
@@ -45 +44 @@
  */
 #ifdef KLDRDYLD_STRICT
-# define KLDRDYLD_ASSERT(expr)  kldrHlpAssert(expr)
+# define KLDRDYLD_ASSERT(expr)  kHlpAssert(expr)
 #else
 # define KLDRDYLD_ASSERT(expr)  do {} while (0)
@@ -267 +266 @@
     /** @todo make sense of this default prefix/suffix stuff. */
     if (pArgs->szDefPrefix[0] != '\0')
-        kLdrHlpMemCopy(kLdrDyldDefPrefix, pArgs->szDefPrefix, K_MIN(sizeof(pArgs->szDefPrefix), sizeof(kLdrDyldDefPrefix)));
+        kHlpMemCopy(kLdrDyldDefPrefix, pArgs->szDefPrefix, K_MIN(sizeof(pArgs->szDefPrefix), sizeof(kLdrDyldDefPrefix)));
     if (pArgs->szDefSuffix[0] != '\0')
-        kLdrHlpMemCopy(kLdrDyldDefSuffix, pArgs->szDefSuffix, K_MIN(sizeof(pArgs->szDefSuffix), sizeof(kLdrDyldDefSuffix)));
+        kHlpMemCopy(kLdrDyldDefSuffix, pArgs->szDefSuffix, K_MIN(sizeof(pArgs->szDefSuffix), sizeof(kLdrDyldDefSuffix)));
 
     /** @todo append that path to the one for the specified search method. */
     /** @todo create a function for doing this, an exposed api preferably. */
     /* append path */
-    cbStack = sizeof(kLdrDyldLibraryPath) - kLdrHlpStrLen(kLdrDyldLibraryPath); /* borrow cbStack for a itty bit. */
-    kLdrHlpMemCopy(kLdrDyldLibraryPath, pArgs->szLibPath, K_MIN(sizeof(pArgs->szLibPath), cbStack));
+    cbStack = sizeof(kLdrDyldLibraryPath) - kHlpStrLen(kLdrDyldLibraryPath); /* borrow cbStack for a itty bit. */
+    kHlpMemCopy(kLdrDyldLibraryPath, pArgs->szLibPath, K_MIN(sizeof(pArgs->szLibPath), cbStack));
     kLdrDyldLibraryPath[sizeof(kLdrDyldLibraryPath) - 1] = '\0';
 
@@ -281 +280 @@
      * Make sure we own the loader semaphore (necessary for init).
      */
-    rc = kldrHlpSemRequest();
+    rc = kHlpSemRequest();
     if (rc)
         kldrDyldFailure(rc, "Sem req. failure, rc=%d", rc);
@@ -333 +332 @@
         *pszErr = '\0';
     *phMod = NIL_HKLDRMOD;
-    KLDRHLP_VALIDATE_STRING(pszDll);
-    KLDRHLP_VALIDATE_OPTIONAL_STRING(pszPrefix);
-    KLDRHLP_VALIDATE_OPTIONAL_STRING(pszSuffix);
-    KLDRHLP_VALIDATE_ENUM(enmSearch, KLDRDYLD_SEARCH);
-    KLDRHLP_VALIDATE_OPTIONAL_BUFFER(pszErr, cchErr);
+    K_VALIDATE_STRING(pszDll);
+    K_VALIDATE_OPTIONAL_STRING(pszPrefix);
+    K_VALIDATE_OPTIONAL_STRING(pszSuffix);
+    K_VALIDATE_ENUM(enmSearch, KLDRDYLD_SEARCH);
+    K_VALIDATE_OPTIONAL_BUFFER(pszErr, cchErr);
 
     /* get the semaphore and do the job. */
-    rc = kldrHlpSemRequest();
+    rc = kHlpSemRequest();
     if (!rc)
     {
@@ -349 +348 @@
         g_cActiveLoadCalls--;
         kldrDyldDoModuleTerminationAndGarabageCollection();
-        kldrHlpSemRelease();
+        kHlpSemRelease();
         *phMod = pMod ? pMod->hMod : NIL_HKLDRMOD;
     }
@@ -370 +369 @@
 
     /* get sem & do work */
-    rc = kldrHlpSemRequest();
+    rc = kHlpSemRequest();
     if (!rc)
     {
@@ -378 +377 @@
         g_cActiveUnloadCalls--;
         kldrDyldDoModuleTerminationAndGarabageCollection();
-        kldrHlpSemRelease();
+        kHlpSemRelease();
     }
     return rc;
@@ -406 +405 @@
     /* validate & initialize */
     *phMod = NIL_HKLDRMOD;
-    KLDRHLP_VALIDATE_STRING(pszDll);
+    K_VALIDATE_STRING(pszDll);
 
     /* get sem & do work */
-    rc = kldrHlpSemRequest();
+    rc = kHlpSemRequest();
     if (!rc)
     {
         PKLDRDYLDMOD pMod = NULL;
         rc = kldrDyldDoFindByName(pszDll, pszPrefix, pszSuffix, enmSearch, fFlags, &pMod);
-        kldrHlpSemRelease();
+        kHlpSemRelease();
         *phMod = pMod ? pMod->hMod : NIL_HKLDRMOD;
     }
@@ -446 +445 @@
 
     /* get sem & do work */
-    rc = kldrHlpSemRequest();
+    rc = kHlpSemRequest();
     if (!rc)
     {
         PKLDRDYLDMOD pMod = NULL;
         rc = kldrDyldDoFindByAddress(Address, &pMod, piSegment, poffSegment);
-        kldrHlpSemRelease();
+        kHlpSemRelease();
         *phMod = pMod ? pMod->hMod : NIL_HKLDRMOD;
     }
@@ -476 +475 @@
         *pszName = '\0';
     KLDRDYLD_VALIDATE_HKLDRMOD(hMod);
-    KLDRHLP_VALIDATE_BUFFER(pszName, cchName);
+    K_VALIDATE_BUFFER(pszName, cchName);
 
     /* get sem & do work */
-    rc = kldrHlpSemRequest();
+    rc = kHlpSemRequest();
     if (!rc)
     {
         rc = kldrDyldDoGetName(hMod, pszName, cchName);
-        kldrHlpSemRelease();
+        kHlpSemRelease();
     }
     return rc;
@@ -507 +506 @@
         *pszFilename = '\0';
     KLDRDYLD_VALIDATE_HKLDRMOD(hMod);
-    KLDRHLP_VALIDATE_BUFFER(pszFilename, cchFilename);
+    K_VALIDATE_BUFFER(pszFilename, cchFilename);
 
     /* get sem & do work */
-    rc = kldrHlpSemRequest();
+    rc = kHlpSemRequest();
     if (!rc)
     {
         rc = kldrDyldDoGetFilename(hMod, pszFilename, cchFilename);
-        kldrHlpSemRelease();
+        kHlpSemRelease();
     }
     return rc;
@@ -545 +544 @@
         return KLDR_ERR_INVALID_PARAMETER;
     KLDRDYLD_VALIDATE_HKLDRMOD(hMod);
-    KLDRHLP_VALIDATE_OPTIONAL_STRING(pszSymbolName);
+    K_VALIDATE_OPTIONAL_STRING(pszSymbolName);
 
     /* get sem & do work */
-    rc = kldrHlpSemRequest();
+    rc = kHlpSemRequest();
     if (!rc)
     {
         rc = kldrDyldDoQuerySymbol(hMod, uSymbolOrdinal, pszSymbolName, pValue, pfKind);
-        kldrHlpSemRelease();
+        kHlpSemRelease();
     }
     return rc;
@@ -1086 +1085 @@
         KU32 cNew = g_cStackModsAllocated ? g_cStackModsAllocated * 2 : 128;
         void *pvOld = g_papStackMods;
-        void *pvNew = kldrHlpAlloc(cNew * sizeof(g_papStackMods[0]));
+        void *pvNew = kHlpAlloc(cNew * sizeof(g_papStackMods[0]));
         if (!pvNew)
             return KLDR_ERR_NO_MEMORY;
-        kLdrHlpMemCopy(pvNew, pvOld, g_cStackMods * sizeof(g_papStackMods[0]));
+        kHlpMemCopy(pvNew, pvOld, g_cStackMods * sizeof(g_papStackMods[0]));
         g_papStackMods = (PPKLDRDYLDMOD)pvNew;
-        kldrHlpFree(pvOld);
+        kHlpFree(pvOld);
     }
 
@@ -1472 +1471 @@
     /** @todo print it. */
     if (g_fBootstrapping);
-        kldrHlpExit(1);
+        kHlpExit(1);
     return rc;
 }
@@ -1491 +1490 @@
     /* if no error string, format the rc into a string. */
     if (!g_szkLdrDyldError[0] && rc)
-        kldrHlpInt2Ascii(g_szkLdrDyldError, sizeof(g_szkLdrDyldError), rc, 10);
+        kHlpInt2Ascii(g_szkLdrDyldError, sizeof(g_szkLdrDyldError), rc, 10);
 
     /* copy it if we got something. */
     if (cchErr && pszErr && g_szkLdrDyldError[0])
     {
-        cchToCopy = kLdrHlpStrLen(g_szkLdrDyldError);
+        cchToCopy = kHlpStrLen(g_szkLdrDyldError);
         if (cchToCopy >= cchErr)
             cchToCopy = cchErr - 1;
-        kLdrHlpMemCopy(pszErr, g_szkLdrDyldError, cchToCopy);
+        kHlpMemCopy(pszErr, g_szkLdrDyldError, cchToCopy);
         pszErr[cchToCopy] = '\0';
     }