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

Timestamp:

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

Author:

bird

Message:

kHlp work...

File:

• trunk/kStuff/kLdr/kLdrModLX.c (modified) (30 diffs)

trunk/kStuff/kLdr/kLdrModLX.c

@@ -30 +30 @@
 *******************************************************************************/
 #include <k/kLdr.h>
-#include "kLdrHlp.h"
 #include "kLdrInternal.h"
 #include <k/kLdrFmts/lx.h>
@@ -46 +45 @@
  */
 #ifdef KLDRMODLX_STRICT
-# define KLDRMODLX_ASSERT(expr)  kldrHlpAssert(expr)
+# define KLDRMODLX_ASSERT(expr)  kHlpAssert(expr)
 #else
 # define KLDRMODLX_ASSERT(expr)  do {} while (0)
@@ -162 +161 @@
         return 0;
     }
-    kldrHlpFree(pModLX);
+    kHlpFree(pModLX);
     return rc;
 }
@@ -267 +266 @@
      * Calc the instance size, allocate and initialize it.
      */
-    cchFilename = kLdrHlpStrLen(kLdrRdrName(pRdr));
+    cchFilename = kHlpStrLen(kLdrRdrName(pRdr));
     cb = K_ALIGN_Z(sizeof(KLDRMODLX), 8)
        + K_ALIGN_Z(K_OFFSETOF(KLDRMOD, aSegments[Hdr.e32_objcnt + 1]), 8)
        + K_ALIGN_Z(cchFilename + 1, 8)
        + Hdr.e32_ldrsize + 2; /* +2 for two extra zeros. */
-    pModLX = (PKLDRMODLX)kldrHlpAlloc(cb);
+    pModLX = (PKLDRMODLX)kHlpAlloc(cb);
     if (!pModLX)
         return KLDR_ERR_NO_MEMORY;
@@ -285 +284 @@
     pMod->cchFilename = cchFilename;
     pMod->pszFilename = (char *)K_ALIGN_P(&pMod->aSegments[pMod->cSegments], 8);
-    kLdrHlpMemCopy((char *)pMod->pszFilename, kLdrRdrName(pRdr), cchFilename + 1);
+    kHlpMemCopy((char *)pMod->pszFilename, kLdrRdrName(pRdr), cchFilename + 1);
     pMod->pszName = NULL; /* finalized further down */
     pMod->cchName = 0;
@@ -387 +386 @@
         return KLDR_ERR_LX_NO_SONAME;
     pMod->cchName = *(const KU8 *)pMod->pszName++;
-    if (pMod->cchName != kLdrHlpStrLen(pMod->pszName))
+    if (pMod->cchName != kHlpStrLen(pMod->pszName))
         return KLDR_ERR_LX_BAD_SONAME;
 
@@ -533 +532 @@
     if (pModLX->pbNonResNameTab)
     {
-        kldrHlpFree(pModLX->pbNonResNameTab);
+        kHlpFree(pModLX->pbNonResNameTab);
         pModLX->pbNonResNameTab = NULL;
     }
     if (pModLX->pbFixupSection)
     {
-        kldrHlpFree(pModLX->pbFixupSection);
+        kHlpFree(pModLX->pbFixupSection);
         pModLX->pbFixupSection = NULL;
     }
     pMod->u32Magic = 0;
     pMod->pOps = NULL;
-    kldrHlpFree(pModLX);
+    kHlpFree(pModLX);
     return rc;
 }
@@ -789 +788 @@
 
         if (    cbName == cbSymbol8Bit
-            &&  !kLdrHlpMemComp(pbNameTable + 1, pchSymbol, cbName))
+            &&  !kHlpMemComp(pbNameTable + 1, pchSymbol, cbName))
             return pbNameTable;
 
@@ -937 +936 @@
     void *pv;
 
-    pv = kldrHlpAlloc(pModLX->Hdr.e32_fixupsize);
+    pv = kHlpAlloc(pModLX->Hdr.e32_fixupsize);
     if (!pv)
         return KLDR_ERR_NO_MEMORY;
@@ -962 +961 @@
     }
     else
-        kldrHlpFree(pv);
+        kHlpFree(pv);
     return rc;
 }
@@ -1208 +1207 @@
     if (*pb < cchName)
     {
-        kLdrHlpMemCopy(pszName, pb + 1, *pb);
+        kHlpMemCopy(pszName, pb + 1, *pb);
         pszName[*pb] = '\0';
         rc = 0;
@@ -1214 +1213 @@
     else
     {
-        kLdrHlpMemCopy(pszName, pb + 1, cchName);
+        kHlpMemCopy(pszName, pb + 1, cchName);
         if (cchName)
             pszName[cchName - 1] = '\0';
@@ -1345 +1344 @@
             return KLDR_ERR_ADDRESS_OVERFLOW;
     }
-    rc = kldrHlpPageAlloc(&pvBase, pModLX->cbMapped, KPROT_EXECUTE_READWRITE, fFixed);
+    rc = kHlpPageAlloc(&pvBase, pModLX->cbMapped, KPROT_EXECUTE_READWRITE, fFixed);
     if (rc)
         return rc;
@@ -1366 +1365 @@
     }
     else
-        kldrHlpPageFree(pvBase, pModLX->cbMapped);
+        kHlpPageFree(pvBase, pModLX->cbMapped);
     return rc;
 }
@@ -1413 +1412 @@
                         rc = kLdrRdrRead(pRdr, pbPage, pMap->o32_pagesize,
                                          pModLX->Hdr.e32_datapage + (pMap->o32_pagedataoffset << pModLX->Hdr.e32_pageshift));
-                        kLdrHlpMemSet(pbPage + pMap->o32_pagesize, 0, OBJPAGELEN - pMap->o32_pagesize);
+                        kHlpMemSet(pbPage + pMap->o32_pagesize, 0, OBJPAGELEN - pMap->o32_pagesize);
                     }
                     else
@@ -1424 +1423 @@
                     if (!pbTmpPage)
                     {
-                        pbTmpPage = kldrHlpAlloc(OBJPAGELEN + 256);
+                        pbTmpPage = kHlpAlloc(OBJPAGELEN + 256);
                         if (!pbTmpPage)
                             break;
@@ -1440 +1439 @@
                     if (rc)
                         break;
-                    kLdrHlpMemSet(pbTmpPage + pMap->o32_pagesize, 0, 4);
+                    kHlpMemSet(pbTmpPage + pMap->o32_pagesize, 0, 4);
 
                     /* unpack it into the image page. */
@@ -1451 +1450 @@
                 case INVALID: /* we're probably not dealing correctly with INVALID pages... */
                 case ZEROED:
-                    kLdrHlpMemSet(pbPage, 0, OBJPAGELEN);
+                    kHlpMemSet(pbPage, 0, OBJPAGELEN);
                     break;
 
@@ -1468 +1467 @@
          */
         if (iPage < cPages)
-            kLdrHlpMemSet(pbPage, 0, (cPages - iPage) * OBJPAGELEN);
+            kHlpMemSet(pbPage, 0, (cPages - iPage) * OBJPAGELEN);
     }
 
     if (pbTmpPage)
-        kldrHlpFree(pbTmpPage);
+        kHlpFree(pbTmpPage);
     return rc;
 }
@@ -1513 +1512 @@
                 return KLDR_ERR_LX_BAD_ITERDATA;
 
-            kLdrHlpMemSet(pbDst, pIter->LX_Iterdata, pIter->LX_nIter);
+            kHlpMemSet(pbDst, pIter->LX_Iterdata, pIter->LX_nIter);
             pbDst += pIter->LX_nIter;
             pIter++;
@@ -1533 +1532 @@
 
             for (i = pIter->LX_nIter; i > 0; i--, pbDst += pIter->LX_nBytes)
-                kLdrHlpMemCopy(pbDst, &pIter->LX_Iterdata, pIter->LX_nBytes);
+                kHlpMemCopy(pbDst, &pIter->LX_Iterdata, pIter->LX_nBytes);
             pIter   = (struct LX_Iter *)((char*)pIter + 4 + pIter->LX_nBytes);
         }
@@ -1542 +1541 @@
      */
     if (cbDst > 0)
-        kLdrHlpMemSet(pbDst, 0, cbDst);
+        kHlpMemSet(pbDst, 0, cbDst);
 
     return 0;
@@ -1599 +1598 @@
                     if (cbSrc < 0)
                         return KLDR_ERR_LX_BAD_ITERDATA2;
-                    kLdrHlpMemCopy(pbDst, ++pbSrc, cb);
+                    kHlpMemCopy(pbDst, ++pbSrc, cb);
                     pbDst += cb;
                     pbSrc += cb;
@@ -1616 +1615 @@
                     if (cbSrc < 0)
                         return KLDR_ERR_LX_BAD_ITERDATA2;
-                    kLdrHlpMemSet(pbDst, pbSrc[2], cb);
+                    kHlpMemSet(pbDst, pbSrc[2], cb);
                     pbDst += cb;
                     pbSrc += 3;
@@ -1652 +1651 @@
                     if (cbDst < 0)
                         return KLDR_ERR_LX_BAD_ITERDATA2;
-                    kLdrHlpMemCopy(pbDst, pbSrc, cb1);
+                    kHlpMemCopy(pbDst, pbSrc, cb1);
                     pbDst += cb1;
                     pbSrc += cb1;
@@ -1661 +1660 @@
                     if (cbDst < 0)
                         return KLDR_ERR_LX_BAD_ITERDATA2;
-                    kLdrHlpMemMove(pbDst, pbDst - off, cb2);
+                    kHlpMemMove(pbDst, pbDst - off, cb2);
                     pbDst += cb2;
                 }
@@ -1733 +1732 @@
                     if (cbDst < 0)
                         return KLDR_ERR_LX_BAD_ITERDATA2;
-                    kLdrHlpMemCopy(pbDst, pbSrc, cb1);
+                    kHlpMemCopy(pbDst, pbSrc, cb1);
                     pbDst += cb1;
                     pbSrc += cb1;
@@ -1757 +1756 @@
      */
     if (cbDst > 0)
-        kLdrHlpMemSet(pbDst, 0, cbDst);
+        kHlpMemSet(pbDst, 0, cbDst);
 
     return 0;
@@ -1867 +1866 @@
         pv = (KU8 *)pvBits + pMod->aSegments[i].RVA;
 
-        rc = kldrHlpPageProtect(pv, pMod->aSegments[i].cbMapped, enmProt);
+        rc = kHlpPageProtect(pv, pMod->aSegments[i].cbMapped, enmProt);
         if (rc)
             break;
@@ -1894 +1893 @@
      * Free the mapping and update the segments.
      */
-    rc = kldrHlpPageFree((void *)pModLX->pvMapping, pModLX->cbMapped);
+    rc = kHlpPageFree((void *)pModLX->pvMapping, pModLX->cbMapped);
     KLDRMODLX_ASSERT(!rc);
     pModLX->pvMapping = NULL;