Loading...
--- dyld/dyld-851.27/src/ImageLoaderMachOCompressed.cpp
+++ dyld/dyld-421.2/src/ImageLoaderMachOCompressed.cpp
@@ -38,15 +38,11 @@
#include <mach/mach.h>
#include <mach/thread_status.h>
#include <mach-o/loader.h>
-#include <mach-o/dyld_images.h>
-
-#include "dyld2.h"
#include "ImageLoaderMachOCompressed.h"
-#include "Closure.h"
-#include "Array.h"
-
-#ifndef BIND_SUBOPCODE_THREADED_SET_JOP
- #define BIND_SUBOPCODE_THREADED_SET_JOP 0x0F
+#include "mach-o/dyld_images.h"
+
+#ifndef EXPORT_SYMBOL_FLAGS_KIND_ABSOLUTE
+ #define EXPORT_SYMBOL_FLAGS_KIND_ABSOLUTE 0x02
#endif
// relocation_info.r_length field has value 3 for 64-bit executables and value 2 for 32-bit executables
@@ -67,7 +63,6 @@
#endif
-
// create image for main executable
ImageLoaderMachOCompressed* ImageLoaderMachOCompressed::instantiateMainExecutable(const macho_header* mh, uintptr_t slide, const char* path,
unsigned int segCount, unsigned int libCount, const LinkContext& context)
@@ -135,7 +130,7 @@
const char* installName = image->getInstallPath();
if ( (installName != NULL) && (strcmp(installName, path) == 0) && (path[0] == '/') )
image->setPathUnowned(installName);
-#if TARGET_OS_OSX
+#if __MAC_OS_X_VERSION_MIN_REQUIRED
// <rdar://problem/6563887> app crashes when libSystem cannot be found
else if ( (installName != NULL) && (strcmp(path, "/usr/lib/libgcc_s.1.dylib") == 0) && (strcmp(installName, "/usr/lib/libSystem.B.dylib") == 0) )
image->setPathUnowned("/usr/lib/libSystem.B.dylib");
@@ -149,23 +144,18 @@
else
image->setPath(path);
}
- else {
- // <rdar://problem/46682306> always try to realpath dylibs since they may have been dlopen()ed using a symlink path
- if ( installName != NULL ) {
- char realPath[MAXPATHLEN];
- if ( (fcntl(fd, F_GETPATH, realPath) == 0) && (strcmp(path, realPath) != 0) )
- image->setPaths(path, realPath);
- else
- image->setPath(path);
- }
- else {
- image->setPath(path);
- }
- }
+ else
+ image->setPath(path);
// make sure path is stable before recording in dyld_all_image_infos
image->setMapped(context);
+ // pre-fetch content of __DATA and __LINKEDIT 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);
+ image->markSequentialLINKEDIT(context);
+ }
}
catch (...) {
// ImageLoader::setMapped() can throw an exception to block loading of image
@@ -202,15 +192,6 @@
}
image->instantiateFinish(context);
-
-#if TARGET_OS_SIMULATOR
- char realPath[MAXPATHLEN] = { 0 };
- if ( dyld::gLinkContext.rootPaths == NULL )
- throw "root path is not set";
- strlcpy(realPath, dyld::gLinkContext.rootPaths[0], MAXPATHLEN);
- strlcat(realPath, path, MAXPATHLEN);
- image->setPaths(path, realPath);
-#endif
image->setMapped(context);
}
catch (...) {
@@ -261,7 +242,7 @@
ImageLoaderMachOCompressed::ImageLoaderMachOCompressed(const macho_header* mh, const char* path, unsigned int segCount,
uint32_t segOffsets[], unsigned int libCount)
- : ImageLoaderMachO(mh, path, segCount, segOffsets, libCount), fDyldInfo(NULL), fChainedFixups(NULL), fExportsTrie(NULL)
+ : ImageLoaderMachO(mh, path, segCount, segOffsets, libCount), fDyldInfo(NULL)
{
}
@@ -317,7 +298,7 @@
bool ImageLoaderMachOCompressed::libIsUpward(unsigned int libIndex) const
{
const uintptr_t* images = ((uintptr_t*)(((uint8_t*)this) + sizeof(ImageLoaderMachOCompressed) + fSegmentsCount*sizeof(uint32_t)));
- // upward flag is second bit
+ // re-export flag is second bit
return ((images[libIndex] & 2) != 0);
}
@@ -332,6 +313,59 @@
value |= 2;
images[libIndex] = value;
}
+
+
+void ImageLoaderMachOCompressed::markFreeLINKEDIT(const LinkContext& context)
+{
+ // mark that we are done with rebase and bind info
+ markLINKEDIT(context, MADV_FREE);
+}
+
+void ImageLoaderMachOCompressed::markSequentialLINKEDIT(const LinkContext& context)
+{
+ // mark the rebase and bind info and using sequential access
+ markLINKEDIT(context, MADV_SEQUENTIAL);
+}
+
+void ImageLoaderMachOCompressed::markLINKEDIT(const LinkContext& context, int advise)
+{
+ // if not loaded at preferred address, mark rebase info
+ uintptr_t start = 0;
+ if ( (fSlide != 0) && (fDyldInfo->rebase_size != 0) )
+ start = (uintptr_t)fLinkEditBase + fDyldInfo->rebase_off;
+ else if ( fDyldInfo->bind_off != 0 )
+ start = (uintptr_t)fLinkEditBase + fDyldInfo->bind_off;
+ else
+ return; // no binding info to prefetch
+
+ // end is at end of bind info
+ uintptr_t end = 0;
+ if ( fDyldInfo->bind_off != 0 )
+ end = (uintptr_t)fLinkEditBase + fDyldInfo->bind_off + fDyldInfo->bind_size;
+ else if ( fDyldInfo->rebase_off != 0 )
+ end = (uintptr_t)fLinkEditBase + fDyldInfo->rebase_off + fDyldInfo->rebase_size;
+ else
+ return;
+
+
+ // round to whole pages
+ start = dyld_page_trunc(start);
+ end = dyld_page_round(end);
+
+ // do nothing if only one page of rebase/bind info
+ if ( (end-start) <= dyld_page_size )
+ return;
+
+ // tell kernel about our access to these pages
+ madvise((void*)start, end-start, advise);
+ if ( context.verboseMapping ) {
+ const char* adstr = "sequential";
+ if ( advise == MADV_FREE )
+ adstr = "free";
+ dyld::log("%18s %s 0x%0lX -> 0x%0lX for %s\n", "__LINKEDIT", adstr, start, end-1, this->getPath());
+ }
+}
+
void ImageLoaderMachOCompressed::rebaseAt(const LinkContext& context, uintptr_t addr, uintptr_t slide, uint8_t type)
@@ -363,21 +397,10 @@
void ImageLoaderMachOCompressed::rebase(const LinkContext& context, uintptr_t slide)
{
- // binary uses chained fixups where are applied during binding
- if ( fDyldInfo == NULL )
- return;
-
CRSetCrashLogMessage2(this->getPath());
const uint8_t* const start = fLinkEditBase + fDyldInfo->rebase_off;
const uint8_t* const end = &start[fDyldInfo->rebase_size];
const uint8_t* p = start;
-
- if ( start == end )
- return;
-
- uint32_t ignore;
- bool bindingBecauseOfRoot = this->overridesCachedDylib(ignore);
- vmAccountingSetSuspended(context, bindingBecauseOfRoot);
try {
uint8_t type = 0;
@@ -459,7 +482,7 @@
fgTotalRebaseFixups += count;
break;
default:
- dyld::throwf("bad rebase opcode %d", *(p-1));
+ dyld::throwf("bad rebase opcode %d", *p);
}
}
}
@@ -474,16 +497,14 @@
const ImageLoader::Symbol* ImageLoaderMachOCompressed::findShallowExportedSymbol(const char* symbol, const ImageLoader** foundIn) const
{
//dyld::log("Compressed::findExportedSymbol(%s) in %s\n", symbol, this->getShortName());
- uint32_t trieFileOffset = fDyldInfo ? fDyldInfo->export_off : fExportsTrie->dataoff;
- uint32_t trieFileSize = fDyldInfo ? fDyldInfo->export_size : fExportsTrie->datasize;
- if ( trieFileSize == 0 )
+ if ( fDyldInfo->export_size == 0 )
return NULL;
#if LOG_BINDINGS
dyld::logBindings("%s: %s\n", this->getShortName(), symbol);
#endif
++ImageLoaderMachO::fgSymbolTrieSearchs;
- const uint8_t* start = &fLinkEditBase[trieFileOffset];
- const uint8_t* end = &start[trieFileSize];
+ const uint8_t* start = &fLinkEditBase[fDyldInfo->export_off];
+ const uint8_t* end = &start[fDyldInfo->export_size];
const uint8_t* foundNodeStart = this->trieWalk(start, end, symbol);
if ( foundNodeStart != NULL ) {
const uint8_t* p = foundNodeStart;
@@ -497,9 +518,6 @@
importedName = symbol;
if ( (ordinal > 0) && (ordinal <= libraryCount()) ) {
const ImageLoader* reexportedFrom = libImage((unsigned int)ordinal-1);
- // Missing weak-dylib
- if ( reexportedFrom == NULL )
- return NULL;
//dyld::log("Compressed::findExportedSymbol(), %s -> %s/%s\n", symbol, reexportedFrom->getShortName(), importedName);
const char* reExportLibPath = libPath((unsigned int)ordinal-1);
return reexportedFrom->findExportedSymbol(importedName, true, reExportLibPath, foundIn);
@@ -523,21 +541,17 @@
bool ImageLoaderMachOCompressed::containsSymbol(const void* addr) const
{
- uint32_t trieFileOffset = fDyldInfo ? fDyldInfo->export_off : fExportsTrie->dataoff;
- uint32_t trieFileSize = fDyldInfo ? fDyldInfo->export_size : fExportsTrie->datasize;
- const uint8_t* start = &fLinkEditBase[trieFileOffset];
- const uint8_t* end = &start[trieFileSize];
+ const uint8_t* start = &fLinkEditBase[fDyldInfo->export_off];
+ const uint8_t* end = &start[fDyldInfo->export_size];
return ( (start <= addr) && (addr < end) );
}
uintptr_t ImageLoaderMachOCompressed::exportedSymbolAddress(const LinkContext& context, const Symbol* symbol, const ImageLoader* requestor, bool runResolver) const
{
- uint32_t trieFileOffset = fDyldInfo ? fDyldInfo->export_off : fExportsTrie->dataoff;
- uint32_t trieFileSize = fDyldInfo ? fDyldInfo->export_size : fExportsTrie->datasize;
const uint8_t* exportNode = (uint8_t*)symbol;
- const uint8_t* exportTrieStart = fLinkEditBase + trieFileOffset;
- const uint8_t* exportTrieEnd = exportTrieStart + trieFileSize;
+ const uint8_t* exportTrieStart = fLinkEditBase + fDyldInfo->export_off;
+ const uint8_t* exportTrieEnd = exportTrieStart + fDyldInfo->export_size;
if ( (exportNode < exportTrieStart) || (exportNode > exportTrieEnd) )
throw "symbol is not in trie";
//dyld::log("exportedSymbolAddress(): node=%p, nodeOffset=0x%04X in %s\n", symbol, (int)((uint8_t*)symbol - exportTrieStart), this->getShortName());
@@ -554,15 +568,9 @@
// stub was not interposed, so run resolver
typedef uintptr_t (*ResolverProc)(void);
ResolverProc resolver = (ResolverProc)(read_uleb128(exportNode, exportTrieEnd) + (uintptr_t)fMachOData);
-#if __has_feature(ptrauth_calls)
- resolver = (ResolverProc)__builtin_ptrauth_sign_unauthenticated(resolver, ptrauth_key_asia, 0);
-#endif
uintptr_t result = (*resolver)();
if ( context.verboseBind )
dyld::log("dyld: resolver at %p returned 0x%08lX\n", resolver, result);
-#if __has_feature(ptrauth_calls)
- result = (uintptr_t)__builtin_ptrauth_strip((void*)result, ptrauth_key_asia);
-#endif
return result;
}
return read_uleb128(exportNode, exportTrieEnd) + (uintptr_t)fMachOData;
@@ -581,11 +589,9 @@
bool ImageLoaderMachOCompressed::exportedSymbolIsWeakDefintion(const Symbol* symbol) const
{
- uint32_t trieFileOffset = fDyldInfo ? fDyldInfo->export_off : fExportsTrie->dataoff;
- uint32_t trieFileSize = fDyldInfo ? fDyldInfo->export_size : fExportsTrie->datasize;
const uint8_t* exportNode = (uint8_t*)symbol;
- const uint8_t* exportTrieStart = fLinkEditBase + trieFileOffset;
- const uint8_t* exportTrieEnd = exportTrieStart + trieFileSize;
+ const uint8_t* exportTrieStart = fLinkEditBase + fDyldInfo->export_off;
+ const uint8_t* exportTrieEnd = exportTrieStart + fDyldInfo->export_size;
if ( (exportNode < exportTrieStart) || (exportNode > exportTrieEnd) )
throw "symbol is not in trie";
uintptr_t flags = read_uleb128(exportNode, exportTrieEnd);
@@ -646,104 +652,6 @@
return 0;
}
throwSymbolNotFound(context, symbolName, this->getPath(), "", "flat namespace");
-}
-
-
-static void patchCacheUsesOf(const ImageLoader::LinkContext& context, const dyld3::closure::Image* overriddenImage,
- uint32_t cacheOffsetOfImpl, const char* symbolName, uintptr_t newImpl,
- DyldSharedCache::DataConstLazyScopedWriter& patcher)
-{
- patcher.makeWriteable();
-
- uintptr_t cacheStart = (uintptr_t)context.dyldCache;
- uint32_t imageIndex = overriddenImage->imageNum() - (uint32_t)context.dyldCache->cachedDylibsImageArray()->startImageNum();
- context.dyldCache->forEachPatchableUseOfExport(imageIndex, cacheOffsetOfImpl, ^(dyld_cache_patchable_location patchLocation) {
- uintptr_t* loc = (uintptr_t*)(cacheStart+patchLocation.cacheOffset);
-#if __has_feature(ptrauth_calls)
- if ( patchLocation.authenticated ) {
- dyld3::MachOLoaded::ChainedFixupPointerOnDisk fixupInfo;
- fixupInfo.arm64e.authRebase.auth = true;
- fixupInfo.arm64e.authRebase.addrDiv = patchLocation.usesAddressDiversity;
- fixupInfo.arm64e.authRebase.diversity = patchLocation.discriminator;
- fixupInfo.arm64e.authRebase.key = patchLocation.key;
- uintptr_t newValue = fixupInfo.arm64e.signPointer(loc, newImpl + DyldSharedCache::getAddend(patchLocation));
- if ( *loc != newValue ) {
- *loc = newValue;
- if ( context.verboseBind )
- dyld::log("dyld: cache fixup: *%p = %p (JOP: diversity 0x%04X, addr-div=%d, key=%s) to %s\n",
- loc, (void*)newValue, patchLocation.discriminator, patchLocation.usesAddressDiversity, DyldSharedCache::keyName(patchLocation), symbolName);
- }
- return;
- }
-#endif
- uintptr_t newValue = newImpl + (uintptr_t)DyldSharedCache::getAddend(patchLocation);
- if ( *loc != newValue ) {
- *loc = newValue;
- if ( context.verboseBind )
- dyld::log("dyld: cache fixup: *%p = %p to %s\n", loc, (void*)newValue, symbolName);
- }
- });
-}
-
-
-
-uintptr_t ImageLoaderMachOCompressed::resolveWeak(const LinkContext& context, const char* symbolName, bool weak_import,
- bool runResolver, const ImageLoader** foundIn,
- DyldSharedCache::DataConstLazyScopedWriter& patcher)
-{
- const Symbol* sym;
- CoalesceNotifier notifier = nullptr;
- __block uintptr_t foundOutsideCache = 0;
- __block const char* foundOutsideCachePath = nullptr;
- __block uintptr_t lastFoundInCache = 0;
-
- if ( this->usesChainedFixups() ) {
- notifier = ^(const Symbol* implSym, const ImageLoader* implIn, const mach_header* implMh) {
- // This block is only called in dyld2 mode when a non-cached image is search for which weak-def implementation to use
- // As a side effect of that search we notice any implementations outside and inside the cache,
- // and use that to trigger patching the cache to use the implementation outside the cache.
- uintptr_t implAddr = implIn->getExportedSymbolAddress(implSym, context, nullptr, false, symbolName);
- if ( ((dyld3::MachOLoaded*)implMh)->inDyldCache() ) {
- if ( foundOutsideCache != 0 ) {
- // have an implementation in cache and and earlier one not in the cache, patch cache to use earlier one
- lastFoundInCache = implAddr;
- uint32_t imageIndex;
- if ( context.dyldCache->findMachHeaderImageIndex(implMh, imageIndex) ) {
- const dyld3::closure::Image* overriddenImage = context.dyldCache->cachedDylibsImageArray()->imageForNum(imageIndex+1);
- uint32_t cacheOffsetOfImpl = (uint32_t)((uintptr_t)implAddr - (uintptr_t)context.dyldCache);
- if ( context.verboseWeakBind )
- dyld::log("dyld: weak bind, patching dyld cache uses of %s to use 0x%lX in %s\n", symbolName, foundOutsideCache, foundOutsideCachePath);
- patchCacheUsesOf(context, overriddenImage, cacheOffsetOfImpl, symbolName, foundOutsideCache, patcher);
- }
- }
- }
- else {
- // record first non-cache implementation
- if ( foundOutsideCache == 0 ) {
- foundOutsideCache = implAddr;
- foundOutsideCachePath = implIn->getPath();
- }
- }
- };
- }
-
- if ( context.coalescedExportFinder(symbolName, &sym, foundIn, notifier) ) {
- if ( *foundIn != this )
- context.addDynamicReference(this, const_cast<ImageLoader*>(*foundIn));
- return (*foundIn)->getExportedSymbolAddress(sym, context, this, runResolver);
- }
- // if a bundle is loaded privately the above will not find its exports
- if ( this->isBundle() && this->hasHiddenExports() ) {
- // look in self for needed symbol
- sym = this->findShallowExportedSymbol(symbolName, foundIn);
- if ( sym != NULL )
- return (*foundIn)->getExportedSymbolAddress(sym, context, this, runResolver);
- }
- if ( weak_import ) {
- // definition can't be found anywhere, ok because it is weak, just return 0
- return 0;
- }
- throwSymbolNotFound(context, symbolName, this->getPath(), "", "weak");
}
@@ -770,7 +678,7 @@
extern const mach_header __dso_handle;
uint32_t dyldMinOS = ImageLoaderMachO::minOSVersion(&__dso_handle);
if ( imageMinOS > dyldMinOS ) {
-#if TARGET_OS_OSX
+#if __MAC_OS_X_VERSION_MIN_REQUIRED
const char* msg = dyld::mkstringf(" (which was built for Mac OS X %d.%d)", imageMinOS >> 16, (imageMinOS >> 8) & 0xFF);
#else
const char* msg = dyld::mkstringf(" (which was built for iOS %d.%d)", imageMinOS >> 16, (imageMinOS >> 8) & 0xFF);
@@ -784,7 +692,6 @@
uintptr_t ImageLoaderMachOCompressed::resolve(const LinkContext& context, const char* symbolName,
uint8_t symboFlags, long libraryOrdinal, const ImageLoader** targetImage,
- DyldSharedCache::DataConstLazyScopedWriter& patcher,
LastLookup* last, bool runResolver)
{
*targetImage = NULL;
@@ -804,9 +711,6 @@
if ( context.bindFlat || (libraryOrdinal == BIND_SPECIAL_DYLIB_FLAT_LOOKUP) ) {
symbolAddress = this->resolveFlat(context, symbolName, weak_import, runResolver, targetImage);
}
- else if ( libraryOrdinal == BIND_SPECIAL_DYLIB_WEAK_LOOKUP ) {
- symbolAddress = this->resolveWeak(context, symbolName, weak_import, runResolver, targetImage, patcher);
- }
else {
if ( libraryOrdinal == BIND_SPECIAL_DYLIB_MAIN_EXECUTABLE ) {
*targetImage = context.mainExecutable;
@@ -831,14 +735,8 @@
symbolAddress = 0;
}
else {
- // Try get the path from the load commands
- if ( const char* depPath = libPath((unsigned int)libraryOrdinal-1) ) {
- dyld::throwf("can't resolve symbol %s in %s because dependent dylib %s could not be loaded",
- symbolName, this->getPath(), depPath);
- } else {
- dyld::throwf("can't resolve symbol %s in %s because dependent dylib #%ld could not be loaded",
- symbolName, this->getPath(), libraryOrdinal);
- }
+ dyld::throwf("can't resolve symbol %s in %s because dependent dylib #%ld could not be loaded",
+ symbolName, this->getPath(), libraryOrdinal);
}
}
else {
@@ -858,25 +756,18 @@
return symbolAddress;
}
-uintptr_t ImageLoaderMachOCompressed::bindAt(const LinkContext& context, ImageLoaderMachOCompressed* image,
- uintptr_t addr, uint8_t type, const char* symbolName,
- uint8_t symbolFlags, intptr_t addend, long libraryOrdinal,
- ExtraBindData *extraBindData,
- const char* msg, DyldSharedCache::DataConstLazyScopedWriter& patcher,
- LastLookup* last, bool runResolver)
+uintptr_t ImageLoaderMachOCompressed::bindAt(const LinkContext& context, uintptr_t addr, uint8_t type, const char* symbolName,
+ uint8_t symbolFlags, intptr_t addend, long libraryOrdinal, const char* msg,
+ LastLookup* last, bool runResolver)
{
const ImageLoader* targetImage;
uintptr_t symbolAddress;
// resolve symbol
- if (type == BIND_TYPE_THREADED_REBASE) {
- symbolAddress = 0;
- targetImage = nullptr;
- } else
- symbolAddress = image->resolve(context, symbolName, symbolFlags, libraryOrdinal, &targetImage, patcher, last, runResolver);
+ symbolAddress = this->resolve(context, symbolName, symbolFlags, libraryOrdinal, &targetImage, last, runResolver);
// do actual update
- return image->bindLocation(context, image->imageBaseAddress(), addr, symbolAddress, type, symbolName, addend, image->getPath(), targetImage ? targetImage->getPath() : NULL, msg, extraBindData, image->fSlide);
+ return this->bindLocation(context, addr, symbolAddress, type, symbolName, addend, this->getPath(), targetImage ? targetImage->getPath() : NULL, msg);
}
@@ -888,7 +779,8 @@
segActualLoadAddress(segmentIndex), segmentEndAddress);
}
-void ImageLoaderMachOCompressed::doBind(const LinkContext& context, bool forceLazysBound, const ImageLoader* reExportParent)
+
+void ImageLoaderMachOCompressed::doBind(const LinkContext& context, bool forceLazysBound)
{
CRSetCrashLogMessage2(this->getPath());
@@ -896,118 +788,44 @@
// note: flat-namespace binaries need to have imports rebound (even if correctly prebound)
if ( this->usablePrebinding(context) ) {
// don't need to bind
- // except weak which may now be inline with the regular binds
- if ( this->participatesInCoalescing() && (fDyldInfo != nullptr) ) {
- // run through all binding opcodes
- DyldSharedCache::DataConstLazyScopedWriter patcher(context.dyldCache, mach_task_self(), context.verboseMapping ? &dyld::log : nullptr);
- auto* patcherPtr = &patcher;
- eachBind(context, ^(const LinkContext& ctx, ImageLoaderMachOCompressed* image,
- uintptr_t addr, uint8_t type, const char* symbolName,
- uint8_t symbolFlags, intptr_t addend, long libraryOrdinal,
- ExtraBindData *extraBindData,
- const char* msg, LastLookup* last, bool runResolver) {
- if ( libraryOrdinal != BIND_SPECIAL_DYLIB_WEAK_LOOKUP )
- return (uintptr_t)0;
- return ImageLoaderMachOCompressed::bindAt(ctx, image, addr, type, symbolName, symbolFlags,
- addend, libraryOrdinal, extraBindData,
- msg, *patcherPtr, last, runResolver);
- });
- }
}
else {
uint64_t t0 = mach_absolute_time();
- uint32_t ignore;
- bool bindingBecauseOfRoot = ( this->overridesCachedDylib(ignore) || this->inSharedCache() );
- vmAccountingSetSuspended(context, bindingBecauseOfRoot);
-
- if ( fChainedFixups != NULL ) {
- DyldSharedCache::DataConstLazyScopedWriter patcher(context.dyldCache, mach_task_self(), context.verboseMapping ? &dyld::log : nullptr);
- const dyld_chained_fixups_header* fixupsHeader = (dyld_chained_fixups_header*)(fLinkEditBase + fChainedFixups->dataoff);
- doApplyFixups(context, fixupsHeader, patcher);
- }
- else if ( fDyldInfo != nullptr ) {
- #if TEXT_RELOC_SUPPORT
- // if there are __TEXT fixups, temporarily make __TEXT writable
- if ( fTextSegmentBinds )
- this->makeTextSegmentWritable(context, true);
- #endif
-
- // make the cache writable for this block
- DyldSharedCache::DataConstLazyScopedWriter patcher(context.dyldCache, mach_task_self(), context.verboseMapping ? &dyld::log : nullptr);
- auto* patcherPtr = &patcher;
- if ( this->inSharedCache() )
- patcher.makeWriteable();
-
- // run through all binding opcodes
- eachBind(context, ^(const LinkContext& ctx, ImageLoaderMachOCompressed* image,
- uintptr_t addr, uint8_t type, const char* symbolName,
- uint8_t symbolFlags, intptr_t addend, long libraryOrdinal,
- ExtraBindData *extraBindData,
- const char* msg, LastLookup* last, bool runResolver) {
- return ImageLoaderMachOCompressed::bindAt(ctx, image, addr, type, symbolName, symbolFlags,
- addend, libraryOrdinal, extraBindData,
- msg, *patcherPtr, last, runResolver);
- });
-
- #if TEXT_RELOC_SUPPORT
- // if there were __TEXT fixups, restore write protection
- if ( fTextSegmentBinds )
- this->makeTextSegmentWritable(context, false);
- #endif
-
- // if this image is in the shared cache, but depends on something no longer in the shared cache,
- // there is no way to reset the lazy pointers, so force bind them now
- if ( forceLazysBound || fInSharedCache )
- this->doBindJustLazies(context, patcher);
-
- // this image is in cache, but something below it is not. If
- // this image has lazy pointer to a resolver function, then
- // the stub may have been altered to point to a shared lazy pointer.
- if ( fInSharedCache )
- this->updateOptimizedLazyPointers(context);
- }
+ #if TEXT_RELOC_SUPPORT
+ // if there are __TEXT fixups, temporarily make __TEXT writable
+ if ( fTextSegmentBinds )
+ this->makeTextSegmentWritable(context, true);
+ #endif
+
+ // run through all binding opcodes
+ eachBind(context, &ImageLoaderMachOCompressed::bindAt);
+
+ #if TEXT_RELOC_SUPPORT
+ // if there were __TEXT fixups, restore write protection
+ if ( fTextSegmentBinds )
+ this->makeTextSegmentWritable(context, false);
+ #endif
+
+ // if this image is in the shared cache, but depends on something no longer in the shared cache,
+ // there is no way to reset the lazy pointers, so force bind them now
+ if ( forceLazysBound || fInSharedCache )
+ this->doBindJustLazies(context);
+
+ // this image is in cache, but something below it is not. If
+ // this image has lazy pointer to a resolver function, then
+ // the stub may have been altered to point to a shared lazy pointer.
+ if ( fInSharedCache )
+ this->updateOptimizedLazyPointers(context);
+
+ // tell kernel we are done with chunks of LINKEDIT
+ if ( !context.preFetchDisabled )
+ this->markFreeLINKEDIT(context);
uint64_t t1 = mach_absolute_time();
ImageLoader::fgTotalRebindCacheTime += (t1-t0);
}
-
- // See if this dylib overrides something in the dyld cache
- uint32_t dyldCacheOverrideImageNum;
- if ( context.dyldCache && context.dyldCache->header.builtFromChainedFixups && overridesCachedDylib(dyldCacheOverrideImageNum) ) {
-
- // make the cache writable for this block
- DyldSharedCache::DataConstLazyScopedWriter patcher(context.dyldCache, mach_task_self(), context.verboseMapping ? &dyld::log : nullptr);
- auto* patcherPtr = &patcher;
-
- // need to patch all other places in cache that point to the overridden dylib, to point to this dylib instead
- const dyld3::closure::Image* overriddenImage = context.dyldCache->cachedDylibsImageArray()->imageForNum(dyldCacheOverrideImageNum);
- uint32_t imageIndex = dyldCacheOverrideImageNum - (uint32_t)context.dyldCache->cachedDylibsImageArray()->startImageNum();
- //dyld::log("doBind() found override of %s\n", this->getPath());
- context.dyldCache->forEachPatchableExport(imageIndex, ^(uint32_t cacheOffsetOfImpl, const char* exportName) {
- uintptr_t newImpl = 0;
- const ImageLoader* foundIn = nullptr;
- if ( this->findExportedSymbolAddress(context, exportName, NULL, 0, false, &foundIn, &newImpl) ) {
- //dyld::log(" patchCacheUsesOf(%s) found in %s\n", exportName, foundIn->getPath());
- patchCacheUsesOf(context, overriddenImage, cacheOffsetOfImpl, exportName, newImpl, *patcherPtr);
- }
- else {
- // <rdar://problem/59196856> allow patched impls to move between re-export sibling dylibs
- if ( reExportParent != nullptr ) {
- reExportParent->forEachReExportDependent(^(const ImageLoader* reExportedDep, bool& stop) {
- uintptr_t siblingImpl = 0;
- const ImageLoader* foundInSibling = nullptr;
- if ( reExportedDep->findExportedSymbolAddress(context, exportName, NULL, 0, false, &foundInSibling, &siblingImpl) ) {
- stop = true;
- //dyld::log(" patchCacheUsesOf(%s) found in sibling %s\n", exportName, foundInSibling->getPath());
- patchCacheUsesOf(context, overriddenImage, cacheOffsetOfImpl, exportName, siblingImpl, *patcherPtr);
- }
- });
- }
- }
- });
- }
-
+
// set up dyld entry points in image
// do last so flat main executables will have __dyld or __program_vars set up
this->setupLazyPointerHandler(context);
@@ -1015,227 +833,14 @@
}
-void ImageLoaderMachOCompressed::doBindJustLazies(const LinkContext& context, DyldSharedCache::DataConstLazyScopedWriter& patcher)
-{
- eachLazyBind(context, ^(const LinkContext& ctx, ImageLoaderMachOCompressed* image,
- uintptr_t addr, uint8_t type, const char* symbolName,
- uint8_t symbolFlags, intptr_t addend, long libraryOrdinal,
- ExtraBindData *extraBindData,
- const char* msg, LastLookup* last, bool runResolver) {
- return ImageLoaderMachOCompressed::bindAt(ctx, image, addr, type, symbolName, symbolFlags,
- addend, libraryOrdinal, extraBindData,
- msg, patcher, last, runResolver);
- });
-}
-
-void ImageLoaderMachOCompressed::doApplyFixups(const LinkContext& context, const dyld_chained_fixups_header* fixupsHeader,
- DyldSharedCache::DataConstLazyScopedWriter& patcher)
-{
- const dyld3::MachOLoaded* ml = (dyld3::MachOLoaded*)machHeader();
- const dyld_chained_starts_in_image* starts = (dyld_chained_starts_in_image*)((uint8_t*)fixupsHeader + fixupsHeader->starts_offset);
-
- // build table of resolved targets for each symbol ordinal
- STACK_ALLOC_OVERFLOW_SAFE_ARRAY(const void*, targetAddrs, 128);
- targetAddrs.reserve(fixupsHeader->imports_count);
- __block Diagnostics diag;
- const dyld3::MachOAnalyzer* ma = (dyld3::MachOAnalyzer*)ml;
- ma->forEachChainedFixupTarget(diag, ^(int libOrdinal, const char* symbolName, uint64_t addend, bool weakImport, bool& stop) {
- const ImageLoader* targetImage;
- uint8_t symbolFlags = weakImport ? BIND_SYMBOL_FLAGS_WEAK_IMPORT : 0;
- try {
- uintptr_t symbolAddress = this->resolve(context, symbolName, symbolFlags, libOrdinal, &targetImage, patcher, NULL, true);
- targetAddrs.push_back((void*)(symbolAddress + addend));
- }
- catch (const char* msg) {
- stop = true;
- diag.error("%s", msg);
- }
- });
- if ( diag.hasError() )
- throw strdup(diag.errorMessage());
-
- auto logFixups = ^(void* loc, void* newValue) {
- dyld::log("dyld: fixup: %s:%p = %p\n", this->getShortName(), loc, newValue);
- };
- if ( !context.verboseBind )
- logFixups = nullptr;
-
- ml->fixupAllChainedFixups(diag, starts, fSlide, targetAddrs, logFixups);
- if ( diag.hasError() )
- throw strdup(diag.errorMessage());
-}
-
-void ImageLoaderMachOCompressed::registerInterposing(const LinkContext& context)
-{
- // mach-o files advertise interposing by having a __DATA __interpose section
- struct InterposeData { uintptr_t replacement; uintptr_t replacee; };
-
- // FIDME: It seems wrong to need a patcher here, but resolve may call resolveWeak and patch the cache.
- // That would require weak symbols in the interposing section though, which may not be supported.
- DyldSharedCache::DataConstLazyScopedWriter patcher(context.dyldCache, mach_task_self(), context.verboseMapping ? &dyld::log : nullptr);
- auto* patcherPtr = &patcher;
-
- __block Diagnostics diag;
- const dyld3::MachOAnalyzer* ma = (dyld3::MachOAnalyzer*)fMachOData;
- ma->forEachInterposingSection(diag, ^(uint64_t vmOffset, uint64_t vmSize, bool& stopSections) {
- if ( ma->hasChainedFixups() ) {
- const uint16_t pointerFormat = ma->chainedPointerFormat();
- const uint8_t* sectionStart = fMachOData+vmOffset;
- const uint8_t* sectionEnd = fMachOData+vmOffset+vmSize;
- ma->withChainStarts(diag, ma->chainStartsOffset(), ^(const dyld_chained_starts_in_image* startsInfo) {
- __block uintptr_t lastRebaseTarget = 0;
- ma->forEachFixupInAllChains(diag, startsInfo, false, ^(dyld3::MachOLoaded::ChainedFixupPointerOnDisk* fixupLoc, const dyld_chained_starts_in_segment* segInfo, bool& stopFixups) {
- if ( ((uint8_t*)fixupLoc < sectionStart) || ((uint8_t*)fixupLoc >= sectionEnd) )
- return;
- uint64_t rebaseTargetRuntimeOffset;
- uint32_t bindOrdinal;
- int64_t ptrAddend;
- if ( fixupLoc->isRebase(pointerFormat, 0, rebaseTargetRuntimeOffset) ) {
- //dyld::log("interpose rebase at fixup at %p to 0x%0llX\n", fixupLoc, rebaseTargetRuntimeOffset);
- lastRebaseTarget = (uintptr_t)(fMachOData+rebaseTargetRuntimeOffset);
- }
- else if ( fixupLoc->isBind(pointerFormat, bindOrdinal, ptrAddend) ) {
- //dyld::log("interpose bind fixup at %p to bind ordinal %d\n", fixupLoc, bindOrdinal);
- __block uint32_t targetBindIndex = 0;
- ma->forEachChainedFixupTarget(diag, ^(int libraryOrdinal, const char* symbolName, uint64_t addend, bool weakImport, bool& stop) {
- if ( targetBindIndex == bindOrdinal ) {
- //dyld::log("interpose bind fixup at %p is to %s libOrdinal=%d\n", fixupLoc, symbolName, libraryOrdinal);
- LastLookup* last = NULL;
- const ImageLoader* targetImage;
- uintptr_t targetBindAddress = 0;
- try {
- targetBindAddress = this->resolve(context, symbolName, 0, libraryOrdinal, &targetImage, *patcherPtr, last, false);
- }
- catch (const char* msg) {
- if ( !weakImport )
- throw msg;
- targetBindAddress = 0;
- }
- //dyld::log("interpose bind fixup at %p is bound to 0x%lX\n", fixupLoc, targetBindAddress);
- // <rdar://problem/25686570> ignore interposing on a weak function that does not exist
- if ( targetBindAddress == 0 )
- return;
- ImageLoader::InterposeTuple tuple;
- tuple.replacement = lastRebaseTarget;
- tuple.neverImage = this;
- tuple.onlyImage = NULL;
- tuple.replacee = targetBindAddress;
- // <rdar://problem/7937695> verify that replacement is in this image
- if ( this->containsAddress((void*)tuple.replacement) ) {
- if ( context.verboseInterposing )
- dyld::log("dyld: interposing 0x%lx with 0x%lx\n", tuple.replacee, tuple.replacement);
- // chain to any existing interpositions
- for (std::vector<InterposeTuple>::iterator it=fgInterposingTuples.begin(); it != fgInterposingTuples.end(); it++) {
- if ( it->replacee == tuple.replacee ) {
- tuple.replacee = it->replacement;
- }
- }
- ImageLoader::fgInterposingTuples.push_back(tuple);
- }
- }
- ++targetBindIndex;
- });
- }
- });
- });
- }
- else {
- // traditional (non-chained) fixups
- const size_t count = (size_t)(vmSize / sizeof(InterposeData));
- const InterposeData* interposeArray = (InterposeData*)(fMachOData+vmOffset);
- if ( context.verboseInterposing )
- dyld::log("dyld: found %lu interposing tuples in %s\n", count, getPath());
- for (size_t j=0; j < count; ++j) {
- uint64_t bindOffset = ((uint8_t*)&(interposeArray[j].replacee)) - fMachOData;
- ma->forEachBind(diag, ^(uint64_t runtimeOffset, int libOrdinal, const char* symbolName, bool weakImport, bool lazyBind, uint64_t addend, bool& stopBinds) {
- if ( bindOffset != runtimeOffset )
- return;
- stopBinds = true;
- LastLookup* last = NULL;
- const ImageLoader* targetImage;
- uintptr_t targetBindAddress = 0;
- try {
- targetBindAddress = this->resolve(context, symbolName, 0, libOrdinal, &targetImage, *patcherPtr, last, false);
- }
- catch (const char* msg) {
- if ( !weakImport )
- throw msg;
- targetBindAddress = 0;
- }
- ImageLoader::InterposeTuple tuple;
- tuple.replacement = interposeArray[j].replacement;
- tuple.neverImage = this;
- tuple.onlyImage = NULL;
- tuple.replacee = targetBindAddress;
- // <rdar://problem/25686570> ignore interposing on a weak function that does not exist
- if ( tuple.replacee == 0 )
- return;
- // <rdar://problem/7937695> verify that replacement is in this image
- if ( this->containsAddress((void*)tuple.replacement) ) {
- if ( context.verboseInterposing )
- dyld::log("dyld: interposing 0x%lx with 0x%lx\n", tuple.replacee, tuple.replacement);
- // chain to any existing interpositions
- for (std::vector<InterposeTuple>::iterator it=fgInterposingTuples.begin(); it != fgInterposingTuples.end(); it++) {
- if ( it->replacee == tuple.replacee ) {
- tuple.replacee = it->replacement;
- }
- }
- ImageLoader::fgInterposingTuples.push_back(tuple);
- }
- }, ^(const char* symbolName){
- });
- }
- }
- });
-}
-
-bool ImageLoaderMachOCompressed::usesChainedFixups() const
-{
- return ((dyld3::MachOLoaded*)machHeader())->hasChainedFixups();
-}
-
-struct ThreadedBindData {
- ThreadedBindData(const char* symbolName, int64_t addend, long libraryOrdinal, uint8_t symbolFlags, uint8_t type)
- : symbolName(symbolName), addend(addend), libraryOrdinal(libraryOrdinal), symbolFlags(symbolFlags), type(type) { }
-
- std::tuple<const char*, int64_t, long, bool, uint8_t> pack() const {
- return std::make_tuple(symbolName, addend, libraryOrdinal, symbolFlags, type);
- }
-
- const char* symbolName = nullptr;
- int64_t addend = 0;
- long libraryOrdinal = 0;
- uint8_t symbolFlags = 0;
- uint8_t type = 0;
-};
-
-void ImageLoaderMachOCompressed::makeDataReadOnly() const
-{
-#if !TEXT_RELOC_SUPPORT
- if ( fReadOnlyDataSegment && !this->ImageLoader::inSharedCache() ) {
- for (unsigned int i=0; i < fSegmentsCount; ++i) {
- if ( segIsReadOnlyData(i) ) {
- uintptr_t start = segActualLoadAddress(i);
- uintptr_t size = segSize(i);
- #if defined(__x86_64__) && !TARGET_OS_SIMULATOR
- if ( dyld::isTranslated() ) {
- // <rdar://problem/48325338> can't mprotect non-16KB segments
- if ( ((size & 0x3FFF) != 0) || ((start & 0x3FFF) != 0) )
- continue;
- }
- #endif
- ::mprotect((void*)start, size, PROT_READ);
- //dyld::log("make read-only 0x%09lX -> 0x%09lX\n", (long)start, (long)(start+size));
- }
- }
- }
-#endif
-}
-
+void ImageLoaderMachOCompressed::doBindJustLazies(const LinkContext& context)
+{
+ eachLazyBind(context, &ImageLoaderMachOCompressed::bindAt);
+}
void ImageLoaderMachOCompressed::eachBind(const LinkContext& context, bind_handler handler)
{
- try {
+ try {
uint8_t type = 0;
int segmentIndex = -1;
uintptr_t address = segActualLoadAddress(0);
@@ -1248,11 +853,7 @@
intptr_t addend = 0;
uintptr_t count;
uintptr_t skip;
- uintptr_t segOffset = 0;
-
- dyld3::OverflowSafeArray<ThreadedBindData> ordinalTable;
- bool useThreadedRebaseBind = false;
- ExtraBindData extraBindData;
+ uintptr_t segOffset;
LastLookup last = { 0, 0, NULL, 0, NULL };
const uint8_t* const start = fLinkEditBase + fDyldInfo->bind_off;
const uint8_t* const end = &start[fDyldInfo->bind_size];
@@ -1319,21 +920,16 @@
address += read_uleb128(p, end);
break;
case BIND_OPCODE_DO_BIND:
- if (!useThreadedRebaseBind) {
- if ( (address < segmentStartAddress) || (address >= segmentEndAddress) )
- throwBadBindingAddress(address, segmentEndAddress, segmentIndex, start, end, p);
- if ( symbolName == NULL )
- dyld::throwf("BIND_OPCODE_DO_BIND missing preceding BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM");
- if ( segmentIndex == -1 )
- dyld::throwf("BIND_OPCODE_DO_BIND missing preceding BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB");
- if ( !libraryOrdinalSet )
- dyld::throwf("BIND_OPCODE_DO_BIND missing preceding BIND_OPCODE_SET_DYLIB_ORDINAL*");
- handler(context, this, address, type, symbolName, symboFlags, addend, libraryOrdinal,
- &extraBindData, "", &last, false);
- address += sizeof(intptr_t);
- } else {
- ordinalTable.push_back(ThreadedBindData(symbolName, addend, libraryOrdinal, symboFlags, type));
- }
+ if ( (address < segmentStartAddress) || (address >= segmentEndAddress) )
+ throwBadBindingAddress(address, segmentEndAddress, segmentIndex, start, end, p);
+ if ( symbolName == NULL )
+ dyld::throwf("BIND_OPCODE_DO_BIND missing preceding BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM");
+ if ( segmentIndex == -1 )
+ dyld::throwf("BIND_OPCODE_DO_BIND missing preceding BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB");
+ if ( !libraryOrdinalSet )
+ dyld::throwf("BIND_OPCODE_DO_BIND missing preceding BIND_OPCODE_SET_DYLIB_ORDINAL*");
+ (this->*handler)(context, address, type, symbolName, symboFlags, addend, libraryOrdinal, "", &last, false);
+ address += sizeof(intptr_t);
break;
case BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB:
if ( (address < segmentStartAddress) || (address >= segmentEndAddress) )
@@ -1344,8 +940,7 @@
dyld::throwf("BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB missing preceding BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB");
if ( !libraryOrdinalSet )
dyld::throwf("BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB missing preceding BIND_OPCODE_SET_DYLIB_ORDINAL*");
- handler(context, this, address, type, symbolName, symboFlags, addend, libraryOrdinal,
- &extraBindData, "", &last, false);
+ (this->*handler)(context, address, type, symbolName, symboFlags, addend, libraryOrdinal, "", &last, false);
address += read_uleb128(p, end) + sizeof(intptr_t);
break;
case BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED:
@@ -1357,8 +952,7 @@
dyld::throwf("BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED missing preceding BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB");
if ( !libraryOrdinalSet )
dyld::throwf("BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED missing preceding BIND_OPCODE_SET_DYLIB_ORDINAL*");
- handler(context, this, address, type, symbolName, symboFlags, addend, libraryOrdinal,
- &extraBindData, "", &last, false);
+ (this->*handler)(context, address, type, symbolName, symboFlags, addend, libraryOrdinal, "", &last, false);
address += immediate*sizeof(intptr_t) + sizeof(intptr_t);
break;
case BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB:
@@ -1373,70 +967,10 @@
for (uint32_t i=0; i < count; ++i) {
if ( (address < segmentStartAddress) || (address >= segmentEndAddress) )
throwBadBindingAddress(address, segmentEndAddress, segmentIndex, start, end, p);
- handler(context, this, address, type, symbolName, symboFlags, addend, libraryOrdinal,
- &extraBindData, "", &last, false);
+ (this->*handler)(context, address, type, symbolName, symboFlags, addend, libraryOrdinal, "", &last, false);
address += skip + sizeof(intptr_t);
}
- break;
- case BIND_OPCODE_THREADED:
- if (sizeof(intptr_t) != 8) {
- dyld::throwf("BIND_OPCODE_THREADED require 64-bit");
- return;
- }
- // Note the immediate is a sub opcode
- switch (immediate) {
- case BIND_SUBOPCODE_THREADED_SET_BIND_ORDINAL_TABLE_SIZE_ULEB:
- count = read_uleb128(p, end);
- ordinalTable.clear();
- // FIXME: ld64 wrote the wrong value here and we need to offset by 1 for now.
- ordinalTable.reserve(count + 1);
- useThreadedRebaseBind = true;
- break;
- case BIND_SUBOPCODE_THREADED_APPLY: {
- uint64_t delta = 0;
- do {
- address = segmentStartAddress + segOffset;
- uint64_t value = *(uint64_t*)address;
-
-
- bool isRebase = (value & (1ULL << 62)) == 0;
- if (isRebase) {
- {
- // Call the bind handler which knows about our bind type being set to rebase
- handler(context, this, address, BIND_TYPE_THREADED_REBASE, nullptr, 0, 0, 0,
- nullptr, "", &last, false);
- }
- } else {
- // the ordinal is bits [0..15]
- uint16_t ordinal = value & 0xFFFF;
- if (ordinal >= ordinalTable.count()) {
- dyld::throwf("bind ordinal (%d) is out of range (max=%lu) for disk pointer 0x%16llX at segIndex=%d, segOffset=0x%0lX in %s",
- ordinal, ordinalTable.count(),value, segmentIndex, segOffset, this->getPath());
- return;
- }
- std::tie(symbolName, addend, libraryOrdinal, symboFlags, type) = ordinalTable[ordinal].pack();
- if ( (address < segmentStartAddress) || (address >= segmentEndAddress) )
- throwBadBindingAddress(address, segmentEndAddress, segmentIndex, start, end, p);
- {
- handler(context, this, address, BIND_TYPE_THREADED_BIND,
- symbolName, symboFlags, addend, libraryOrdinal,
- nullptr, "", &last, false);
- }
- }
-
- // The delta is bits [51..61]
- // And bit 62 is to tell us if we are a rebase (0) or bind (1)
- value &= ~(1ULL << 62);
- delta = ( value & 0x3FF8000000000000 ) >> 51;
- segOffset += delta * sizeof(intptr_t);
- } while ( delta != 0 );
- break;
- }
-
- default:
- dyld::throwf("bad threaded bind subopcode 0x%02X", *p);
- }
- break;
+ break;
default:
dyld::throwf("bad bind opcode %d in bind info", *p);
}
@@ -1526,8 +1060,7 @@
throwBadBindingAddress(address, segmentEndAddress, segmentIndex, start, end, p);
if ( symbolName == NULL )
dyld::throwf("BIND_OPCODE_DO_BIND missing preceding BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM");
- handler(context, this, address, type, symbolName, symboFlags, addend, libraryOrdinal,
- NULL, "forced lazy ", NULL, false);
+ (this->*handler)(context, address, type, symbolName, symboFlags, addend, libraryOrdinal, "forced lazy ", NULL, false);
address += sizeof(intptr_t);
break;
case BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB:
@@ -1548,8 +1081,7 @@
// A program built targeting 10.5 will have hybrid stubs. When used with weak symbols
// the classic lazy loader is used even when running on 10.6
-uintptr_t ImageLoaderMachOCompressed::doBindLazySymbol(uintptr_t* lazyPointer, const LinkContext& context,
- DyldSharedCache::DataConstLazyScopedWriter& patcher)
+uintptr_t ImageLoaderMachOCompressed::doBindLazySymbol(uintptr_t* lazyPointer, const LinkContext& context)
{
// only works with compressed LINKEDIT if classic symbol table is also present
const macho_nlist* symbolTable = NULL;
@@ -1607,8 +1139,7 @@
if ( !twoLevel || context.bindFlat )
libraryOrdinal = BIND_SPECIAL_DYLIB_FLAT_LOOKUP;
uintptr_t ptrToBind = (uintptr_t)lazyPointer;
- uintptr_t symbolAddr = bindAt(context, this, ptrToBind, BIND_TYPE_POINTER, symbolName, 0, 0, libraryOrdinal,
- NULL, "lazy ", patcher, NULL);
+ uintptr_t symbolAddr = bindAt(context, ptrToBind, BIND_TYPE_POINTER, symbolName, 0, 0, libraryOrdinal, "lazy ", NULL);
++fgTotalLazyBindFixups;
return symbolAddr;
}
@@ -1635,8 +1166,6 @@
if ( lock != NULL )
lock();
}
-
- DyldSharedCache::DataConstLazyScopedWriter patcher(context.dyldCache, mach_task_self(), context.verboseMapping ? &dyld::log : nullptr);
const uint8_t* const start = fLinkEditBase + fDyldInfo->lazy_bind_off;
const uint8_t* const end = &start[fDyldInfo->lazy_bind_size];
@@ -1656,8 +1185,7 @@
if ( segOffset > segSize(segIndex) )
dyld::throwf("BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB has offset 0x%08lX beyond segment size (0x%08lX)", segOffset, segSize(segIndex));
uintptr_t address = segActualLoadAddress(segIndex) + segOffset;
- result = bindAt(context, this, address, BIND_TYPE_POINTER, symbolName, 0, 0, libraryOrdinal,
- NULL, "lazy ", patcher, NULL, true);
+ result = this->bindAt(context, address, BIND_TYPE_POINTER, symbolName, 0, 0, libraryOrdinal, "lazy ", NULL, true);
// <rdar://problem/24140465> Some old apps had multiple lazy symbols bound at once
} while (!doneAfterBind && !context.strictMachORequired);
@@ -1678,7 +1206,7 @@
it.symbolMatches = false;
it.done = false;
it.curIndex = 0;
- it.endIndex = (this->fDyldInfo ? this->fDyldInfo->weak_bind_size : 0);
+ it.endIndex = this->fDyldInfo->weak_bind_size;
it.address = 0;
it.type = 0;
it.addend = 0;
@@ -1690,7 +1218,7 @@
if ( it.done )
return false;
- if ( (this->fDyldInfo == nullptr) || (this->fDyldInfo->weak_bind_size == 0) ) {
+ if ( this->fDyldInfo->weak_bind_size == 0 ) {
/// hmmm, ld set MH_WEAK_DEFINES or MH_BINDS_TO_WEAK, but there is no weak binding info
it.done = true;
it.symbolName = "~~~";
@@ -1796,9 +1324,6 @@
if ( this->getState() < dyld_image_state_bound )
return;
- if ( fDyldInfo == nullptr )
- return;
-
const uint8_t* start = fLinkEditBase + fDyldInfo->weak_bind_off;
const uint8_t* p = start + it.curIndex;
const uint8_t* end = fLinkEditBase + fDyldInfo->weak_bind_off + this->fDyldInfo->weak_bind_size;
@@ -1853,17 +1378,17 @@
address += read_uleb128(p, end);
break;
case BIND_OPCODE_DO_BIND:
- bindLocation(context, this->imageBaseAddress(), address, value, type, symbolName, addend, this->getPath(), targetImage ? targetImage->getPath() : NULL, "weak ", NULL, fSlide);
+ bindLocation(context, address, value, type, symbolName, addend, this->getPath(), targetImage ? targetImage->getPath() : NULL, "weak ");
boundSomething = true;
address += sizeof(intptr_t);
break;
case BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB:
- bindLocation(context, this->imageBaseAddress(), address, value, type, symbolName, addend, this->getPath(), targetImage ? targetImage->getPath() : NULL, "weak ", NULL, fSlide);
+ bindLocation(context, address, value, type, symbolName, addend, this->getPath(), targetImage ? targetImage->getPath() : NULL, "weak ");
boundSomething = true;
address += read_uleb128(p, end) + sizeof(intptr_t);
break;
case BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED:
- bindLocation(context, this->imageBaseAddress(), address, value, type, symbolName, addend, this->getPath(), targetImage ? targetImage->getPath() : NULL, "weak ", NULL, fSlide);
+ bindLocation(context, address, value, type, symbolName, addend, this->getPath(), targetImage ? targetImage->getPath() : NULL, "weak ");
boundSomething = true;
address += immediate*sizeof(intptr_t) + sizeof(intptr_t);
break;
@@ -1871,7 +1396,7 @@
count = read_uleb128(p, end);
skip = read_uleb128(p, end);
for (uint32_t i=0; i < count; ++i) {
- bindLocation(context, this->imageBaseAddress(), address, value, type, symbolName, addend, this->getPath(), targetImage ? targetImage->getPath() : NULL, "weak ", NULL, fSlide);
+ bindLocation(context, address, value, type, symbolName, addend, this->getPath(), targetImage ? targetImage->getPath() : NULL, "weak ");
boundSomething = true;
address += skip + sizeof(intptr_t);
}
@@ -1885,16 +1410,13 @@
context.addDynamicReference(this, targetImage);
}
-uintptr_t ImageLoaderMachOCompressed::interposeAt(const LinkContext& context, ImageLoaderMachOCompressed* image,
- uintptr_t addr, uint8_t type, const char*,
- uint8_t, intptr_t, long,
- ExtraBindData *extraBindData,
- const char*, LastLookup*, bool runResolver)
+uintptr_t ImageLoaderMachOCompressed::interposeAt(const LinkContext& context, uintptr_t addr, uint8_t type, const char*,
+ uint8_t, intptr_t, long, const char*, LastLookup*, bool runResolver)
{
if ( type == BIND_TYPE_POINTER ) {
uintptr_t* fixupLocation = (uintptr_t*)addr;
uintptr_t curValue = *fixupLocation;
- uintptr_t newValue = interposedAddress(context, curValue, image);
+ uintptr_t newValue = interposedAddress(context, curValue, this);
if ( newValue != curValue) {
*fixupLocation = newValue;
}
@@ -1907,49 +1429,14 @@
if ( context.verboseInterposing )
dyld::log("dyld: interposing %lu tuples onto image: %s\n", fgInterposingTuples.size(), this->getPath());
- const dyld3::MachOAnalyzer* ma = (dyld3::MachOAnalyzer*)fMachOData;
- if ( !ma->hasChainedFixups() && (fDyldInfo != nullptr) ) {
- // Note: all binds that happen as part of normal loading and fixups will have interposing applied.
- // There is only two cases where we need to parse bind opcodes and apply interposing:
-
- // make the cache writable for this block
- DyldSharedCache::DataConstLazyScopedWriter patcher(context.dyldCache, mach_task_self(), context.verboseMapping ? &dyld::log : nullptr);
- if ( ma->inDyldCache() )
- patcher.makeWriteable();
-
- // 1) Lazy pointers are either not bound yet, or in dyld cache they are prebound (to uninterposed target)
- eachLazyBind(context, ^(const LinkContext& ctx, ImageLoaderMachOCompressed* image,
- uintptr_t addr, uint8_t type, const char* symbolName,
- uint8_t symbolFlags, intptr_t addend, long libraryOrdinal,
- ExtraBindData *extraBindData,
- const char* msg, LastLookup* last, bool runResolver) {
- return ImageLoaderMachOCompressed::interposeAt(ctx, image, addr, type, symbolName, symbolFlags,
- addend, libraryOrdinal, extraBindData,
- msg, last, runResolver);
- });
-
- // 2) non-lazy pointers in the dyld cache need to be interposed
- if ( ma->inDyldCache() ) {
- eachBind(context, ^(const LinkContext& ctx, ImageLoaderMachOCompressed* image,
- uintptr_t addr, uint8_t type, const char* symbolName,
- uint8_t symbolFlags, intptr_t addend, long libraryOrdinal,
- ExtraBindData *extraBindData,
- const char* msg, LastLookup* last, bool runResolver) {
- return ImageLoaderMachOCompressed::interposeAt(ctx, image, addr, type, symbolName, symbolFlags,
- addend, libraryOrdinal, extraBindData,
- msg, last, runResolver);
- });
- }
-
- }
-}
-
-
-uintptr_t ImageLoaderMachOCompressed::dynamicInterposeAt(const LinkContext& context, ImageLoaderMachOCompressed* image,
- uintptr_t addr, uint8_t type, const char* symbolName,
- uint8_t, intptr_t, long,
- ExtraBindData *extraBindData,
- const char*, LastLookup*, bool runResolver)
+ // update prebound symbols
+ eachBind(context, &ImageLoaderMachOCompressed::interposeAt);
+ eachLazyBind(context, &ImageLoaderMachOCompressed::interposeAt);
+}
+
+
+uintptr_t ImageLoaderMachOCompressed::dynamicInterposeAt(const LinkContext& context, uintptr_t addr, uint8_t type, const char* symbolName,
+ uint8_t, intptr_t, long, const char*, LastLookup*, bool runResolver)
{
if ( type == BIND_TYPE_POINTER ) {
uintptr_t* fixupLocation = (uintptr_t*)addr;
@@ -1961,7 +1448,7 @@
if ( value == (uintptr_t)context.dynamicInterposeArray[i].replacee ) {
if ( context.verboseInterposing ) {
dyld::log("dyld: dynamic interposing: at %p replace %p with %p in %s\n",
- fixupLocation, context.dynamicInterposeArray[i].replacee, context.dynamicInterposeArray[i].replacement, image->getPath());
+ fixupLocation, context.dynamicInterposeArray[i].replacee, context.dynamicInterposeArray[i].replacement, this->getPath());
}
*fixupLocation = (uintptr_t)context.dynamicInterposeArray[i].replacement;
}
@@ -1976,24 +1463,8 @@
dyld::log("dyld: dynamic interposing %lu tuples onto image: %s\n", context.dynamicInterposeCount, this->getPath());
// update already bound references to symbols
- eachBind(context, ^(const LinkContext& ctx, ImageLoaderMachOCompressed* image,
- uintptr_t addr, uint8_t type, const char* symbolName,
- uint8_t symbolFlags, intptr_t addend, long libraryOrdinal,
- ExtraBindData *extraBindData,
- const char* msg, LastLookup* last, bool runResolver) {
- return ImageLoaderMachOCompressed::dynamicInterposeAt(ctx, image, addr, type, symbolName, symbolFlags,
- addend, libraryOrdinal, extraBindData,
- msg, last, runResolver);
- });
- eachLazyBind(context, ^(const LinkContext& ctx, ImageLoaderMachOCompressed* image,
- uintptr_t addr, uint8_t type, const char* symbolName,
- uint8_t symbolFlags, intptr_t addend, long libraryOrdinal,
- ExtraBindData *extraBindData,
- const char* msg, LastLookup* last, bool runResolver) {
- return ImageLoaderMachOCompressed::dynamicInterposeAt(ctx, image, addr, type, symbolName, symbolFlags,
- addend, libraryOrdinal, extraBindData,
- msg, last, runResolver);
- });
+ eachBind(context, &ImageLoaderMachOCompressed::dynamicInterposeAt);
+ eachLazyBind(context, &ImageLoaderMachOCompressed::dynamicInterposeAt);
}
const char* ImageLoaderMachOCompressed::findClosestSymbol(const void* addr, const void** closestAddr) const
@@ -2125,28 +1596,27 @@
void ImageLoaderMachOCompressed::registerEncryption(const encryption_info_command* encryptCmd, const LinkContext& context)
{
-#if (__arm__ || __arm64__) && !TARGET_OS_SIMULATOR
+#if __arm__ || __arm64__
if ( encryptCmd == NULL )
return;
- // fMachOData not set up yet, need to manually find mach_header
const mach_header* mh = NULL;
for(unsigned int i=0; i < fSegmentsCount; ++i) {
if ( (segFileOffset(i) == 0) && (segFileSize(i) != 0) ) {
mh = (mach_header*)segActualLoadAddress(i);
- void* start = ((uint8_t*)mh) + encryptCmd->cryptoff;
- size_t len = encryptCmd->cryptsize;
- uint32_t cputype = mh->cputype;
- uint32_t cpusubtype = mh->cpusubtype;
- uint32_t cryptid = encryptCmd->cryptid;
- if (context.verboseMapping) {
- dyld::log(" 0x%08lX->0x%08lX configured for FairPlay decryption\n", (long)start, (long)start+len);
- }
- int result = mremap_encrypted(start, len, cryptid, cputype, cpusubtype);
- if ( result != 0 ) {
- dyld::throwf("mremap_encrypted() => %d, errno=%d for %s\n", result, errno, this->getPath());
- }
- return;
- }
+ break;
+ }
+ }
+ void* start = ((uint8_t*)mh) + encryptCmd->cryptoff;
+ size_t len = encryptCmd->cryptsize;
+ uint32_t cputype = mh->cputype;
+ uint32_t cpusubtype = mh->cpusubtype;
+ uint32_t cryptid = encryptCmd->cryptid;
+ if (context.verboseMapping) {
+ dyld::log(" 0x%08lX->0x%08lX configured for FairPlay decryption\n", (long)start, (long)start+len);
+ }
+ int result = mremap_encrypted(start, len, cryptid, cputype, cpusubtype);
+ if ( result != 0 ) {
+ dyld::throwf("mremap_encrypted() => %d, errno=%d for %s\n", result, errno, this->getPath());
}
#endif
}