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

Timestamp:

Sep 2, 2007, 10:55:51 PM (18 years ago)

Author:

bird

Message:

kLdrRdr cleanup.

File:

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

trunk/kStuff/kLdr/kLdrModLX.c

@@ -115 +115 @@
 static int kldrModLXRelocateBits(PKLDRMOD pMod, void *pvBits, KLDRADDR NewBaseAddress, KLDRADDR OldBaseAddress,
                                  PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
-static int kldrModLXDoCreate(PKLDRRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODLX *ppModLX);
+static int kldrModLXDoCreate(PKRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODLX *ppModLX);
 static const KU8 *kldrModLXDoNameTableLookupByOrdinal(const KU8 *pbNameTable, KI32 cbNameTable, KU32 iOrdinal);
 static int kldrModLXDoNameLookup(PKLDRMODLX pModLX, const char *pchSymbol, KU32 cchSymbol, KU32 *piSymbol);
@@ -145 +145 @@
  * @param   ppMod           Where to store the module instance pointer.
  */
-static int kldrModLXCreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
+static int kldrModLXCreate(PCKLDRMODOPS pOps, PKRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
 {
     PKLDRMODLX pModLX;
@@ -170 +170 @@
  * simplify cleanup on failure.
  */
-static int kldrModLXDoCreate(PKLDRRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODLX *ppModLX)
+static int kldrModLXDoCreate(PKRDR pRdr, KLDRFOFF offNewHdr, PKLDRMODLX *ppModLX)
 {
     struct e32_exe Hdr;
@@ -187 +187 @@
      * Read the signature and file header.
      */
-    rc = kLdrRdrRead(pRdr, &Hdr, sizeof(Hdr), offNewHdr > 0 ? offNewHdr : 0);
+    rc = kRdrRead(pRdr, &Hdr, sizeof(Hdr), offNewHdr > 0 ? offNewHdr : 0);
     if (rc)
         return rc;
@@ -205 +205 @@
 
     /* Some rough sanity checks. */
-    offEnd = kLdrRdrSize(pRdr) >= (KLDRFOFF)~(KU32)16 ? ~(KU32)16 : (KU32)kLdrRdrSize(pRdr);
+    offEnd = kRdrSize(pRdr) >= (KLDRFOFF)~(KU32)16 ? ~(KU32)16 : (KU32)kRdrSize(pRdr);
     if (    Hdr.e32_itermap > offEnd
         ||  Hdr.e32_datapage > offEnd
@@ -266 +266 @@
      * Calc the instance size, allocate and initialize it.
      */
-    cchFilename = kHlpStrLen(kLdrRdrName(pRdr));
+    cchFilename = kHlpStrLen(kRdrName(pRdr));
     cb = K_ALIGN_Z(sizeof(KLDRMODLX), 8)
        + K_ALIGN_Z(K_OFFSETOF(KLDRMOD, aSegments[Hdr.e32_objcnt + 1]), 8)
@@ -284 +284 @@
     pMod->cchFilename = cchFilename;
     pMod->pszFilename = (char *)K_ALIGN_P(&pMod->aSegments[pMod->cSegments], 8);
-    kHlpMemCopy((char *)pMod->pszFilename, kLdrRdrName(pRdr), cchFilename + 1);
+    kHlpMemCopy((char *)pMod->pszFilename, kRdrName(pRdr), cchFilename + 1);
     pMod->pszName = NULL; /* finalized further down */
     pMod->cchName = 0;
@@ -357 +357 @@
      * Read the loader data.
      */
-    rc = kLdrRdrRead(pRdr, (void *)pModLX->pbLoaderSection, pModLX->Hdr.e32_ldrsize, pModLX->Hdr.e32_objtab + pModLX->offHdr);
+    rc = kRdrRead(pRdr, (void *)pModLX->pbLoaderSection, pModLX->Hdr.e32_ldrsize, pModLX->Hdr.e32_objtab + pModLX->offHdr);
     if (rc)
         return rc;
@@ -527 +527 @@
     if (pMod->pRdr)
     {
-        rc = kLdrRdrClose(pMod->pRdr);
+        rc = kRdrClose(pMod->pRdr);
         pMod->pRdr = NULL;
     }
@@ -941 +941 @@
 
     off = pModLX->Hdr.e32_objtab + pModLX->Hdr.e32_ldrsize;
-    rc = kLdrRdrRead(pModLX->pMod->pRdr, pv, pModLX->Hdr.e32_fixupsize,
+    rc = kRdrRead(pModLX->pMod->pRdr, pv, pModLX->Hdr.e32_fixupsize,
                      off + pModLX->offHdr);
     if (!rc)
@@ -1381 +1381 @@
 static int kldrModLXDoLoadBits(PKLDRMODLX pModLX, void *pvBits)
 {
-    const PKLDRRDR pRdr = pModLX->pMod->pRdr;
+    const PKRDR pRdr = pModLX->pMod->pRdr;
     KU8 *pbTmpPage = NULL;
     int rc = 0;
@@ -1406 +1406 @@
                 case VALID:
                     if (pMap->o32_pagesize == OBJPAGELEN)
-                        rc = kLdrRdrRead(pRdr, pbPage, OBJPAGELEN,
+                        rc = kRdrRead(pRdr, pbPage, OBJPAGELEN,
                                          pModLX->Hdr.e32_datapage + (pMap->o32_pagedataoffset << pModLX->Hdr.e32_pageshift));
                     else if (pMap->o32_pagesize < OBJPAGELEN)
                     {
-                        rc = kLdrRdrRead(pRdr, pbPage, pMap->o32_pagesize,
+                        rc = kRdrRead(pRdr, pbPage, pMap->o32_pagesize,
                                          pModLX->Hdr.e32_datapage + (pMap->o32_pagedataoffset << pModLX->Hdr.e32_pageshift));
                         kHlpMemSet(pbPage + pMap->o32_pagesize, 0, OBJPAGELEN - pMap->o32_pagesize);
@@ -1435 +1435 @@
 
                     /* read it and ensure 4 extra zero bytes. */
-                    rc = kLdrRdrRead(pRdr, pbTmpPage, pMap->o32_pagesize,
+                    rc = kRdrRead(pRdr, pbTmpPage, pMap->o32_pagesize,
                                      pModLX->Hdr.e32_datapage + (pMap->o32_pagedataoffset << pModLX->Hdr.e32_pageshift));
                     if (rc)