Loading...
--- dyld/dyld-832.7.3/src/ImageLoaderMachOCompressed.cpp
+++ dyld/dyld-733.8/src/ImageLoaderMachOCompressed.cpp
@@ -135,7 +135,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");
@@ -317,7 +317,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);
}
@@ -765,7 +765,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);
@@ -799,7 +799,7 @@
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);
+ symbolAddress = this->resolveWeak(context, symbolName, false, runResolver, targetImage);
}
else {
if ( libraryOrdinal == BIND_SPECIAL_DYLIB_MAIN_EXECUTABLE ) {
@@ -825,14 +825,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 {
@@ -882,7 +876,7 @@
}
-void ImageLoaderMachOCompressed::doBind(const LinkContext& context, bool forceLazysBound, const ImageLoader* reExportParent)
+void ImageLoaderMachOCompressed::doBind(const LinkContext& context, bool forceLazysBound)
{
CRSetCrashLogMessage2(this->getPath());
@@ -891,7 +885,7 @@
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) ) {
+ if (this->participatesInCoalescing()) {
// run through all binding opcodes
eachBind(context, ^(const LinkContext& ctx, ImageLoaderMachOCompressed* image,
uintptr_t addr, uint8_t type, const char* symbolName,
@@ -917,7 +911,7 @@
const dyld_chained_fixups_header* fixupsHeader = (dyld_chained_fixups_header*)(fLinkEditBase + fChainedFixups->dataoff);
doApplyFixups(context, fixupsHeader);
}
- else if ( fDyldInfo != nullptr ) {
+ else {
#if TEXT_RELOC_SUPPORT
// if there are __TEXT fixups, temporarily make __TEXT writable
if ( fTextSegmentBinds )
@@ -963,28 +957,11 @@
// 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);
- }
- 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);
- }
- });
- }
- }
+ const ImageLoader* foundIn;
+ this->findExportedSymbolAddress(context, exportName, NULL, 0, false, &foundIn, &newImpl);
+ patchCacheUsesOf(context, overriddenImage, cacheOffsetOfImpl, exportName, newImpl);
});
}
@@ -1016,22 +993,14 @@
// 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;
+ 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, NULL, true);
- targetAddrs.push_back((void*)(symbolAddress + addend));
- }
- catch (const char* msg) {
- stop = true;
- diag.error("%s", msg);
- }
+ uintptr_t symbolAddress = this->resolve(context, symbolName, symbolFlags, libOrdinal, &targetImage, NULL, true);
+ targetAddrs.push_back((void*)(symbolAddress + addend));
});
- 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);
@@ -1040,8 +1009,6 @@
logFixups = nullptr;
ml->fixupAllChainedFixups(diag, starts, fSlide, targetAddrs, logFixups);
- if ( diag.hasError() )
- throw strdup(diag.errorMessage());
}
void ImageLoaderMachOCompressed::registerInterposing(const LinkContext& context)
@@ -1063,12 +1030,11 @@
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) ) {
+ else if ( fixupLoc->isBind(pointerFormat, bindOrdinal) ) {
//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) {
@@ -1156,8 +1122,8 @@
}
ImageLoader::fgInterposingTuples.push_back(tuple);
}
- }, ^(const char* symbolName){
- });
+ }, ^(const char* symbolName){ },
+ ^() { });
}
}
});
@@ -1191,13 +1157,6 @@
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));
}
@@ -1879,7 +1838,7 @@
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) ) {
+ if ( !ma->hasChainedFixups() ) {
// 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:
@@ -2091,7 +2050,7 @@
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