Changeset 3525 for trunk/kLdr/kLdrModMachO.c

Timestamp:

Aug 20, 2007, 12:14:55 AM (18 years ago)

Author:

bird

Message:

made the format headers usable externally.

File:

• trunk/kLdr/kLdrModMachO.c (modified) (8 diffs)

trunk/kLdr/kLdrModMachO.c

@@ -470 +470 @@
         if (fConvertEndian)
         {
-            u.pLoadCmd->cmd = KLDRHLP_E2E_U32(u.pLoadCmd->cmd);
-            u.pLoadCmd->cmdsize = KLDRHLP_E2E_U32(u.pLoadCmd->cmdsize);
+            u.pLoadCmd->cmd = KLDR_E2E_U32(u.pLoadCmd->cmd);
+            u.pLoadCmd->cmdsize = KLDR_E2E_U32(u.pLoadCmd->cmdsize);
         }
         if (u.pLoadCmd->cmdsize > cbLeft)
@@ -497 +497 @@
                 if (fConvertEndian)
                 {
-                    u.pSeg32->vmaddr   = KLDRHLP_E2E_U32(u.pSeg32->vmaddr);
-                    u.pSeg32->vmsize   = KLDRHLP_E2E_U32(u.pSeg32->vmsize);
-                    u.pSeg32->fileoff  = KLDRHLP_E2E_U32(u.pSeg32->fileoff);
-                    u.pSeg32->filesize = KLDRHLP_E2E_U32(u.pSeg32->filesize);
-                    u.pSeg32->maxprot  = KLDRHLP_E2E_U32(u.pSeg32->maxprot);
-                    u.pSeg32->initprot = KLDRHLP_E2E_U32(u.pSeg32->initprot);
-                    u.pSeg32->nsects   = KLDRHLP_E2E_U32(u.pSeg32->nsects);
-                    u.pSeg32->flags    = KLDRHLP_E2E_U32(u.pSeg32->flags);
+                    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);
                 }
 
@@ -537 +537 @@
                     if (fConvertEndian)
                     {
-                        pSect->addr      = KLDRHLP_E2E_U32(pSect->addr);
-                        pSect->size      = KLDRHLP_E2E_U32(pSect->size);
-                        pSect->offset    = KLDRHLP_E2E_U32(pSect->offset);
-                        pSect->align     = KLDRHLP_E2E_U32(pSect->align);
-                        pSect->reloff    = KLDRHLP_E2E_U32(pSect->reloff);
-                        pSect->nreloc    = KLDRHLP_E2E_U32(pSect->nreloc);
-                        pSect->flags     = KLDRHLP_E2E_U32(pSect->flags);
-                        pSect->reserved1 = KLDRHLP_E2E_U32(pSect->reserved1);
-                        pSect->reserved2 = KLDRHLP_E2E_U32(pSect->reserved2);
+                        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);
                     }
 
@@ -659 +659 @@
                 if (fConvertEndian)
                 {
-                    u.pSymTab->symoff  = KLDRHLP_E2E_U32(u.pSymTab->symoff);
-                    u.pSymTab->nsyms   = KLDRHLP_E2E_U32(u.pSymTab->nsyms);
-                    u.pSymTab->stroff  = KLDRHLP_E2E_U32(u.pSymTab->stroff);
-                    u.pSymTab->strsize = KLDRHLP_E2E_U32(u.pSymTab->strsize);
+                    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);
                 }
 
@@ -701 +701 @@
                     if (fConvertEndian)
                     {
-                        pu32[0] = KLDRHLP_E2E_U32(pu32[0]);
-                        pu32[1] = KLDRHLP_E2E_U32(pu32[1]);
+                        pu32[0] = KLDR_E2E_U32(pu32[0]);
+                        pu32[1] = KLDR_E2E_U32(pu32[1]);
                     }
                     if (pu32[1] + 2 > cItemsLeft)
@@ -2167 +2167 @@
                         while (cLeft-- > 0)
                         {
-                            pSym->n_un.n_strx = KLDRHLP_E2E_U32(pSym->n_un.n_strx);
-                            pSym->n_desc = (int16_t)KLDRHLP_E2E_U16(pSym->n_desc);
-                            pSym->n_value = KLDRHLP_E2E_U32(pSym->n_value);
+                            pSym->n_un.n_strx = KLDR_E2E_U32(pSym->n_un.n_strx);
+                            pSym->n_desc = (int16_t)KLDR_E2E_U16(pSym->n_desc);
+                            pSym->n_value = KLDR_E2E_U32(pSym->n_value);
                             pSym++;
                         }
@@ -2179 +2179 @@
                         while (cLeft-- > 0)
                         {
-                            pSym->n_un.n_strx = KLDRHLP_E2E_U32(pSym->n_un.n_strx);
-                            pSym->n_desc = (int16_t)KLDRHLP_E2E_U16(pSym->n_desc);
-                            pSym->n_value = KLDRHLP_E2E_U64(pSym->n_value);
+                            pSym->n_un.n_strx = KLDR_E2E_U32(pSym->n_un.n_strx);
+                            pSym->n_desc = (int16_t)KLDR_E2E_U16(pSym->n_desc);
+                            pSym->n_value = KLDR_E2E_U64(pSym->n_value);
                             pSym++;
                         }
@@ -2238 +2238 @@
             {
                 uint32_t *pu32 = (uint32_t *)&paFixups[iFixup];
-                pu32[0] = KLDRHLP_E2E_U32(pu32[0]);
-                pu32[1] = KLDRHLP_E2E_U32(pu32[1]);
+                pu32[0] = KLDR_E2E_U32(pu32[0]);
+                pu32[1] = KLDR_E2E_U32(pu32[1]);
             }
         }