Loading...
--- dyld/dyld-421.2/src/dyldAPIs.cpp
+++ dyld/dyld-195.6/src/dyldAPIs.cpp
@@ -51,7 +51,6 @@
#include "mach-o/dyld_priv.h"
#include "ImageLoader.h"
-#include "ImageLoaderMachO.h"
#include "dyld.h"
#include "dyldLibSystemInterface.h"
@@ -63,10 +62,6 @@
// 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
@@ -75,7 +70,6 @@
#define DEPRECATED_APIS_SUPPORTED 1
#endif
-static bool sDynamicInterposing = false;
#if DEPRECATED_APIS_SUPPORTED
static char sLastErrorFilePath[1024];
@@ -86,7 +80,8 @@
// In 10.3.x and earlier all the NSObjectFileImage API's were implemeneted in libSystem.dylib
// Beginning in 10.4 the NSObjectFileImage API's are implemented in dyld and libSystem just forwards
// This conditional keeps support for old libSystem's which needed some help implementing the API's
-#define OLD_LIBSYSTEM_SUPPORT (__i386__)
+#define OLD_LIBSYSTEM_SUPPORT (__ppc__ || __i386__)
+
// The following functions have no prototype in any header. They are special cases
// where _dyld_func_lookup() is used directly.
@@ -106,10 +101,8 @@
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 SUPPORT_ZERO_COST_EXCEPTIONS
+#if !__arm__
static bool client_dyld_find_unwind_sections(void* addr, dyld_unwind_sections* info);
-#endif
-#if DEPRECATED_APIS_SUPPORTED
#endif
static void unimplemented()
@@ -139,31 +132,26 @@
{"__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 SUPPORT_ZERO_COST_EXCEPTIONS
+#if !__arm__
{"__dyld_find_unwind_sections", (void*)client_dyld_find_unwind_sections },
#endif
-#if __i386__ || __x86_64__ || __arm__ || __arm64__
+#if __i386__ || __x86_64__ || __arm__
{"__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 },
- {"__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 },
-
// 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 },
@@ -252,9 +240,6 @@
const void* imageBaseAddress; // not used with OFI created from files
size_t imageLength; // not used with OFI created from files
};
-
-
-VECTOR_NEVER_DESTRUCTED(NSObjectFileImage);
static std::vector<NSObjectFileImage> sObjectFileImages;
@@ -295,7 +280,7 @@
dyld::log("%s(...)\n", __func__);
const char* exePath = dyld::getExecutablePath();
if(*bufsize < strlen(exePath) + 1){
- *bufsize = (uint32_t)(strlen(exePath) + 1);
+ *bufsize = strlen(exePath) + 1;
return -1;
}
strcpy(buf, exePath);
@@ -306,23 +291,27 @@
{
if ( dyld::gLogAPIs )
dyld::log("%s()\n", __func__);
- return allImagesCount();
+ return dyld::getImageCount();
}
const struct mach_header* _dyld_get_image_header(uint32_t image_index)
{
if ( dyld::gLogAPIs )
dyld::log("%s(%u)\n", __func__, image_index);
- return allImagesIndexedMachHeader(image_index);
+ ImageLoader* image = dyld::getIndexedImage(image_index);
+ if ( image != NULL )
+ return (struct mach_header*)image->machHeader();
+ else
+ return NULL;
}
intptr_t _dyld_get_image_vmaddr_slide(uint32_t image_index)
{
if ( dyld::gLogAPIs )
dyld::log("%s(%u)\n", __func__, image_index);
- const struct mach_header* mh = allImagesIndexedMachHeader(image_index);
- if ( mh != NULL )
- return ImageLoaderMachO::computeSlide(mh);
+ ImageLoader* image = dyld::getIndexedImage(image_index);
+ if ( image != NULL )
+ return image->getSlide();
else
return 0;
}
@@ -331,7 +320,11 @@
{
if ( dyld::gLogAPIs )
dyld::log("%s(%p)\n", __func__, mh);
- return ImageLoaderMachO::computeSlide(mh);
+ ImageLoader* image = dyld::findImageByMachHeader(mh);
+ if ( image != NULL )
+ return image->getSlide();
+ else
+ return 0;
}
@@ -339,19 +332,17 @@
{
if ( dyld::gLogAPIs )
dyld::log("%s(%u)\n", __func__, image_index);
- return allImagesIndexedPath(image_index);
-}
-
-const struct mach_header * dyld_image_header_containing_address(const void* address)
+ ImageLoader* image = dyld::getIndexedImage(image_index);
+ if ( image != NULL )
+ return image->getPath();
+ else
+ return NULL;
+}
+
+const struct mach_header * _dyld_get_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();
@@ -547,13 +538,12 @@
context.canBePIE = false;
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = &callersRPaths; // rpaths from caller and main executable
-
- unsigned cacheIndex;
- image = load(path, context, cacheIndex);
+
+ image = load(path, context);
if ( image != NULL ) {
if ( context.matchByInstallName )
image->setMatchInstallPath(true);
- dyld::link(image, false, false, callersRPaths, cacheIndex);
+ dyld::link(image, false, callersRPaths);
dyld::runInitializers(image);
// images added with NSAddImage() can never be unloaded
image->setNeverUnload();
@@ -592,7 +582,7 @@
const bool dontLoad = ( (options & NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED) != 0 );
const bool search = ( (options & NSADDIMAGE_OPTION_WITH_SEARCHING) != 0 );
const bool matchInstallName = ( (options & NSADDIMAGE_OPTION_MATCH_FILENAME_BY_INSTALLNAME) != 0 );
- const bool abortOnError = ( (options & (NSADDIMAGE_OPTION_RETURN_ON_ERROR|NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED)) == 0 );
+ const bool abortOnError = ( (options & NSADDIMAGE_OPTION_RETURN_ON_ERROR|NSADDIMAGE_OPTION_RETURN_ONLY_IF_LOADED) == 0 );
void* callerAddress = __builtin_return_address(1); // note layers: 1: real client, 0: libSystem glue
return addImage(callerAddress, path, search, dontLoad, matchInstallName, abortOnError);
}
@@ -798,8 +788,7 @@
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = NULL; // support not yet implemented
- unsigned cacheIndex;
- ImageLoader* image = dyld::load(pathName, context, cacheIndex);
+ ImageLoader* image = dyld::load(pathName, context);
// Note: We DO NOT link the image! NSLinkModule will do that
if ( image != NULL ) {
if ( !image->isBundle() ) {
@@ -984,9 +973,6 @@
dyld::clearErrorMessage();
try {
- if ( (options & NSLINKMODULE_OPTION_CAN_UNLOAD) != 0 )
- objectFileImage->image->setCanUnload();
-
// NSLinkModule allows a bundle to be link multpile times
// each link causes the bundle to be copied to a new address
if ( objectFileImage->image->isLinked() ) {
@@ -1013,7 +999,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), UINT32_MAX);
+ dyld::link(objectFileImage->image, forceLazysBound, ImageLoader::RPathChain(NULL,NULL));
// bump reference count to keep this bundle from being garbage collected
objectFileImage->image->incrementDlopenReferenceCount();
@@ -1059,7 +1045,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), UINT32_MAX);
+ dyld::link(image, forceLazysBound, ImageLoader::RPathChain(NULL,NULL));
// run initializers unless magic flag says not to
if ( (options & NSLINKMODULE_OPTION_DONT_CALL_MOD_INIT_ROUTINES) == 0 )
@@ -1122,19 +1108,6 @@
ImageLoader* image = NSModuleToImageLoader(module);
if ( image == NULL )
return false;
- 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 )
@@ -1210,11 +1183,34 @@
// If dyld is sending load/unload notices to CoreSymbolication, the shared memory
// page is not copied on fork. <rdar://problem/6797342>
// NULL the CoreSymbolication shared memory pointer to prevent a crash.
- dyld::gProcessInfo->coreSymbolicationShmPage = NULL;
+ dyld_all_image_infos.coreSymbolicationShmPage = NULL;
// for safety, make sure child starts with clean systemOrderFlag
- dyld::gProcessInfo->systemOrderFlag = 0;
-}
-
+ dyld_all_image_infos.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
@@ -1249,13 +1245,13 @@
#endif // DEPRECATED_APIS_SUPPORTED
-int _dyld_func_lookup(const char* name, void** address)
+bool lookupDyldFunction(const char* name, uintptr_t* 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 = p->implementation;
+ *address = (uintptr_t)p->implementation;
return true;
}
}
@@ -1268,7 +1264,10 @@
{
dyld::gLibSystemHelpers = helpers;
-#if !SUPPORT_ZERO_COST_EXCEPTIONS
+ // let gdb know it is safe to run code in inferior that might call malloc()
+ dyld_all_image_infos.libSystemInitialized = true;
+
+#if __arm__
if ( helpers->version >= 5 ) {
// create key use by dyld exception handling
pthread_key_t key;
@@ -1283,13 +1282,6 @@
static void dlerrorClear()
{
if ( dyld::gLibSystemHelpers != NULL ) {
- // <rdar://problem/10595338> dlerror buffer leak
- // dlerrorClear() should not force allocation, but zero it if already allocated
- if ( dyld::gLibSystemHelpers->version >= 10 ) {
- if ( ! (*dyld::gLibSystemHelpers->hasPerThreadBufferFor_dlerror)() )
- return;
- }
-
// first char of buffer is flag whether string (starting at second char) is valid
char* buffer = (*dyld::gLibSystemHelpers->getThreadBufferFor_dlerror)(2);
buffer[0] = '\0';
@@ -1315,42 +1307,14 @@
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;
@@ -1366,6 +1330,29 @@
}
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
@@ -1378,11 +1365,10 @@
context.canBePIE = true;
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = &callersRPaths; // rpaths from caller and main executable
-
- unsigned cacheIndex;
- image = load(path, context, cacheIndex);
+
+ image = load(path, context);
if ( image != NULL ) {
- dyld::preflight(image, callersRPaths, cacheIndex); // image object deleted by dyld::preflight()
+ dyld::preflight(image, callersRPaths); // image object deleted by dyld::preflight()
result = true;
}
}
@@ -1401,43 +1387,14 @@
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
@@ -1456,52 +1413,42 @@
}
void* result = NULL;
- const bool leafName = (strchr(path, '/') == NULL);
- const bool absolutePath = (path[0] == '/');
+ ImageLoader* image = NULL;
+ std::vector<const char*> 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);
+ }
+
+ 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;
+ 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);
- 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);
- }
-
dyld::LoadContext context;
context.useSearchPaths = true;
context.useFallbackPaths= leafName; // a partial path means no fallback paths
@@ -1514,20 +1461,8 @@
context.canBePIE = true;
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = &callersRPaths; // rpaths from caller and main executable
-
- 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
+
+ image = load(path, context);
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
@@ -1536,7 +1471,7 @@
if ( (mode & RTLD_NOLOAD) == 0 ) {
bool alreadyLinked = image->isLinked();
bool forceLazysBound = ( (mode & RTLD_NOW) != 0 );
- dyld::link(image, forceLazysBound, false, callersRPaths, cacheIndex);
+ dyld::link(image, forceLazysBound, callersRPaths);
if ( ! alreadyLinked ) {
// only hide exports if image is not already in use
if ( (mode & RTLD_LOCAL) != 0 )
@@ -1582,12 +1517,9 @@
// load() succeeded but, link() failed
// back down reference count and do GC
image->decrementDlopenReferenceCount();
- if ( image->dlopenCount() == 0 )
- dyld::garbageCollectImages();
+ dyld::garbageCollectImages();
}
const char* str = dyld::mkstringf("dlopen(%s, %d): %s", path, mode, msg);
- if ( dyld::gLogAPIs )
- dyld::log(" %s() failed, error: '%s'\n", __func__, str);
dlerrorSet(str);
free((void*)str);
free((void*)msg); // our free() will do nothing if msg is a string literal
@@ -1608,8 +1540,6 @@
CRSetCrashLogMessage(NULL);
dyld::gLibSystemHelpers->releaseGlobalDyldLock();
}
- if ( dyld::gLogAPIs && (result != NULL) )
- dyld::log(" %s(%s) ==> %p\n", __func__, path, result);
return result;
}
@@ -1635,8 +1565,7 @@
return -1;
}
// remove image if reference count went to zero
- if ( image->dlopenCount() == 0 )
- dyld::garbageCollectImages();
+ dyld::garbageCollectImages();
return 0;
}
else {
@@ -1653,16 +1582,9 @@
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();
+ info->dli_fname = image->getPath();
info->dli_fbase = (void*)image->machHeader();
if ( address == info->dli_fbase ) {
// special case lookup of header
@@ -1673,13 +1595,6 @@
}
// find closest symbol in the image
info->dli_sname = image->findClosestSymbol(address, (const void**)&info->dli_saddr);
- // never return the mach_header symbol
- if ( info->dli_saddr == info->dli_fbase ) {
- info->dli_sname = NULL;
- info->dli_saddr = NULL;
- CRSetCrashLogMessage(NULL);
- return 1; // success
- }
if ( info->dli_sname != NULL ) {
if ( info->dli_sname[0] == '_' )
info->dli_sname = info->dli_sname +1; // strip off leading underscore
@@ -1703,12 +1618,6 @@
dyld::log("%s()\n", __func__);
if ( dyld::gLibSystemHelpers != NULL ) {
- // if using newer libdyld.dylib and buffer if buffer not yet allocated, return NULL
- if ( dyld::gLibSystemHelpers->version >= 10 ) {
- if ( ! (*dyld::gLibSystemHelpers->hasPerThreadBufferFor_dlerror)() )
- return NULL;
- }
-
// first char of buffer is flag whether string (starting at second char) is valid
char* buffer = (*dyld::gLibSystemHelpers->getThreadBufferFor_dlerror)(2);
if ( buffer[0] != '\0' ) { // if valid buffer
@@ -1724,22 +1633,11 @@
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
@@ -1751,113 +1649,68 @@
if ( handle == RTLD_DEFAULT ) {
if ( dyld::flatFindExportedSymbol(underscoredName, &sym, &image) ) {
CRSetCrashLogMessage(NULL);
- 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;
+ return (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext);
}
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
- else if ( handle == RTLD_MAIN_ONLY ) {
+ if ( handle == RTLD_MAIN_ONLY ) {
image = dyld::mainExecutable();
sym = image->findExportedSymbol(underscoredName, true, &image); // search RTLD_FIRST way
if ( sym != NULL ) {
CRSetCrashLogMessage(NULL);
- 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;
+ return (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext);
}
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
- else if ( handle == RTLD_NEXT ) {
+ if ( handle == RTLD_NEXT ) {
+#if __ppc__
+ // <rdar://problem/7628929> work around for llvmgcc bug
+ void* fa = __builtin_frame_address(0);
+ fa = *(void**)fa;
+ fa = *(void**)fa;
+ void* callerAddress = *((void**)(((int)fa)+8));
+#else
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);
- 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;
+ return (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext);
}
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
- else if ( handle == RTLD_SELF ) {
+ 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);
- 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;
+ return (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext);
}
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) ) {
@@ -1868,16 +1721,7 @@
if ( sym != NULL ) {
CRSetCrashLogMessage(NULL);
- 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;
+ return (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext);
}
const char* str = dyld::mkstringf("dlsym(%p, %s): symbol not found", handle, symbolName);
dlerrorSet(str);
@@ -1887,8 +1731,6 @@
dlerrorSet("invalid handle passed to dlsym()");
}
CRSetCrashLogMessage(NULL);
- if ( dyld::gLogAPIs )
- dyld::log(" %s(%p, %s) ==> NULL\n", __func__, handle, symbolName);
return NULL;
}
@@ -1903,20 +1745,15 @@
const struct dyld_all_image_infos* _dyld_get_all_image_infos()
{
- return dyld::gProcessInfo;
-}
-
-
-#if SUPPORT_ZERO_COST_EXCEPTIONS
+ return &dyld_all_image_infos;
+}
+
+#if !__arm__
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);
@@ -1927,108 +1764,36 @@
#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 )
- return image->getRealPath();
+ return image->getPath();
return NULL;
}
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
bool dyld_shared_cache_some_image_overridden()
{
- #if DYLD_SHARED_CACHE_SUPPORT
return dyld::gSharedCacheOverridden;
- #else
- return true;
- #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);
-}
+
+