Changeset 60 for trunk/kLdr/kLdrModMachO.c

Timestamp:

Oct 13, 2013, 12:59:38 AM (12 years ago)

Author:

bird

Message:

Mach-O: Set the link address to the address of the first segment we define, simpler that way.

File:

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

trunk/kLdr/kLdrModMachO.c

@@ -651 +651 @@
                         cbStringPool += kHlpStrNLen(&pSrcSeg->segname[0], sizeof(pSrcSeg->segname)) + 1; \
                         cSegments++; \
-                        \
-                        /* Link address lower? */ \
-                        if (*pLinkAddress > pSrcSeg->vmaddr) \
+                        if (cSegments == 1) /* The link address is set by the first segment. */  \
                             *pLinkAddress = pSrcSeg->vmaddr; \
                     } \
@@ -811 +809 @@
                                     cbStringPool += kHlpStrNLen(&pSect->sectname[0], sizeof(pSect->sectname)) + 1; \
                                     cSegments++; \
-                                    \
-                                    /* Link address lower? Very unlikely. */ \
-                                    if (*pLinkAddress > pSect->addr) \
+                                    if (cSegments == 1) /* The link address is set by the first segment. */  \
                                         *pLinkAddress = pSect->addr; \
                                 } \
@@ -1153 +1149 @@
                 do { \
                     KBOOL fAddSegOuter = K_FALSE; \
-                    \
-                    kHlpAssert(pSrcSeg->vmaddr >= pModMachO->LinkAddress); \
                     \
                     /* \