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

Timestamp:

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

Author:

bird

Message:

kLdrRdr cleanup.

File:

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

trunk/kStuff/kLdr/kLdrModMachO.c

@@ -159 +159 @@
                                     PFNKLDRMODGETIMPORT pfnGetImport, void *pvUser);
 
-static int  kldrModMachODoCreate(PKLDRRDR pRdr, PKLDRMODMACHO *ppMod);
-static int  kldrModMachOPreParseLoadCommands(KU8 *pbLoadCommands, const mach_header_32_t *pHdr, PKLDRRDR pRdr,
+static int  kldrModMachODoCreate(PKRDR pRdr, PKLDRMODMACHO *ppMod);
+static int  kldrModMachOPreParseLoadCommands(KU8 *pbLoadCommands, const mach_header_32_t *pHdr, PKRDR pRdr,
                                              KU32 *pcSegments, KU32 *pcSections, KU32 *pcbStringPool);
 static int  kldrModMachOParseLoadCommands(PKLDRMODMACHO pModMachO, char *pbStringPool, KU32 cbStringPool);
@@ -196 +196 @@
  * @param   ppMod           Where to store the module instance pointer.
  */
-static int kldrModMachOCreate(PCKLDRMODOPS pOps, PKLDRRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
+static int kldrModMachOCreate(PCKLDRMODOPS pOps, PKRDR pRdr, KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
 {
     PKLDRMODMACHO pModMachO;
@@ -225 +225 @@
  * simplify cleanup on failure.
  */
-static int kldrModMachODoCreate(PKLDRRDR pRdr, PKLDRMODMACHO *ppModMachO)
+static int kldrModMachODoCreate(PKRDR pRdr, PKLDRMODMACHO *ppModMachO)
 {
     union
@@ -246 +246 @@
      * Read the Mach-O header.
      */
-    rc = kLdrRdrRead(pRdr, &s, sizeof(s), 0);
+    rc = kRdrRead(pRdr, &s, sizeof(s), 0);
     if (rc)
         return rc;
@@ -260 +260 @@
 
     /* sanity checks. */
-    if (    s.Hdr32.sizeofcmds > kLdrRdrSize(pRdr) - sizeof(mach_header_32_t)
+    if (    s.Hdr32.sizeofcmds > kRdrSize(pRdr) - sizeof(mach_header_32_t)
         ||  s.Hdr32.sizeofcmds < sizeof(load_command_t) * s.Hdr32.ncmds
         ||  (s.Hdr32.flags & ~MH_VALID_FLAGS))
@@ -281 +281 @@
     if (!pbLoadCommands)
         return KLDR_ERR_NO_MEMORY;
-    rc = kLdrRdrRead(pRdr, pbLoadCommands, s.Hdr32.sizeofcmds,
+    rc = kRdrRead(pRdr, pbLoadCommands, s.Hdr32.sizeofcmds,
                         s.Hdr32.magic == IMAGE_MACHO32_SIGNATURE
                      || s.Hdr32.magic == IMAGE_MACHO32_SIGNATURE_OE
@@ -297 +297 @@
      * Calc the instance size, allocate and initialize it.
      */
-    cchFilename = kHlpStrLen(kLdrRdrName(pRdr));
+    cchFilename = kHlpStrLen(kRdrName(pRdr));
     cb = K_ALIGN_Z(  K_OFFSETOF(KLDRMODMACHO, aSegments[cSegments])
                       + sizeof(KLDRMODMACHOSECT) * cSections, 16)
@@ -318 +318 @@
     pMod->cchFilename = cchFilename;
     pMod->pszFilename = (char *)&pMod->aSegments[pMod->cSegments];
-    kHlpMemCopy((char *)pMod->pszFilename, kLdrRdrName(pRdr), cchFilename + 1);
+    kHlpMemCopy((char *)pMod->pszFilename, kRdrName(pRdr), cchFilename + 1);
     pMod->pszName = kHlpGetFilename(pMod->pszFilename);
     pMod->cchName = cchFilename - (pMod->pszName - pMod->pszFilename);
@@ -429 +429 @@
  * @param   pcbStringPool   Where to store the string pool size.
  */
-static int  kldrModMachOPreParseLoadCommands(KU8 *pbLoadCommands, const mach_header_32_t *pHdr, PKLDRRDR pRdr,
+static int  kldrModMachOPreParseLoadCommands(KU8 *pbLoadCommands, const mach_header_32_t *pHdr, PKRDR pRdr,
                                              KU32 *pcSegments, KU32 *pcSections, KU32 *pcbStringPool)
 {
@@ -442 +442 @@
         uuid_command_t       *pUuid;
     } u;
-    const KU64 cbFile = kLdrRdrSize(pRdr);
+    const KU64 cbFile = kRdrSize(pRdr);
     KU32 cSegments = 0;
     KU32 cSections = 0;
@@ -670 +670 @@
                       : sizeof(macho_nlist_64_t);
                 if (    u.pSymTab->symoff >= cbFile
-                    ||  (KU64)u.pSymTab->symoff + u.pSymTab->nsyms * cbSym > kLdrRdrSize(pRdr))
+                    ||  (KU64)u.pSymTab->symoff + u.pSymTab->nsyms * cbSym > kRdrSize(pRdr))
                     return KLDR_ERR_MACHO_BAD_LOAD_COMMAND;
                 if (    u.pSymTab->stroff >= cbFile
@@ -1008 +1008 @@
     if (pMod->pRdr)
     {
-        rc = kLdrRdrClose(pMod->pRdr);
+        rc = kRdrClose(pMod->pRdr);
         pMod->pRdr = NULL;
     }
@@ -1572 +1572 @@
     else
     {
-        rc = kLdrRdrMap(pMod->pRdr, &pvBase, pMod->cSegments, pMod->aSegments, fFixed);
+        rc = kRdrMap(pMod->pRdr, &pvBase, pMod->cSegments, pMod->aSegments, fFixed);
         if (rc)
             return rc;
@@ -1611 +1611 @@
     else
     {
-        rc = kLdrRdrUnmap(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments);
+        rc = kRdrUnmap(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments);
         if (rc)
             return rc;
@@ -1659 +1659 @@
 
     /* the file provider does it all */
-    return kLdrRdrRefresh(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments);
+    return kRdrRefresh(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments);
 }
 
@@ -1682 +1682 @@
     else
     {
-        rc = kLdrRdrProtect(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments, 1 /* unprotect */);
+        rc = kRdrProtect(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments, 1 /* unprotect */);
         if (rc)
             return rc;
@@ -1699 +1699 @@
         rc2 = KLDR_ERR_TODO; /* deal with this if it ever occurs. */
     else
-        rc2 = kLdrRdrProtect(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments, 0 /* protect */);
+        rc2 = kRdrProtect(pMod->pRdr, pModMachO->pvMapping, pMod->cSegments, pMod->aSegments, 0 /* protect */);
     if (!rc && rc2)
         rc = rc2;
@@ -2151 +2151 @@
             {
                 /* read */
-                rc = kLdrRdrRead(pModMachO->pMod->pRdr, pvSyms, cbSyms, pModMachO->offSymbols);
+                rc = kRdrRead(pModMachO->pMod->pRdr, pvSyms, cbSyms, pModMachO->offSymbols);
                 if (!rc && pModMachO->cchStrings)
-                    rc = kLdrRdrRead(pModMachO->pMod->pRdr, pvStrings, pModMachO->cchStrings, pModMachO->offStrings);
+                    rc = kRdrRead(pModMachO->pMod->pRdr, pvStrings, pModMachO->cchStrings, pModMachO->offStrings);
                 if (!rc)
                 {
@@ -2224 +2224 @@
 
     /* read the fixups. */
-    rc = kLdrRdrRead(pModMachO->pMod->pRdr, paFixups, cbFixups, offFixups);
+    rc = kRdrRead(pModMachO->pMod->pRdr, paFixups, cbFixups, offFixups);
     if (!rc)
     {
@@ -2258 +2258 @@
     int rc = 0;
     if (!pModMachO->pvBits)
-        rc = kLdrRdrAllMap(pModMachO->pMod->pRdr, &pModMachO->pvBits);
+        rc = kRdrAllMap(pModMachO->pMod->pRdr, &pModMachO->pvBits);
     return rc;
 }
@@ -2323 +2323 @@
                 ||  !pMod->aSegments[i].Alignment)
                 continue;
-            rc = kLdrRdrRead(pMod->pRdr,
+            rc = kRdrRead(pMod->pRdr,
                              (KU8 *)pvBits + (pMod->aSegments[i].LinkAddress - pModMachO->LinkAddress),
                              pMod->aSegments[i].cbFile,