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

Timestamp:

Aug 31, 2007, 4:16:27 AM (18 years ago)

Author:

bird

Message:

Dropped kLdrBase.h

File:

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

trunk/kStuff/kLdr/kLdrModMachO.c

@@ -299 +299 @@
      */
     cchFilename = kLdrHlpStrLen(kLdrRdrName(pRdr));
-    cb = KLDR_ALIGN_Z(  KLDR_OFFSETOF(KLDRMODMACHO, aSegments[cSegments])
+    cb = K_ALIGN_Z(  K_OFFSETOF(KLDRMODMACHO, aSegments[cSegments])
                       + sizeof(KLDRMODMACHOSECT) * cSections, 16)
-       + KLDR_OFFSETOF(KLDRMOD, aSegments[cSegments])
+       + K_OFFSETOF(KLDRMOD, aSegments[cSegments])
        + cchFilename + 1
        + cbStringPool;
@@ -311 +311 @@
 
     /* KLDRMOD */
-    pMod = (PKLDRMOD)((KU8 *)pModMachO + KLDR_ALIGN_Z(  KLDR_OFFSETOF(KLDRMODMACHO, aSegments[cSegments])
+    pMod = (PKLDRMOD)((KU8 *)pModMachO + K_ALIGN_Z(  K_OFFSETOF(KLDRMODMACHO, aSegments[cSegments])
                                                       + sizeof(KLDRMODMACHOSECT) * cSections, 16));
     pMod->pvData = pModMachO;
@@ -470 +470 @@
         if (fConvertEndian)
         {
-            u.pLoadCmd->cmd = KLDR_E2E_U32(u.pLoadCmd->cmd);
-            u.pLoadCmd->cmdsize = KLDR_E2E_U32(u.pLoadCmd->cmdsize);
+            u.pLoadCmd->cmd = K_E2E_U32(u.pLoadCmd->cmd);
+            u.pLoadCmd->cmdsize = K_E2E_U32(u.pLoadCmd->cmdsize);
         }
         if (u.pLoadCmd->cmdsize > cbLeft)
@@ -497 +497 @@
                 if (fConvertEndian)
                 {
-                    u.pSeg32->vmaddr   = KLDR_E2E_U32(u.pSeg32->vmaddr);
-                    u.pSeg32->vmsize   = KLDR_E2E_U32(u.pSeg32->vmsize);
-                    u.pSeg32->fileoff  = KLDR_E2E_U32(u.pSeg32->fileoff);
-                    u.pSeg32->filesize = KLDR_E2E_U32(u.pSeg32->filesize);
-                    u.pSeg32->maxprot  = KLDR_E2E_U32(u.pSeg32->maxprot);
-                    u.pSeg32->initprot = KLDR_E2E_U32(u.pSeg32->initprot);
-                    u.pSeg32->nsects   = KLDR_E2E_U32(u.pSeg32->nsects);
-                    u.pSeg32->flags    = KLDR_E2E_U32(u.pSeg32->flags);
+                    u.pSeg32->vmaddr   = K_E2E_U32(u.pSeg32->vmaddr);
+                    u.pSeg32->vmsize   = K_E2E_U32(u.pSeg32->vmsize);
+                    u.pSeg32->fileoff  = K_E2E_U32(u.pSeg32->fileoff);
+                    u.pSeg32->filesize = K_E2E_U32(u.pSeg32->filesize);
+                    u.pSeg32->maxprot  = K_E2E_U32(u.pSeg32->maxprot);
+                    u.pSeg32->initprot = K_E2E_U32(u.pSeg32->initprot);
+                    u.pSeg32->nsects   = K_E2E_U32(u.pSeg32->nsects);
+                    u.pSeg32->flags    = K_E2E_U32(u.pSeg32->flags);
                 }
 
@@ -537 +537 @@
                     if (fConvertEndian)
                     {
-                        pSect->addr      = KLDR_E2E_U32(pSect->addr);
-                        pSect->size      = KLDR_E2E_U32(pSect->size);
-                        pSect->offset    = KLDR_E2E_U32(pSect->offset);
-                        pSect->align     = KLDR_E2E_U32(pSect->align);
-                        pSect->reloff    = KLDR_E2E_U32(pSect->reloff);
-                        pSect->nreloc    = KLDR_E2E_U32(pSect->nreloc);
-                        pSect->flags     = KLDR_E2E_U32(pSect->flags);
-                        pSect->reserved1 = KLDR_E2E_U32(pSect->reserved1);
-                        pSect->reserved2 = KLDR_E2E_U32(pSect->reserved2);
+                        pSect->addr      = K_E2E_U32(pSect->addr);
+                        pSect->size      = K_E2E_U32(pSect->size);
+                        pSect->offset    = K_E2E_U32(pSect->offset);
+                        pSect->align     = K_E2E_U32(pSect->align);
+                        pSect->reloff    = K_E2E_U32(pSect->reloff);
+                        pSect->nreloc    = K_E2E_U32(pSect->nreloc);
+                        pSect->flags     = K_E2E_U32(pSect->flags);
+                        pSect->reserved1 = K_E2E_U32(pSect->reserved1);
+                        pSect->reserved2 = K_E2E_U32(pSect->reserved2);
                     }
 
@@ -659 +659 @@
                 if (fConvertEndian)
                 {
-                    u.pSymTab->symoff  = KLDR_E2E_U32(u.pSymTab->symoff);
-                    u.pSymTab->nsyms   = KLDR_E2E_U32(u.pSymTab->nsyms);
-                    u.pSymTab->stroff  = KLDR_E2E_U32(u.pSymTab->stroff);
-                    u.pSymTab->strsize = KLDR_E2E_U32(u.pSymTab->strsize);
+                    u.pSymTab->symoff  = K_E2E_U32(u.pSymTab->symoff);
+                    u.pSymTab->nsyms   = K_E2E_U32(u.pSymTab->nsyms);
+                    u.pSymTab->stroff  = K_E2E_U32(u.pSymTab->stroff);
+                    u.pSymTab->strsize = K_E2E_U32(u.pSymTab->strsize);
                 }
 
@@ -701 +701 @@
                     if (fConvertEndian)
                     {
-                        pu32[0] = KLDR_E2E_U32(pu32[0]);
-                        pu32[1] = KLDR_E2E_U32(pu32[1]);
+                        pu32[0] = K_E2E_U32(pu32[0]);
+                        pu32[1] = K_E2E_U32(pu32[1]);
                     }
                     if (pu32[1] + 2 > cItemsLeft)
@@ -2167 +2167 @@
                         while (cLeft-- > 0)
                         {
-                            pSym->n_un.n_strx = KLDR_E2E_U32(pSym->n_un.n_strx);
-                            pSym->n_desc = (KI16)KLDR_E2E_U16(pSym->n_desc);
-                            pSym->n_value = KLDR_E2E_U32(pSym->n_value);
+                            pSym->n_un.n_strx = K_E2E_U32(pSym->n_un.n_strx);
+                            pSym->n_desc = (KI16)K_E2E_U16(pSym->n_desc);
+                            pSym->n_value = K_E2E_U32(pSym->n_value);
                             pSym++;
                         }
@@ -2179 +2179 @@
                         while (cLeft-- > 0)
                         {
-                            pSym->n_un.n_strx = KLDR_E2E_U32(pSym->n_un.n_strx);
-                            pSym->n_desc = (KI16)KLDR_E2E_U16(pSym->n_desc);
-                            pSym->n_value = KLDR_E2E_U64(pSym->n_value);
+                            pSym->n_un.n_strx = K_E2E_U32(pSym->n_un.n_strx);
+                            pSym->n_desc = (KI16)K_E2E_U16(pSym->n_desc);
+                            pSym->n_value = K_E2E_U64(pSym->n_value);
                             pSym++;
                         }
@@ -2238 +2238 @@
             {
                 KU32 *pu32 = (KU32 *)&paFixups[iFixup];
-                pu32[0] = KLDR_E2E_U32(pu32[0]);
-                pu32[1] = KLDR_E2E_U32(pu32[1]);
+                pu32[0] = K_E2E_U32(pu32[0]);
+                pu32[1] = K_E2E_U32(pu32[1]);
             }
         }