Loading...
--- dyld/dyld-239.4/src/dyldAPIs.cpp
+++ dyld/dyld-433.5/src/dyldAPIs.cpp
@@ -51,6 +51,7 @@
#include "mach-o/dyld_priv.h"
#include "ImageLoader.h"
+#include "ImageLoaderMachO.h"
#include "dyld.h"
#include "dyldLibSystemInterface.h"
@@ -62,6 +63,10 @@
// from dyld_gdb.cpp
extern void addImagesToAllImages(uint32_t infoCount, const dyld_image_info info[]);
+extern uint32_t allImagesCount();
+extern const mach_header* allImagesIndexedMachHeader(uint32_t index);
+extern const char* allImagesIndexedPath(uint32_t index);
+
// deprecated APIs are still availble on Mac OS X, but not on iPhone OS
#if __IPHONE_OS_VERSION_MIN_REQUIRED
@@ -70,6 +75,7 @@
#define DEPRECATED_APIS_SUPPORTED 1
#endif
+static bool sDynamicInterposing = false;
#if DEPRECATED_APIS_SUPPORTED
static char sLastErrorFilePath[1024];
@@ -100,8 +106,10 @@
static void client_dyld_lookup_and_bind(const char* symbolName, void** address, NSModule* module);
static bool client_NSIsSymbolNameDefined(const char* symbolName);
#endif // DEPRECATED_APIS_SUPPORTED
-#if !__arm__
+#if SUPPORT_ZERO_COST_EXCEPTIONS
static bool client_dyld_find_unwind_sections(void* addr, dyld_unwind_sections* info);
+#endif
+#if DEPRECATED_APIS_SUPPORTED
#endif
static void unimplemented()
@@ -131,27 +139,32 @@
{"__dyld__NSGetExecutablePath", (void*)_NSGetExecutablePath },
// SPIs
- {"__dyld_dyld_register_image_state_change_handler", (void*)dyld_register_image_state_change_handler },
{"__dyld_register_thread_helpers", (void*)registerThreadHelpers },
{"__dyld_fork_child", (void*)_dyld_fork_child },
- {"__dyld_moninit", (void*)_dyld_moninit },
{"__dyld_make_delayed_module_initializer_calls", (void*)_dyld_make_delayed_module_initializer_calls },
{"__dyld_get_all_image_infos", (void*)_dyld_get_all_image_infos },
-#if !__arm__
+#if SUPPORT_ZERO_COST_EXCEPTIONS
{"__dyld_find_unwind_sections", (void*)client_dyld_find_unwind_sections },
#endif
-#if __i386__ || __x86_64__ || __arm__
+#if __i386__ || __x86_64__ || __arm__ || __arm64__
{"__dyld_fast_stub_entry", (void*)dyld::fastBindLazySymbol },
#endif
{"__dyld_image_path_containing_address", (void*)dyld_image_path_containing_address },
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
{"__dyld_shared_cache_some_image_overridden", (void*)dyld_shared_cache_some_image_overridden },
-#endif
{"__dyld_process_is_restricted", (void*)dyld::processIsRestricted },
+ {"__dyld_dynamic_interpose", (void*)dyld_dynamic_interpose },
+#if DYLD_SHARED_CACHE_SUPPORT
+ {"__dyld_shared_cache_file_path", (void*)dyld::getStandardSharedCacheFilePath },
+#endif
+ {"__dyld_get_image_header_containing_address", (void*)dyld_image_header_containing_address },
+ {"__dyld_is_memory_immutable", (void*)_dyld_is_memory_immutable },
+ {"__dyld_objc_notify_register", (void*)_dyld_objc_notify_register },
+ {"__dyld_get_shared_cache_uuid", (void*)_dyld_get_shared_cache_uuid },
+ {"__dyld_get_shared_cache_range", (void*)_dyld_get_shared_cache_range },
+
// deprecated
#if DEPRECATED_APIS_SUPPORTED
- {"__dyld_get_image_header_containing_address", (void*)_dyld_get_image_header_containing_address },
{"__dyld_lookup_and_bind", (void*)client_dyld_lookup_and_bind },
{"__dyld_lookup_and_bind_with_hint", (void*)_dyld_lookup_and_bind_with_hint },
{"__dyld_lookup_and_bind_fully", (void*)_dyld_lookup_and_bind_fully },
@@ -283,7 +296,7 @@
dyld::log("%s(...)\n", __func__);
const char* exePath = dyld::getExecutablePath();
if(*bufsize < strlen(exePath) + 1){
- *bufsize = strlen(exePath) + 1;
+ *bufsize = (uint32_t)(strlen(exePath) + 1);
return -1;
}
strcpy(buf, exePath);
@@ -294,27 +307,23 @@
{
if ( dyld::gLogAPIs )
dyld::log("%s()\n", __func__);
- return dyld::getImageCount();
+ return allImagesCount();
}
const struct mach_header* _dyld_get_image_header(uint32_t image_index)
{
if ( dyld::gLogAPIs )
dyld::log("%s(%u)\n", __func__, image_index);
- ImageLoader* image = dyld::getIndexedImage(image_index);
- if ( image != NULL )
- return (struct mach_header*)image->machHeader();
- else
- return NULL;
+ return allImagesIndexedMachHeader(image_index);
}
intptr_t _dyld_get_image_vmaddr_slide(uint32_t image_index)
{
if ( dyld::gLogAPIs )
dyld::log("%s(%u)\n", __func__, image_index);
- ImageLoader* image = dyld::getIndexedImage(image_index);
- if ( image != NULL )
- return image->getSlide();
+ const struct mach_header* mh = allImagesIndexedMachHeader(image_index);
+ if ( mh != NULL )
+ return ImageLoaderMachO::computeSlide(mh);
else
return 0;
}
@@ -323,11 +332,7 @@
{
if ( dyld::gLogAPIs )
dyld::log("%s(%p)\n", __func__, mh);
- ImageLoader* image = dyld::findImageByMachHeader(mh);
- if ( image != NULL )
- return image->getSlide();
- else
- return 0;
+ return ImageLoaderMachO::computeSlide(mh);
}
@@ -335,17 +340,19 @@
{
if ( dyld::gLogAPIs )
dyld::log("%s(%u)\n", __func__, image_index);
- ImageLoader* image = dyld::getIndexedImage(image_index);
- if ( image != NULL )
- return image->getRealPath();
- else
- return NULL;
-}
-
-const struct mach_header * _dyld_get_image_header_containing_address(const void* address)
+ return allImagesIndexedPath(image_index);
+}
+
+const struct mach_header * dyld_image_header_containing_address(const void* address)
{
if ( dyld::gLogAPIs )
dyld::log("%s(%p)\n", __func__, address);
+#if SUPPORT_ACCELERATE_TABLES
+ const mach_header* mh;
+ const char* path;
+ if ( dyld::addressInCache(address, &mh, &path) )
+ return mh;
+#endif
ImageLoader* image = dyld::findImageContainingAddress(address);
if ( image != NULL )
return image->machHeader();
@@ -541,12 +548,13 @@
context.canBePIE = false;
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = &callersRPaths; // rpaths from caller and main executable
-
- image = load(path, context);
+
+ unsigned cacheIndex;
+ image = load(path, context, cacheIndex);
if ( image != NULL ) {
if ( context.matchByInstallName )
image->setMatchInstallPath(true);
- dyld::link(image, false, false, callersRPaths);
+ dyld::link(image, false, false, callersRPaths, cacheIndex);
dyld::runInitializers(image);
// images added with NSAddImage() can never be unloaded
image->setNeverUnload();
@@ -791,7 +799,8 @@
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = NULL; // support not yet implemented
- ImageLoader* image = dyld::load(pathName, context);
+ unsigned cacheIndex;
+ ImageLoader* image = dyld::load(pathName, context, cacheIndex);
// Note: We DO NOT link the image! NSLinkModule will do that
if ( image != NULL ) {
if ( !image->isBundle() ) {
@@ -1005,7 +1014,7 @@
bool forceLazysBound = ( (options & NSLINKMODULE_OPTION_BINDNOW) != 0 );
// load libraries, rebase, bind, to make this image usable
- dyld::link(objectFileImage->image, forceLazysBound, false, ImageLoader::RPathChain(NULL,NULL));
+ dyld::link(objectFileImage->image, forceLazysBound, false, ImageLoader::RPathChain(NULL,NULL), UINT32_MAX);
// bump reference count to keep this bundle from being garbage collected
objectFileImage->image->incrementDlopenReferenceCount();
@@ -1051,7 +1060,7 @@
bool forceLazysBound = ( (options & NSLINKMODULE_OPTION_BINDNOW) != 0 );
// load libraries, rebase, bind, to make this image usable
- dyld::link(image, forceLazysBound, false, ImageLoader::RPathChain(NULL,NULL));
+ dyld::link(image, forceLazysBound, false, ImageLoader::RPathChain(NULL,NULL), UINT32_MAX);
// run initializers unless magic flag says not to
if ( (options & NSLINKMODULE_OPTION_DONT_CALL_MOD_INIT_ROUTINES) == 0 )
@@ -1114,7 +1123,19 @@
ImageLoader* image = NSModuleToImageLoader(module);
if ( image == NULL )
return false;
- dyld::runImageTerminators(image);
+ dyld::runImageStaticTerminators(image);
+ if ( (dyld::gLibSystemHelpers != NULL) && (dyld::gLibSystemHelpers->version >= 13) ) {
+ __cxa_range_t ranges[image->segmentCount()];
+ int rangeCount = 0;
+ for (unsigned int j=0; j < image->segmentCount(); ++j) {
+ if ( !image->segExecutable(j) )
+ continue;
+ ranges[rangeCount].addr = (const void*)image->segActualLoadAddress(j);
+ ranges[rangeCount].length = image->segSize(j);
+ ++rangeCount;
+ }
+ (*dyld::gLibSystemHelpers->cxa_finalize_ranges)(ranges, rangeCount);
+ }
dyld::removeImage(image);
if ( (options & NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED) != 0 )
@@ -1195,27 +1216,6 @@
dyld::gProcessInfo->systemOrderFlag = 0;
}
-typedef void (*MonitorProc)(char *lowpc, char *highpc);
-
-static void monInitCallback(ImageLoader* image, void* userData)
-{
- MonitorProc proc = (MonitorProc)userData;
- void* start;
- size_t length;
- if ( image->getSectionContent("__TEXT", "__text", &start, &length) ) {
- proc((char*)start, (char*)start+length);
- }
-}
-
-//
-// _dyld_moninit is called from profiling runtime routine moninit().
-// dyld calls back with the range of each __TEXT/__text section in every
-// linked image.
-//
-void _dyld_moninit(MonitorProc proc)
-{
- dyld::forEachImageDo(&monInitCallback, (void*)proc);
-}
#if DEPRECATED_APIS_SUPPORTED
// returns true if prebinding was used in main executable
@@ -1250,13 +1250,13 @@
#endif // DEPRECATED_APIS_SUPPORTED
-bool lookupDyldFunction(const char* name, uintptr_t* address)
+int _dyld_func_lookup(const char* name, void** address)
{
for (const dyld_func* p = dyld_funcs; p->name != NULL; ++p) {
if ( strcmp(p->name, name) == 0 ) {
if( p->implementation == unimplemented )
dyld::log("unimplemented dyld function: %s\n", p->name);
- *address = (uintptr_t)p->implementation;
+ *address = p->implementation;
return true;
}
}
@@ -1269,10 +1269,7 @@
{
dyld::gLibSystemHelpers = helpers;
- // let gdb know it is safe to run code in inferior that might call malloc()
- dyld::gProcessInfo->libSystemInitialized = true;
-
-#if __arm__
+#if !SUPPORT_ZERO_COST_EXCEPTIONS
if ( helpers->version >= 5 ) {
// create key use by dyld exception handling
pthread_key_t key;
@@ -1319,14 +1316,42 @@
dlerrorClear();
+ CRSetCrashLogMessage("dyld: in dlopen_preflight()");
+
+ const bool leafName = (strchr(path, '/') == NULL);
+ const bool absolutePath = (path[0] == '/');
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+ char canonicalPath[PATH_MAX];
+ // <rdar://problem/7017050> dlopen() not opening frameworks from shared cache with // or ./ in path
+ if ( !leafName ) {
+ // make path canonical if it contains a // or ./
+ if ( (strstr(path, "//") != NULL) || (strstr(path, "./") != NULL) ) {
+ const char* lastSlash = strrchr(path, '/');
+ char dirPath[PATH_MAX];
+ if ( strlcpy(dirPath, path, sizeof(dirPath)) < sizeof(dirPath) ) {
+ dirPath[lastSlash-path] = '\0';
+ if ( realpath(dirPath, canonicalPath) ) {
+ strlcat(canonicalPath, "/", sizeof(canonicalPath));
+ if ( strlcat(canonicalPath, lastSlash+1, sizeof(canonicalPath)) < sizeof(canonicalPath) ) {
+ // if all fit in buffer, use new canonical path
+ path = canonicalPath;
+ }
+ }
+ }
+ }
+ }
+#endif
+#if SUPPORT_ACCELERATE_TABLES
+ if ( dyld::isPathInCache(path) )
+ return true;
+#endif
+
#if DYLD_SHARED_CACHE_SUPPORT
// <rdar://problem/5910137> dlopen_preflight() on image in shared cache leaves it loaded but not objc initialized
// if requested path is to something in the dyld shared cache, always succeed
if ( dyld::inSharedCache(path) )
return true;
#endif
-
- CRSetCrashLogMessage("dyld: in dlopen_preflight()");
bool result = false;
std::vector<const char*> rpathsFromCallerImage;
@@ -1342,29 +1367,6 @@
}
ImageLoader* image = NULL;
- const bool leafName = (strchr(path, '/') == NULL);
- const bool absolutePath = (path[0] == '/');
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
- char canonicalPath[PATH_MAX];
- // <rdar://problem/7017050> dlopen() not opening frameworks from shared cache with // or ./ in path
- if ( !leafName ) {
- // make path canonical if it contains a // or ./
- if ( (strstr(path, "//") != NULL) || (strstr(path, "./") != NULL) ) {
- const char* lastSlash = strrchr(path, '/');
- char dirPath[PATH_MAX];
- if ( strlcpy(dirPath, path, sizeof(dirPath)) < sizeof(dirPath) ) {
- dirPath[lastSlash-path] = '\0';
- if ( realpath(dirPath, canonicalPath) ) {
- strlcat(canonicalPath, "/", sizeof(canonicalPath));
- if ( strlcat(canonicalPath, lastSlash+1, sizeof(canonicalPath)) < sizeof(canonicalPath) ) {
- // if all fit in buffer, use new canonical path
- path = canonicalPath;
- }
- }
- }
- }
- }
-#endif
dyld::LoadContext context;
context.useSearchPaths = true;
context.useFallbackPaths= leafName; // a partial path implies don't use fallback paths
@@ -1377,10 +1379,11 @@
context.canBePIE = true;
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = &callersRPaths; // rpaths from caller and main executable
-
- image = load(path, context);
+
+ unsigned cacheIndex;
+ image = load(path, context, cacheIndex);
if ( image != NULL ) {
- dyld::preflight(image, callersRPaths); // image object deleted by dyld::preflight()
+ dyld::preflight(image, callersRPaths, cacheIndex); // image object deleted by dyld::preflight()
result = true;
}
}
@@ -1399,14 +1402,43 @@
return result;
}
+#if SUPPORT_ACCELERATE_TABLES
+bool static callerIsNonOSApp(void* callerAddress, const char** shortName)
+{
+ *shortName = NULL;
+ const mach_header* unusedMh;
+ const char* unusedPath;
+ unsigned unusedIndex;
+ // any address in shared cache is not from app
+ if ( dyld::addressInCache(callerAddress, &unusedMh, &unusedPath, &unusedIndex) )
+ return false;
+
+ ImageLoader* callerImage = dyld::findImageContainingAddress(callerAddress);
+ if ( callerImage == NULL )
+ return false;
+
+ *shortName = callerImage->getShortName();
+ return ( strncmp(callerImage->getPath(), "/var/containers/", 16) == 0 );
+}
+#endif
void* dlopen(const char* path, int mode)
{
if ( dyld::gLogAPIs )
dyld::log("%s(%s, 0x%08X)\n", __func__, ((path==NULL) ? "NULL" : path), mode);
+#if SUPPORT_ACCELERATE_TABLES
+ if ( dyld::gLogAppAPIs ) {
+ void* callerAddress = __builtin_return_address(1); // note layers: 1: real client, 0: libSystem glue
+ const char* shortName;
+ if ( callerIsNonOSApp(callerAddress, &shortName) ) {
+ dyld::log("%s: %s(%s, 0x%08X)\n", shortName, __func__, ((path==NULL) ? "NULL" : path), mode);
+ }
+ }
+#endif
+
dlerrorClear();
-
+
// passing NULL for path means return magic object
if ( path == NULL ) {
// RTLD_FIRST means any dlsym() calls on the handle should only search that handle and not subsequent images
@@ -1425,42 +1457,52 @@
}
void* result = NULL;
+ const bool leafName = (strchr(path, '/') == NULL);
+ const bool absolutePath = (path[0] == '/');
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+ char canonicalPath[PATH_MAX];
+ // <rdar://problem/7017050> dlopen() not opening frameworks from shared cache with // or ./ in path
+ if ( !leafName ) {
+ // make path canonical if it contains a // or ./
+ if ( (strstr(path, "//") != NULL) || (strstr(path, "./") != NULL) ) {
+ const char* lastSlash = strrchr(path, '/');
+ char dirPath[PATH_MAX];
+ if ( strlcpy(dirPath, path, sizeof(dirPath)) < sizeof(dirPath) ) {
+ dirPath[lastSlash-path] = '\0';
+ if ( realpath(dirPath, canonicalPath) ) {
+ strlcat(canonicalPath, "/", sizeof(canonicalPath));
+ if ( strlcat(canonicalPath, lastSlash+1, sizeof(canonicalPath)) < sizeof(canonicalPath) ) {
+ // if all fit in buffer, use new canonical path
+ path = canonicalPath;
+ }
+ }
+ }
+ }
+ }
+#endif
+#if SUPPORT_ACCELERATE_TABLES
+ if ( dyld::dlopenFromCache(path, mode, &result) ) {
+ // Note: dlopenFromCache() releases the lock
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s(%s) ==> %p\n", __func__, path, result);
+ return result;
+ }
+#endif
+
ImageLoader* image = NULL;
std::vector<const char*> rpathsFromCallerImage;
+ ImageLoader::RPathChain callersRPaths(NULL, &rpathsFromCallerImage);
try {
void* callerAddress = __builtin_return_address(1); // note layers: 1: real client, 0: libSystem glue
ImageLoader* callerImage = dyld::findImageContainingAddress(callerAddress);
- // for dlopen, use rpath from caller image and from main executable
- if ( callerImage != NULL )
- callerImage->getRPaths(dyld::gLinkContext, rpathsFromCallerImage);
- ImageLoader::RPathChain callersRPaths(NULL, &rpathsFromCallerImage);
- if ( callerImage != dyld::mainExecutable() ) {
- dyld::mainExecutable()->getRPaths(dyld::gLinkContext, rpathsFromCallerImage);
+ if ( (mode & RTLD_NOLOAD) == 0 ) {
+ // for dlopen, use rpath from caller image and from main executable
+ if ( callerImage != NULL )
+ callerImage->getRPaths(dyld::gLinkContext, rpathsFromCallerImage);
+ if ( callerImage != dyld::mainExecutable() )
+ dyld::mainExecutable()->getRPaths(dyld::gLinkContext, rpathsFromCallerImage);
}
- const bool leafName = (strchr(path, '/') == NULL);
- const bool absolutePath = (path[0] == '/');
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
- char canonicalPath[PATH_MAX];
- // <rdar://problem/7017050> dlopen() not opening frameworks from shared cache with // or ./ in path
- if ( !leafName ) {
- // make path canonical if it contains a // or ./
- if ( (strstr(path, "//") != NULL) || (strstr(path, "./") != NULL) ) {
- const char* lastSlash = strrchr(path, '/');
- char dirPath[PATH_MAX];
- if ( strlcpy(dirPath, path, sizeof(dirPath)) < sizeof(dirPath) ) {
- dirPath[lastSlash-path] = '\0';
- if ( realpath(dirPath, canonicalPath) ) {
- strlcat(canonicalPath, "/", sizeof(canonicalPath));
- if ( strlcat(canonicalPath, lastSlash+1, sizeof(canonicalPath)) < sizeof(canonicalPath) ) {
- // if all fit in buffer, use new canonical path
- path = canonicalPath;
- }
- }
- }
- }
- }
-#endif
dyld::LoadContext context;
context.useSearchPaths = true;
context.useFallbackPaths= leafName; // a partial path means no fallback paths
@@ -1473,8 +1515,20 @@
context.canBePIE = true;
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = &callersRPaths; // rpaths from caller and main executable
-
- image = load(path, context);
+
+ unsigned cacheIndex;
+ image = load(path, context, cacheIndex);
+#if SUPPORT_ACCELERATE_TABLES
+ if ( (image != NULL) && (cacheIndex != UINT32_MAX) ) {
+ if ( dyld::makeCacheHandle(image, cacheIndex, mode, &result) ) {
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s(%s) ==> %p\n", __func__, path, result);
+ if ( lockHeld )
+ dyld::gLibSystemHelpers->releaseGlobalDyldLock();
+ return result;
+ }
+ }
+#endif
if ( image != NULL ) {
// bump reference count. Do this before link() so that if an initializer calls dlopen and fails
// this image is not garbage collected
@@ -1483,7 +1537,7 @@
if ( (mode & RTLD_NOLOAD) == 0 ) {
bool alreadyLinked = image->isLinked();
bool forceLazysBound = ( (mode & RTLD_NOW) != 0 );
- dyld::link(image, forceLazysBound, false, callersRPaths);
+ dyld::link(image, forceLazysBound, false, callersRPaths, cacheIndex);
if ( ! alreadyLinked ) {
// only hide exports if image is not already in use
if ( (mode & RTLD_LOCAL) != 0 )
@@ -1600,6 +1654,13 @@
dyld::log("%s(%p, %p)\n", __func__, address, info);
CRSetCrashLogMessage("dyld: in dladdr()");
+#if SUPPORT_ACCELERATE_TABLES
+ if ( dyld::dladdrFromCache(address, info) ) {
+ CRSetCrashLogMessage(NULL);
+ return 1; // success
+ }
+#endif
+
ImageLoader* image = dyld::findImageContainingAddress(address);
if ( image != NULL ) {
info->dli_fname = image->getRealPath();
@@ -1664,11 +1725,22 @@
if ( dyld::gLogAPIs )
dyld::log("%s(%p, %s)\n", __func__, handle, symbolName);
+#if SUPPORT_ACCELERATE_TABLES
+ if ( dyld::gLogAppAPIs ) {
+ void* callerAddress = __builtin_return_address(1); // note layers: 1: real client, 0: libSystem glue
+ const char* shortName;
+ if ( callerIsNonOSApp(callerAddress, &shortName) ) {
+ dyld::log("%s: %s(%p, %s)\n", shortName, __func__, handle, symbolName);
+ }
+ }
+#endif
+
CRSetCrashLogMessage("dyld: in dlsym()");
dlerrorClear();
const ImageLoader* image;
const ImageLoader::Symbol* sym;
+ void* result;
// dlsym() assumes symbolName passed in is same as in C source code
// dyld assumes all symbol names have an underscore prefix
@@ -1680,60 +1752,113 @@
if ( handle == RTLD_DEFAULT ) {
if ( dyld::flatFindExportedSymbol(underscoredName, &sym, &image) ) {
CRSetCrashLogMessage(NULL);
- return (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext);
+ result = (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext, NULL, false, underscoredName);
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s(RTLD_DEFAULT, %s) ==> %p\n", __func__, symbolName, result);
+ return result;
}
const char* str = dyld::mkstringf("dlsym(RTLD_DEFAULT, %s): symbol not found", symbolName);
dlerrorSet(str);
free((void*)str);
CRSetCrashLogMessage(NULL);
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s(RTLD_DEFAULT, %s) ==> NULL\n", __func__, symbolName);
return NULL;
}
// magic "search only main executable" handle
- if ( handle == RTLD_MAIN_ONLY ) {
+ else if ( handle == RTLD_MAIN_ONLY ) {
image = dyld::mainExecutable();
sym = image->findExportedSymbol(underscoredName, true, &image); // search RTLD_FIRST way
if ( sym != NULL ) {
CRSetCrashLogMessage(NULL);
- return (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext);
+ result = (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext, NULL, false, underscoredName);
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s(RTLD_MAIN_ONLY, %s) ==> %p\n", __func__, symbolName, result);
+ return result;
}
const char* str = dyld::mkstringf("dlsym(RTLD_MAIN_ONLY, %s): symbol not found", symbolName);
dlerrorSet(str);
free((void*)str);
CRSetCrashLogMessage(NULL);
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s(RTLD_MAIN_ONLY, %s) ==> NULL\n", __func__, symbolName);
return NULL;
}
// magic "search what I would see" handle
- if ( handle == RTLD_NEXT ) {
+ else if ( handle == RTLD_NEXT ) {
void* callerAddress = __builtin_return_address(1); // note layers: 1: real client, 0: libSystem glue
+#if SUPPORT_ACCELERATE_TABLES
+ const mach_header* mh;
+ const char* path;
+ unsigned index;
+ if ( dyld::addressInCache(callerAddress, &mh, &path, &index) ) {
+ // if dylib in cache is calling dlsym(RTLD_NEXT,xxx) handle search differently
+ result = dyld::dlsymFromCache(RTLD_NEXT, underscoredName, index);
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s(RTLD_NEXT, %s) ==> %p\n", __func__, symbolName, result);
+ return result;
+ }
+#endif
ImageLoader* callerImage = dyld::findImageContainingAddress(callerAddress);
sym = callerImage->findExportedSymbolInDependentImages(underscoredName, dyld::gLinkContext, &image); // don't search image, but do search what it links against
if ( sym != NULL ) {
CRSetCrashLogMessage(NULL);
- return (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext);
+ result = (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext , callerImage, false, underscoredName);
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s(RTLD_NEXT, %s) ==> %p\n", __func__, symbolName, result);
+ return result;
}
const char* str = dyld::mkstringf("dlsym(RTLD_NEXT, %s): symbol not found", symbolName);
dlerrorSet(str);
free((void*)str);
CRSetCrashLogMessage(NULL);
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s(RTLD_NEXT, %s) ==> NULL\n", __func__, symbolName);
return NULL;
}
// magic "search me, then what I would see" handle
- if ( handle == RTLD_SELF ) {
+ else if ( handle == RTLD_SELF ) {
void* callerAddress = __builtin_return_address(1); // note layers: 1: real client, 0: libSystem glue
+#if SUPPORT_ACCELERATE_TABLES
+ const mach_header* mh;
+ const char* path;
+ unsigned index;
+ if ( dyld::addressInCache(callerAddress, &mh, &path, &index) ) {
+ // if dylib in cache is calling dlsym(RTLD_SELF,xxx) handle search differently
+ result = dyld::dlsymFromCache(RTLD_SELF, underscoredName, index);
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s(RTLD_SELF, %s) ==> %p\n", __func__, symbolName, result);
+ return result;
+ }
+#endif
ImageLoader* callerImage = dyld::findImageContainingAddress(callerAddress);
sym = callerImage->findExportedSymbolInImageOrDependentImages(underscoredName, dyld::gLinkContext, &image); // search image and what it links against
if ( sym != NULL ) {
CRSetCrashLogMessage(NULL);
- return (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext);
+ result = (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext, callerImage, false, underscoredName);
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s(RTLD_SELF, %s) ==> %p\n", __func__, symbolName, result);
+ return result;
}
const char* str = dyld::mkstringf("dlsym(RTLD_SELF, %s): symbol not found", symbolName);
dlerrorSet(str);
free((void*)str);
CRSetCrashLogMessage(NULL);
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s(RTLD_SELF, %s) ==> NULL\n", __func__, symbolName);
return NULL;
}
+#if SUPPORT_ACCELERATE_TABLES
+ // check for mega dylib handle
+ else if ( dyld::isCacheHandle(handle) ) {
+ result = dyld::dlsymFromCache(handle, underscoredName, 0);
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s(%p, %s) ==> %p\n", __func__, handle, symbolName, result);
+ return result;
+ }
+#endif
// real handle
image = (ImageLoader*)(((uintptr_t)handle) & (-4)); // clear mode bits
if ( dyld::validImage(image) ) {
@@ -1744,7 +1869,16 @@
if ( sym != NULL ) {
CRSetCrashLogMessage(NULL);
- return (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext);
+ ImageLoader* callerImage = NULL;
+ if ( sDynamicInterposing ) {
+ // only take time to look up caller, if dynamic interposing in use
+ void* callerAddress = __builtin_return_address(1); // note layers: 1: real client, 0: libSystem glue
+ callerImage = dyld::findImageContainingAddress(callerAddress);
+ }
+ result = (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext, callerImage, false, underscoredName);
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s(%p, %s) ==> %p\n", __func__, handle, symbolName, result);
+ return result;
}
const char* str = dyld::mkstringf("dlsym(%p, %s): symbol not found", handle, symbolName);
dlerrorSet(str);
@@ -1754,6 +1888,8 @@
dlerrorSet("invalid handle passed to dlsym()");
}
CRSetCrashLogMessage(NULL);
+ if ( dyld::gLogAPIs )
+ dyld::log(" %s(%p, %s) ==> NULL\n", __func__, handle, symbolName);
return NULL;
}
@@ -1771,12 +1907,17 @@
return dyld::gProcessInfo;
}
-#if !__arm__
+
+#if SUPPORT_ZERO_COST_EXCEPTIONS
static bool client_dyld_find_unwind_sections(void* addr, dyld_unwind_sections* info)
{
//if ( dyld::gLogAPIs )
// dyld::log("%s(%p, %p)\n", __func__, addr, info);
+#if SUPPORT_ACCELERATE_TABLES
+ if ( dyld::findUnwindSections(addr, info) )
+ return true;
+#endif
ImageLoader* image = dyld::findImageContainingAddress(addr);
if ( image != NULL ) {
image->getUnwindInfo(info);
@@ -1787,21 +1928,17 @@
#endif
-void dyld_register_image_state_change_handler(dyld_image_states state, bool batch,
- dyld_image_state_change_handler handler)
-{
- if ( dyld::gLogAPIs )
- dyld::log("%s(%d, %d, %p)\n", __func__, state, batch, handler);
- if ( batch )
- dyld::registerImageStateBatchChangeHandler(state, handler);
- else
- dyld::registerImageStateSingleChangeHandler(state, handler);
-}
-
const char* dyld_image_path_containing_address(const void* address)
{
if ( dyld::gLogAPIs )
dyld::log("%s(%p)\n", __func__, address);
+
+#if SUPPORT_ACCELERATE_TABLES
+ const mach_header* mh;
+ const char* path;
+ if ( dyld::addressInCache(address, &mh, &path) )
+ return path;
+#endif
ImageLoader* image = dyld::findImageContainingAddress(address);
if ( image != NULL )
@@ -1811,7 +1948,6 @@
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
bool dyld_shared_cache_some_image_overridden()
{
#if DYLD_SHARED_CACHE_SUPPORT
@@ -1820,7 +1956,94 @@
return true;
#endif
}
-#endif
-
-
-
+
+
+void dyld_dynamic_interpose(const struct mach_header* mh, const struct dyld_interpose_tuple array[], size_t count)
+{
+ if ( mh == NULL )
+ return;
+ if ( array == NULL )
+ return;
+ if ( count == 0 )
+ return;
+ ImageLoader* image = dyld::findImageByMachHeader(mh);
+ if ( image == NULL )
+ return;
+
+ // make pass at bound references in this image and update them
+ dyld::gLinkContext.dynamicInterposeArray = array;
+ dyld::gLinkContext.dynamicInterposeCount = count;
+ image->dynamicInterpose(dyld::gLinkContext);
+ dyld::gLinkContext.dynamicInterposeArray = NULL;
+ dyld::gLinkContext.dynamicInterposeCount = 0;
+
+ // leave interposing info so any future (lazy) binding will get it too
+ image->addDynamicInterposingTuples(array, count);
+
+ sDynamicInterposing = true;
+}
+
+
+bool _dyld_is_memory_immutable(const void* addr, size_t length)
+{
+ if ( dyld::gLogAPIs )
+ dyld::log("%s(%p, %ld)\n", __func__, addr, length);
+
+ uintptr_t checkStart = (uintptr_t)addr;
+ uintptr_t checkEnd = checkStart + length;
+
+#if DYLD_SHARED_CACHE_SUPPORT
+ // quick check to see if in r/o region of shared cache. If so return true.
+ if ( dyld_shared_cache_ranges.sharedRegionsCount > 2 ) {
+ uintptr_t roStart = dyld_shared_cache_ranges.ranges[0].start;
+ uintptr_t roEnd = roStart + dyld_shared_cache_ranges.ranges[0].length;
+ if ( (roStart < checkStart) && (checkEnd < roEnd) )
+ return true;
+ }
+#endif
+
+ // Otherwise find if addr is in a dyld loaded image
+ ImageLoader* image = dyld::findImageContainingAddress(addr);
+ if ( image != NULL ) {
+ // <rdar://problem/24091154> already checked for r/o portion of cache
+ if ( image->inSharedCache() )
+ return false;
+ if ( !image->neverUnload() )
+ return false;
+ for (unsigned i=0, e=image->segmentCount(); i < e; ++i) {
+ if ( (image->segActualLoadAddress(i) < checkStart) && (checkEnd < image->segActualEndAddress(i)) ) {
+ return !image->segWriteable(i);
+ }
+ }
+ }
+ return false;
+}
+
+
+
+void _dyld_objc_notify_register(_dyld_objc_notify_mapped mapped,
+ _dyld_objc_notify_init init,
+ _dyld_objc_notify_unmapped unmapped)
+{
+ dyld::registerObjCNotifiers(mapped, init, unmapped);
+}
+
+
+bool _dyld_get_shared_cache_uuid(uuid_t uuid)
+{
+ return dyld::sharedCacheUUID(uuid);
+}
+
+const void* _dyld_get_shared_cache_range(size_t* length)
+{
+#if DYLD_SHARED_CACHE_SUPPORT
+ uintptr_t cacheEndAddr = (dyld_shared_cache_ranges.ranges[2].start + dyld_shared_cache_ranges.ranges[2].length);
+ *length = cacheEndAddr - dyld_shared_cache_ranges.ranges[0].start;
+ return (void*)(dyld_shared_cache_ranges.ranges[0].start);
+#else
+ return NULL;
+#endif
+}
+
+
+