Loading...
--- dyld/dyld-635.2/src/ImageLoaderMachOClassic.cpp
+++ dyld/dyld-733.6/src/ImageLoaderMachOClassic.cpp
@@ -43,6 +43,7 @@
#include <sys/sysctl.h>
#include <libkern/OSAtomic.h>
#include <libkern/OSCacheControl.h>
+#include <mach-o/dyld_images.h>
#if __x86_64__
#include <mach-o/x86_64/reloc.h>
@@ -52,7 +53,6 @@
#endif
#include "ImageLoaderMachOClassic.h"
-#include "mach-o/dyld_images.h"
// in dyldStartup.s
extern "C" void stub_binding_helper_i386_old();
@@ -168,11 +168,6 @@
// make sure path is stable before recording in dyld_all_image_infos
image->setMapped(context);
- // pre-fetch content of __DATA segment for faster launches
- // don't do this on prebound images or if prefetching is disabled
- if ( !context.preFetchDisabled && !image->isPrebindable())
- image->preFetchDATA(fd, offsetInFat, context);
-
}
catch (...) {
// ImageLoader::setMapped() can throw an exception to block loading of image
@@ -336,41 +331,6 @@
fDynamicInfo = dynSym;
}
-void ImageLoaderMachOClassic::prefetchLINKEDIT(const LinkContext& context)
-{
- // always prefetch a subrange of __LINKEDIT pages
- uintptr_t symbolTableStart = (uintptr_t)fSymbolTable;
- uintptr_t stringTableStart = (uintptr_t)fStrings;
- uintptr_t start;
- // if image did not load at preferred address
- if ( segPreferredLoadAddress(0) != (uintptr_t)fMachOData ) {
- // local relocations will be processed, so start pre-fetch at local symbols
- start = (uintptr_t)fMachOData + fDynamicInfo->locreloff;
- }
- else {
- // otherwise start pre-fetch at global symbols section of symbol table
- start = symbolTableStart + fDynamicInfo->iextdefsym * sizeof(macho_nlist);
- }
- // prefetch ends at end of last undefined string in string pool
- uintptr_t end = stringTableStart;
- if ( fDynamicInfo->nundefsym != 0 )
- end += fSymbolTable[fDynamicInfo->iundefsym+fDynamicInfo->nundefsym-1].n_un.n_strx;
- else if ( fDynamicInfo->nextdefsym != 0 )
- end += fSymbolTable[fDynamicInfo->iextdefsym+fDynamicInfo->nextdefsym-1].n_un.n_strx;
-
- // round to whole pages
- start = dyld_page_trunc(start);
- end = dyld_page_round(end);
-
- // skip if there is only one page
- if ( (end-start) > dyld_page_size ) {
- madvise((void*)start, end-start, MADV_WILLNEED);
- fgTotalBytesPreFetched += (end-start);
- if ( context.verboseMapping ) {
- dyld::log("%18s prefetching 0x%0lX -> 0x%0lX\n", "__LINKEDIT", start, end-1);
- }
- }
-}
#if SPLIT_SEG_DYLIB_SUPPORT
@@ -767,11 +727,7 @@
{
CRSetCrashLogMessage2(this->getPath());
const uintptr_t relocBase = this->getRelocBase();
-
- // prefetch any LINKEDIT pages needed
- if ( !context.preFetchDisabled && !this->isPrebindable())
- this->prefetchLINKEDIT(context);
-
+
// loop through all local (internal) relocation records
const relocation_info* const relocsStart = (struct relocation_info*)(&fLinkEditBase[fDynamicInfo->locreloff]);
const relocation_info* const relocsEnd = &relocsStart[fDynamicInfo->nlocrel];
@@ -1278,7 +1234,7 @@
lastUndefinedSymbol = undefinedSymbol;
symbolAddrCached = false;
}
- if ( context.verboseBind ) {
+ if ( context.verboseBind && (undefinedSymbol != NULL) ) {
const char *path = NULL;
if ( image != NULL ) {
path = image->getShortName();
@@ -1672,6 +1628,7 @@
if ( ((sect->flags & S_ATTR_SELF_MODIFYING_CODE) ==0) || (sect->reserved2 != 5) )
continue;
elementSize = 5;
+ [[clang::fallthrough]];
#endif
case S_NON_LAZY_SYMBOL_POINTERS:
case S_LAZY_SYMBOL_POINTERS:
@@ -1805,7 +1762,7 @@
}
uintptr_t symbolAddr = resolveUndefined(context, sym, twoLevel, dontCoalesce, false, &image);
// update pointer
- symbolAddr = this->bindIndirectSymbol((uintptr_t*)ptrToBind, sect, &fStrings[sym->n_un.n_strx], symbolAddr, image, context);
+ this->bindIndirectSymbol((uintptr_t*)ptrToBind, sect, &fStrings[sym->n_un.n_strx], symbolAddr, image, context);
// update stats
++fgTotalBindFixups;
}