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

Timestamp:

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

Author:

bird

Message:

kHlp work...

File:

• trunk/kStuff/kLdr/kLdrModMachO.c (modified) (24 diffs)

trunk/kStuff/kLdr/kLdrModMachO.c

@@ -30 +30 @@
 *******************************************************************************/
 #include <k/kLdr.h>
-#include "kLdrHlp.h"
 #include "kLdrInternal.h"
 #include <k/kLdrFmts/mach-o.h>
@@ -46 +45 @@
  */
 #ifdef KLDRMODMACHO_STRICT
-# define KLDRMODMACHO_ASSERT(expr)  kldrHlpAssert(expr)
+# define KLDRMODMACHO_ASSERT(expr)  kHlpAssert(expr)
 #else
 # define KLDRMODMACHO_ASSERT(expr)  do {} while (0)
@@ -215 +214 @@
     if (pModMachO)
     {
-        kldrHlpFree(pModMachO->pbLoadCommands);
-        kldrHlpFree(pModMachO);
+        kHlpFree(pModMachO->pbLoadCommands);
+        kHlpFree(pModMachO);
     }
     return rc;
@@ -279 +278 @@
      * Read and pre-parse the load commands to figure out how many segments we'll be needing.
      */
-    pbLoadCommands = kldrHlpAlloc(s.Hdr32.sizeofcmds);
+    pbLoadCommands = kHlpAlloc(s.Hdr32.sizeofcmds);
     if (!pbLoadCommands)
         return KLDR_ERR_NO_MEMORY;
@@ -290 +289 @@
     if (rc)
     {
-        kldrHlpFree(pbLoadCommands);
+        kHlpFree(pbLoadCommands);
         return rc;
     }
@@ -298 +297 @@
      * Calc the instance size, allocate and initialize it.
      */
-    cchFilename = kLdrHlpStrLen(kLdrRdrName(pRdr));
+    cchFilename = kHlpStrLen(kLdrRdrName(pRdr));
     cb = K_ALIGN_Z(  K_OFFSETOF(KLDRMODMACHO, aSegments[cSegments])
                       + sizeof(KLDRMODMACHOSECT) * cSections, 16)
@@ -304 +303 @@
        + cchFilename + 1
        + cbStringPool;
-    pModMachO = (PKLDRMODMACHO)kldrHlpAlloc(cb);
+    pModMachO = (PKLDRMODMACHO)kHlpAlloc(cb);
     if (!pModMachO)
         return KLDR_ERR_NO_MEMORY;
@@ -319 +318 @@
     pMod->cchFilename = cchFilename;
     pMod->pszFilename = (char *)&pMod->aSegments[pMod->cSegments];
-    kLdrHlpMemCopy((char *)pMod->pszFilename, kLdrRdrName(pRdr), cchFilename + 1);
-    pMod->pszName = kldrHlpGetFilename(pMod->pszFilename);
+    kHlpMemCopy((char *)pMod->pszFilename, kLdrRdrName(pRdr), cchFilename + 1);
+    pMod->pszName = kHlpGetFilename(pMod->pszFilename);
     pMod->cchName = cchFilename - (pMod->pszName - pMod->pszFilename);
     switch (s.Hdr32.cputype)
@@ -619 +618 @@
                             /* a new segment? */
                             if (    !cSegments
-                                ||  kLdrHlpStrNComp(pSect->segname, (pSect - 1)->segname, sizeof(pSect->segname)))
+                                ||  kHlpStrNComp(pSect->segname, (pSect - 1)->segname, sizeof(pSect->segname)))
                             {
 #if 0 /** @todo This  doesn't work because of BSS. */
@@ -626 +625 @@
                                 while ((KUPTR)pCur >= (KUPTR)pFirstSect)
                                 {
-                                    if (!kLdrHlpStrNComp(pCur->segname, pSect->segname, sizeof(pSect->segname)))
+                                    if (!kHlpStrNComp(pCur->segname, pSect->segname, sizeof(pSect->segname)))
                                         return KLDR_ERR_MACHO_BAD_SECTION_ORDER;
                                     pCur--;
@@ -634 +633 @@
                                 /* ok. count it and the string. */
                                 cSegments++;
-                                cbStringPool += kLdrHlpStrNLen(&pSect->segname[0], sizeof(pSect->segname)) + 1;
+                                cbStringPool += kHlpStrNLen(&pSect->segname[0], sizeof(pSect->segname)) + 1;
                             }
                             break;
@@ -858 +857 @@
 
                             if (    fFirstSegment
-                                ||  kLdrHlpStrNComp(pSect->segname, (pSect - 1)->segname, sizeof(pSect->segname)))
+                                ||  kHlpStrNComp(pSect->segname, (pSect - 1)->segname, sizeof(pSect->segname)))
                             {
                                 /* close the previous segment */
@@ -867 +866 @@
                                 pSeg->pvUser = NULL;
                                 pSeg->pchName = pbStringPool;
-                                pSeg->cchName = (KU32)kLdrHlpStrNLen(&pSect->segname[0], sizeof(pSect->sectname));
-                                kLdrHlpMemCopy(pbStringPool, &pSect->segname[0], pSeg->cchName);
+                                pSeg->cchName = (KU32)kHlpStrNLen(&pSect->segname[0], sizeof(pSect->sectname));
+                                kHlpMemCopy(pbStringPool, &pSect->segname[0], pSeg->cchName);
                                 pbStringPool += pSeg->cchName;
                                 *pbStringPool++ = '\0';
@@ -1002 +1001 @@
         while (j-- > 0)
         {
-            kldrHlpFree(pModMachO->aSegments[i].paSections[j].paFixups);
+            kHlpFree(pModMachO->aSegments[i].paSections[j].paFixups);
             pModMachO->aSegments[i].paSections[j].paFixups = NULL;
         }
@@ -1014 +1013 @@
     pMod->u32Magic = 0;
     pMod->pOps = NULL;
-    kldrHlpFree(pModMachO->pbLoadCommands);
+    kHlpFree(pModMachO->pbLoadCommands);
     pModMachO->pbLoadCommands = NULL;
-    kldrHlpFree(pModMachO->pchStrings);
+    kHlpFree(pModMachO->pchStrings);
     pModMachO->pchStrings = NULL;
-    kldrHlpFree(pModMachO->pvaSymbols);
+    kHlpFree(pModMachO->pvaSymbols);
     pModMachO->pvaSymbols = NULL;
-    kldrHlpFree(pModMachO);
+    kHlpFree(pModMachO);
     return rc;
 }
@@ -1152 +1151 @@
             if (psz[cchSymbol])
                 continue;
-            if (kLdrHlpMemComp(psz, pchSymbol, cchSymbol))
+            if (kHlpMemComp(psz, pchSymbol, cchSymbol))
                 continue;
 
@@ -1325 +1324 @@
             return KLDR_ERR_MACHO_BAD_SYMBOL;
         psz = &pchStrings[paSyms[iSym].n_un.n_strx];
-        cch = kLdrHlpStrLen(psz);
+        cch = kHlpStrLen(psz);
         if (!cch)
             psz = NULL;
@@ -1757 +1756 @@
                     return KLDR_ERR_MACHO_BAD_SYMBOL;
                 pszSymbol = &pModMachO->pchStrings[paSyms[iSym].n_un.n_strx];
-                cchSymbol = kLdrHlpStrLen(pszSymbol);
+                cchSymbol = kHlpStrLen(pszSymbol);
                 rc = pfnGetImport(pModMachO->pMod, NIL_KLDRMOD_IMPORT, iSym, pszSymbol, cchSymbol, NULL,
                                   &Value, &fKind, pvUser);
@@ -1808 +1807 @@
                     return KLDR_ERR_MACHO_BAD_SYMBOL;
                 pszSymbol = &pModMachO->pchStrings[paSyms[iSym].n_un.n_strx];
-                cchSymbol = kLdrHlpStrLen(pszSymbol);
+                cchSymbol = kHlpStrLen(pszSymbol);
                 rc = pfnGetImport(pModMachO->pMod, NIL_KLDRMOD_IMPORT, iSym, pszSymbol, cchSymbol, NULL,
                                   &Value, &fKind, pvUser);
@@ -2142 +2141 @@
             return KLDR_ERR_SIZE_OVERFLOW;
         rc = KLDR_ERR_NO_MEMORY;
-        pvSyms = kldrHlpAlloc(cbSyms);
+        pvSyms = kHlpAlloc(cbSyms);
         if (pvSyms)
         {
             if (pModMachO->cchStrings)
-                pvStrings = kldrHlpAlloc(pModMachO->cchStrings);
+                pvStrings = kHlpAlloc(pModMachO->cchStrings);
             else
-                pvStrings = kldrHlpAllocZ(4);
+                pvStrings = kHlpAllocZ(4);
             if (pvStrings)
             {
@@ -2188 +2187 @@
                     return 0;
                 }
-                kldrHlpFree(pvStrings);
+                kHlpFree(pvStrings);
             }
-            kldrHlpFree(pvSyms);
+            kHlpFree(pvSyms);
         }
     }
@@ -2220 +2219 @@
     if (cbFixups / sizeof(*paFixups) != cFixups)
         return KLDR_ERR_SIZE_OVERFLOW;
-    paFixups = (macho_relocation_info_t *)kldrHlpAlloc(cbFixups);
+    paFixups = (macho_relocation_info_t *)kHlpAlloc(cbFixups);
     if (!paFixups)
         return KLDR_ERR_NO_MEMORY;
@@ -2244 +2243 @@
     }
     else
-        kldrHlpFree(paFixups);
+        kHlpFree(paFixups);
     return rc;
 }
@@ -2306 +2305 @@
      * Zero the entire buffer first to simplify things.
      */
-    kLdrHlpMemSet(pvBits, 0, (KSIZE)pModMachO->cbImage);
+    kHlpMemSet(pvBits, 0, (KSIZE)pModMachO->cbImage);
 
     /*