Loading...
--- dyld/dyld-239.4/src/dyldAPIs.cpp
+++ dyld/dyld-95.3/src/dyldAPIs.cpp
@@ -1,6 +1,6 @@
/* -*- mode: C++; c-basic-offset: 4; tab-width: 4 -*-
*
- * Copyright (c) 2004-2009 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
@@ -33,7 +33,6 @@
#include <string.h>
#include <sys/param.h>
#include <sys/mount.h>
-#include <Availability.h>
#include <vector>
@@ -43,12 +42,13 @@
#include <mach/mach.h>
#include <sys/time.h>
#include <sys/sysctl.h>
-#include <mach/mach_traps.h> // for task_self_trap()
-
+
+extern "C" mach_port_name_t task_self_trap(void); // can't include <System/mach/mach_traps.h> because it is missing extern C
#include "mach-o/dyld_images.h"
#include "mach-o/dyld.h"
#include "mach-o/dyld_priv.h"
+#include "mach-o/dyld-update-prebinding.h"
#include "ImageLoader.h"
#include "dyld.h"
@@ -57,52 +57,41 @@
#undef _POSIX_C_SOURCE
#include "dlfcn.h"
-// from dyldExceptions.c
-extern "C" void __Unwind_SjLj_SetThreadKey(pthread_key_t key);
-
-// from dyld_gdb.cpp
-extern void addImagesToAllImages(uint32_t infoCount, const dyld_image_info info[]);
-
-// deprecated APIs are still availble on Mac OS X, but not on iPhone OS
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
- #define DEPRECATED_APIS_SUPPORTED 0
-#else
- #define DEPRECATED_APIS_SUPPORTED 1
+
+#ifndef RTLD_DLL
+ #define RTLD_DLL 0x200 /* Mac OS X 10.5 and later */
#endif
-
-#if DEPRECATED_APIS_SUPPORTED
static char sLastErrorFilePath[1024];
static NSLinkEditErrors sLastErrorFileCode;
static int sLastErrorNo;
-#endif
+
// 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.
-static void _dyld_make_delayed_module_initializer_calls();
-static void registerThreadHelpers(const dyld::LibSystemHelpers*);
-#if DEPRECATED_APIS_SUPPORTED
static void _dyld_install_handlers(void* undefined, void* multiple, void* linkEdit);
#if OLD_LIBSYSTEM_SUPPORT
static NSModule _dyld_link_module(NSObjectFileImage object_addr, size_t object_size, const char* moduleName, uint32_t options);
#endif
static void _dyld_register_binding_handler(void * (*)(const char *, const char *, void *), ImageLoader::BindingOptions);
+static void _dyld_fork_child();
+static void _dyld_make_delayed_module_initializer_calls();
static bool NSMakePrivateModulePublic(NSModule module);
static void _dyld_call_module_initializers_for_dylib(const struct mach_header* mh_dylib_header);
+static void registerThreadHelpers(const dyld::LibSystemHelpers*);
+static const struct dyld_all_image_infos* _dyld_get_all_image_infos();
// The following functions are dyld API's, but since dyld links with a static copy of libc.a
// the public name cannot be used.
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__
-static bool client_dyld_find_unwind_sections(void* addr, dyld_unwind_sections* info);
-#endif
+
static void unimplemented()
{
@@ -115,43 +104,26 @@
};
static struct dyld_func dyld_funcs[] = {
+ {"__dyld_register_thread_helpers", (void*)registerThreadHelpers },
{"__dyld_register_func_for_add_image", (void*)_dyld_register_func_for_add_image },
{"__dyld_register_func_for_remove_image", (void*)_dyld_register_func_for_remove_image },
+ {"__dyld_make_delayed_module_initializer_calls", (void*)_dyld_make_delayed_module_initializer_calls },
+ {"__dyld_fork_child", (void*)_dyld_fork_child },
+ {"__dyld_dyld_register_image_state_change_handler", (void*)dyld_register_image_state_change_handler },
{"__dyld_dladdr", (void*)dladdr },
{"__dyld_dlclose", (void*)dlclose },
{"__dyld_dlerror", (void*)dlerror },
{"__dyld_dlopen", (void*)dlopen },
{"__dyld_dlsym", (void*)dlsym },
{"__dyld_dlopen_preflight", (void*)dlopen_preflight },
+ {"__dyld_get_image_header_containing_address", (void*)_dyld_get_image_header_containing_address },
{"__dyld_image_count", (void*)_dyld_image_count },
{"__dyld_get_image_header", (void*)_dyld_get_image_header },
{"__dyld_get_image_vmaddr_slide", (void*)_dyld_get_image_vmaddr_slide },
{"__dyld_get_image_name", (void*)_dyld_get_image_name },
- {"__dyld_get_image_slide", (void*)_dyld_get_image_slide },
{"__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__
- {"__dyld_find_unwind_sections", (void*)client_dyld_find_unwind_sections },
-#endif
-#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 },
-#endif
- {"__dyld_process_is_restricted", (void*)dyld::processIsRestricted },
-
- // deprecated
-#if DEPRECATED_APIS_SUPPORTED
- {"__dyld_get_image_header_containing_address", (void*)_dyld_get_image_header_containing_address },
+
+ // the rest of these are either deprecated or SPIs
{"__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 },
@@ -161,6 +133,7 @@
{"__dyld_bind_objc_module", (void*)_dyld_bind_objc_module },
{"__dyld_bind_fully_image_containing_address", (void*)_dyld_bind_fully_image_containing_address },
{"__dyld_image_containing_address", (void*)_dyld_image_containing_address },
+ {"__dyld_moninit", (void*)_dyld_moninit },
{"__dyld_register_binding_handler", (void*)_dyld_register_binding_handler },
{"__dyld_NSNameOfSymbol", (void*)NSNameOfSymbol },
{"__dyld_NSAddressOfSymbol", (void*)NSAddressOfSymbol },
@@ -181,6 +154,7 @@
{"__dyld_launched_prebound", (void*)_dyld_launched_prebound },
{"__dyld_all_twolevel_modules_prebound", (void*)_dyld_all_twolevel_modules_prebound },
{"__dyld_call_module_initializers_for_dylib", (void*)_dyld_call_module_initializers_for_dylib },
+ {"__dyld_install_link_edit_symbol_handlers", (void*)dyld::registerZeroLinkHandlers },
{"__dyld_NSCreateObjectFileImageFromFile", (void*)NSCreateObjectFileImageFromFile },
{"__dyld_NSCreateObjectFileImageFromMemory", (void*)NSCreateObjectFileImageFromMemory },
{"__dyld_NSDestroyObjectFileImage", (void*)NSDestroyObjectFileImage },
@@ -192,23 +166,16 @@
{"__dyld_NSSymbolReferenceNameInObjectFileImage", (void*)NSSymbolReferenceNameInObjectFileImage },
{"__dyld_NSSymbolReferenceCountInObjectFileImage", (void*)NSSymbolReferenceCountInObjectFileImage },
{"__dyld_NSGetSectionDataInObjectFileImage", (void*)NSGetSectionDataInObjectFileImage },
+ {"__dyld_NSFindSectionAndOffsetInObjectFileImage", (void*)NSFindSectionAndOffsetInObjectFileImage },
#if OLD_LIBSYSTEM_SUPPORT
{"__dyld_link_module", (void*)_dyld_link_module },
#endif
-#endif //DEPRECATED_APIS_SUPPORTED
-
+ {"__dyld_dlord", (void*)dlord },
+ {"__dyld_get_all_image_infos", (void*)_dyld_get_all_image_infos },
{NULL, 0}
};
-
-#if DEPRECATED_APIS_SUPPORTED
-
-static void dyldAPIhalt(const char* apiName, const char* errorMsg)
-{
- dyld::log("dyld: %s() error\n", apiName);
- dyld::halt(errorMsg);
-}
// dyld's abstract type NSSymbol is implemented as const ImageLoader::Symbol*
inline NSSymbol SymbolToNSSymbol(const ImageLoader::Symbol* sym)
@@ -240,9 +207,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;
@@ -255,6 +219,13 @@
//
+static void dyldAPIhalt(const char* apiName, const char* errorMsg)
+{
+ dyld::log("dyld: %s() error\n", apiName);
+ dyld::halt(errorMsg);
+}
+
+
static void setLastError(NSLinkEditErrors code, int errnum, const char* file, const char* message)
{
@@ -265,7 +236,6 @@
sLastErrorNo = errnum;
}
-#endif // DEPRECATED_APIS_SUPPORTED
/*
*_dyld_NSGetExecutablePath is the dyld side of _NSGetExecutablePath which
@@ -290,100 +260,6 @@
return 0;
}
-uint32_t _dyld_image_count(void)
-{
- if ( dyld::gLogAPIs )
- dyld::log("%s()\n", __func__);
- 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);
- 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);
- ImageLoader* image = dyld::getIndexedImage(image_index);
- if ( image != NULL )
- return image->getSlide();
- else
- return 0;
-}
-
-intptr_t _dyld_get_image_slide(const struct mach_header* mh)
-{
- if ( dyld::gLogAPIs )
- dyld::log("%s(%p)\n", __func__, mh);
- ImageLoader* image = dyld::findImageByMachHeader(mh);
- if ( image != NULL )
- return image->getSlide();
- else
- return 0;
-}
-
-
-const char* _dyld_get_image_name(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->getRealPath();
- 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);
- ImageLoader* image = dyld::findImageContainingAddress(address);
- if ( image != NULL )
- return image->machHeader();
- return NULL;
-}
-
-
-void _dyld_register_func_for_add_image(void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide))
-{
- if ( dyld::gLogAPIs )
- dyld::log("%s(%p)\n", __func__, (void *)func);
- dyld::registerAddCallback(func);
-}
-
-void _dyld_register_func_for_remove_image(void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide))
-{
- if ( dyld::gLogAPIs )
- dyld::log("%s(%p)\n", __func__, (void *)func);
- dyld::registerRemoveCallback(func);
-}
-
-
-
-// called by crt before main() by programs linked with 10.4 or earlier crt1.o
-static void _dyld_make_delayed_module_initializer_calls()
-{
- if ( dyld::gLogAPIs )
- dyld::log("%s()\n", __func__);
-
-#if SUPPORT_OLD_CRT_INITIALIZATION
- if ( dyld::gRunInitializersOldWay )
- dyld::initializeMainExecutable();
-#endif
-}
-
-
-
-#if DEPRECATED_APIS_SUPPORTED
//
// _dyld_call_module_initializers_for_dylib() is the dyld side of
@@ -511,7 +387,23 @@
return NULL;
}
-
+uint32_t _dyld_image_count(void)
+{
+ if ( dyld::gLogAPIs )
+ dyld::log("%s()\n", __func__);
+ 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);
+ ImageLoader* image = dyld::getIndexedImage(image_index);
+ if ( image != NULL )
+ return (struct mach_header*)image->machHeader();
+ else
+ return NULL;
+}
static __attribute__((noinline))
@@ -531,14 +423,13 @@
}
dyld::LoadContext context;
context.useSearchPaths = search;
- context.useFallbackPaths = search;
context.useLdLibraryPath = false;
context.implicitRPath = false;
context.matchByInstallName = matchInstallName;
context.dontLoad = dontLoad;
context.mustBeBundle = false;
context.mustBeDylib = true;
- context.canBePIE = false;
+ context.findDLL = false;
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = &callersRPaths; // rpaths from caller and main executable
@@ -546,7 +437,7 @@
if ( image != NULL ) {
if ( context.matchByInstallName )
image->setMatchInstallPath(true);
- dyld::link(image, false, false, callersRPaths);
+ dyld::link(image, false, callersRPaths);
dyld::runInitializers(image);
// images added with NSAddImage() can never be unloaded
image->setNeverUnload();
@@ -563,7 +454,7 @@
}
// not halting, so set error state for NSLinkEditError to find
setLastError(NSLinkEditOtherError, 0, path, msg);
- free((void*)msg); // our free() will do nothing if msg is a string literal
+ free((void*)msg);
image = NULL;
}
// free rpaths (getRPaths() malloc'ed each string)
@@ -585,7 +476,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);
}
@@ -618,12 +509,11 @@
dyld::log("%s(%p, \"%s\")\n", __func__, (void *)mh, symbolName);
ImageLoader* image = dyld::findImageByMachHeader(mh);
if ( image != NULL ) {
- if ( image->findExportedSymbol(symbolName, true, NULL) != NULL)
+ if ( image->findExportedSymbol(symbolName, NULL, true, NULL) != NULL)
return true;
}
return false;
}
-
NSSymbol NSLookupSymbolInImage(const struct mach_header* mh, const char* symbolName, uint32_t options)
{
@@ -646,7 +536,7 @@
dyldAPIhalt(__func__, msg);
}
}
- symbol = image->findExportedSymbol(symbolName, true, NULL);
+ symbol = image->findExportedSymbol(symbolName, NULL, true, NULL);
}
if ( dyld::gLogAPIs && (symbol == NULL) )
dyld::log("%s(%p, \"%s\", 0x%08X) ==> NULL\n", __func__, mh, symbolName, options);
@@ -686,7 +576,7 @@
if ( dyld::gLogAPIs )
dyld::log("%s(%p)\n", __func__, (void *)symbol);
const char* result = NULL;
- ImageLoader* image = dyld::findImageContainingSymbol(symbol);
+ ImageLoader* image = dyld::findImageContainingAddress(symbol);
if ( image != NULL )
result = image->getExportedSymbolName(NSSymbolToSymbol(symbol));
return result;
@@ -696,10 +586,8 @@
{
if ( dyld::gLogAPIs )
dyld::log("%s(%p)\n", __func__, (void *)symbol);
- if ( symbol == NULL )
- return NULL;
void* result = NULL;
- ImageLoader* image = dyld::findImageContainingSymbol(symbol);
+ ImageLoader* image = dyld::findImageContainingAddress(symbol);
if ( image != NULL )
result = (void*)image->getExportedSymbolAddress(NSSymbolToSymbol(symbol), dyld::gLinkContext);
return result;
@@ -710,20 +598,42 @@
if ( dyld::gLogAPIs )
dyld::log("%s(%p)\n", __func__, (void *)symbol);
NSModule result = NULL;
- ImageLoader* image = dyld::findImageContainingSymbol(symbol);
+ ImageLoader* image = dyld::findImageContainingAddress(symbol);
if ( image != NULL )
result = ImageLoaderToNSModule(image);
return result;
}
+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();
+ else
+ return 0;
+}
+
+const char* _dyld_get_image_name(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->getLogicalPath();
+ else
+ return NULL;
+}
+
bool _dyld_all_twolevel_modules_prebound(void)
{
if ( dyld::gLogAPIs )
dyld::log("%s()\n", __func__);
- return FALSE;
+ return FALSE; // fixme
}
void _dyld_bind_objc_module(const void *objc_module)
@@ -780,14 +690,13 @@
dyld::LoadContext context;
context.useSearchPaths = false;
- context.useFallbackPaths = false;
context.useLdLibraryPath = false;
context.implicitRPath = false;
context.matchByInstallName = false;
context.dontLoad = false;
context.mustBeBundle = true;
context.mustBeDylib = false;
- context.canBePIE = false;
+ context.findDLL = false;
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = NULL; // support not yet implemented
@@ -860,7 +769,7 @@
// and we should delete it
bool linkedImage = dyld::validImage(objectFileImage->image);
if ( ! linkedImage ) {
- ImageLoader::deleteImage(objectFileImage->image);
+ delete objectFileImage->image;
objectFileImage->image = NULL;
}
}
@@ -876,16 +785,7 @@
// if object was created from a memory, release that memory
// NOTE: this is the way dyld has always done this. NSCreateObjectFileImageFromMemory() hands over ownership of the memory to dyld
if ( objectFileImage->imageBaseAddress != NULL ) {
- bool freed = false;
- if ( (dyld::gLibSystemHelpers != NULL) && (dyld::gLibSystemHelpers->version >= 6) ) {
- size_t sz = (*dyld::gLibSystemHelpers->malloc_size)(objectFileImage->imageBaseAddress);
- if ( sz != 0 ) {
- (*dyld::gLibSystemHelpers->free)((void*)(objectFileImage->imageBaseAddress));
- freed = true;
- }
- }
- if ( ! freed )
- vm_deallocate(mach_task_self(), (vm_address_t)objectFileImage->imageBaseAddress, objectFileImage->imageLength);
+ vm_deallocate(mach_task_self(), (vm_address_t)objectFileImage->imageBaseAddress, objectFileImage->imageLength);
}
// free ofi object
@@ -932,7 +832,7 @@
dyld::log("%s(%p,%d)\n", __func__, objectFileImage, ordinal);
const ImageLoader::Symbol* sym = objectFileImage->image->getIndexedImportedSymbol(ordinal);
if ( tentative_definition != NULL ) {
- ImageLoader::ReferenceFlags flags = objectFileImage->image->getImportedSymbolInfo(sym);
+ ImageLoader::ReferenceFlags flags = objectFileImage->image->geImportedSymbolInfo(sym);
if ( (flags & ImageLoader::kTentativeDefinition) != 0 )
*tentative_definition = true;
else
@@ -963,8 +863,32 @@
{
if ( dyld::gLogAPIs )
dyld::log("%s(%p,%s)\n", __func__, objectFileImage, symbolName);
- const ImageLoader::Symbol* sym = objectFileImage->image->findExportedSymbol(symbolName, true, NULL);
+ const ImageLoader::Symbol* sym = objectFileImage->image->findExportedSymbol(symbolName, NULL, true, NULL);
return ( sym != NULL );
+}
+
+/*
+ * Given an imageOffset into an ObjectFileImage, returns
+ * the segment/section name and offset into that section of
+ * that imageOffset. Returns FALSE if the imageOffset is not
+ * in any section. You can used the resulting sectionOffset to
+ * index into the data returned by NSGetSectionDataInObjectFileImage.
+ *
+ * First appeared in Mac OS X 10.3
+ *
+ * SPI: currently only used by ZeroLink to detect +load methods
+ */
+bool
+NSFindSectionAndOffsetInObjectFileImage(NSObjectFileImage objectFileImage,
+ unsigned long imageOffset,
+ const char** segmentName, /* can be NULL */
+ const char** sectionName, /* can be NULL */
+ unsigned long* sectionOffset) /* can be NULL */
+{
+ if ( dyld::gLogAPIs )
+ dyld::log("%s(%p)\n", __func__, objectFileImage);
+
+ return objectFileImage->image->findSection(((char*)(objectFileImage->image->machHeader()))+imageOffset, segmentName, sectionName, sectionOffset);
}
@@ -976,26 +900,28 @@
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() ) {
// already linked, so clone a new one and link it
+#if 0
+ dyld::warn("%s(0x%08X, \"%s\", 0x%08X) called more than once for 0x%08X\n",
+ __func__, objectFileImage, moduleName, options, objectFileImage);
+#endif
objectFileImage->image = dyld::cloneImage(objectFileImage->image);
}
- // for memory based images, set moduleName as the name anyone calling _dyld_get_image_name() will see
- if ( objectFileImage->image->getPath() == NULL ) {
- objectFileImage->image->setPath(moduleName);
- // <rdar://problem/8812589> dyld has NULL paths in image info array
- dyld_image_info info;
- info.imageLoadAddress = objectFileImage->image->machHeader();
- info.imageFilePath = moduleName;
- info.imageFileModDate = 0;
- addImagesToAllImages(1, &info);
- }
+ // if this ofi was made with NSCreateObjectFileImageFromFile() then physical path is already set
+ // if this ofi was create with NSCreateObjectFileImageFromMemory() then the phyiscal path should be set if supplied
+ if ( (options & NSLINKMODULE_OPTION_TRAILING_PHYS_NAME) != 0 ) {
+ if ( objectFileImage->imageBaseAddress != NULL ) {
+ const char* physEnd = &moduleName[strlen(moduleName)+1];
+ objectFileImage->image->setPath(physEnd);
+ }
+ }
+
+ // set moduleName as the name anyone calling _dyld_get_image_name() will see
+ objectFileImage->image->setLogicalPath(moduleName);
// support private bundles
if ( (options & NSLINKMODULE_OPTION_PRIVATE) != 0 )
@@ -1005,14 +931,14 @@
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, ImageLoader::RPathChain(NULL,NULL));
- // bump reference count to keep this bundle from being garbage collected
- objectFileImage->image->incrementDlopenReferenceCount();
-
// run initializers unless magic flag says not to
if ( (options & NSLINKMODULE_OPTION_DONT_CALL_MOD_INIT_ROUTINES) == 0 )
dyld::runInitializers(objectFileImage->image);
+
+ // bump reference count to keep this bundle from being garbage collected
+ objectFileImage->image->incrementDlopenReferenceCount();
return ImageLoaderToNSModule(objectFileImage->image);
}
@@ -1039,9 +965,15 @@
ImageLoader* image = NULL;
dyld::clearErrorMessage();
try {
- const char* imageName = moduleName;
+ const char* imageName = moduleName;
+ if ( (options & NSLINKMODULE_OPTION_TRAILING_PHYS_NAME) != 0 )
+ imageName = &moduleName[strlen(moduleName)+1];
+
image = dyld::loadFromMemory((const uint8_t*)object_addr, object_size, imageName);
+ if ( (options & NSLINKMODULE_OPTION_TRAILING_PHYS_NAME) != 0 )
+ image->setLogicalPath(moduleName);
+
if ( image != NULL ) {
// support private bundles
if ( (options & NSLINKMODULE_OPTION_PRIVATE) != 0 )
@@ -1051,7 +983,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, ImageLoader::RPathChain(NULL,NULL));
// run initializers unless magic flag says not to
if ( (options & NSLINKMODULE_OPTION_DONT_CALL_MOD_INIT_ROUTINES) == 0 )
@@ -1066,7 +998,7 @@
// if image was created for this bundle, destroy it
if ( image != NULL ) {
dyld::removeImage(image);
- ImageLoader::deleteImage(image);
+ delete image;
}
image = NULL;
free((void*)msg);
@@ -1082,7 +1014,7 @@
ImageLoader* image = NSModuleToImageLoader(module);
if ( image == NULL )
return NULL;
- return SymbolToNSSymbol(image->findExportedSymbol(symbolName, false, NULL));
+ return SymbolToNSSymbol(image->findExportedSymbol(symbolName, NULL, false, NULL));
}
const char* NSNameOfModule(NSModule module)
@@ -1114,7 +1046,6 @@
ImageLoader* image = NSModuleToImageLoader(module);
if ( image == NULL )
return false;
- dyld::runImageTerminators(image);
dyld::removeImage(image);
if ( (options & NSUNLINKMODULE_OPTION_KEEP_MEMORY_MAPPED) != 0 )
@@ -1132,7 +1063,7 @@
found = true;
}
if ( !found )
- ImageLoader::deleteImage(image);
+ delete image;
return true;
}
@@ -1147,7 +1078,43 @@
// no support for multiple or linkedit handlers
}
-
+const struct mach_header * _dyld_get_image_header_containing_address(const void* address)
+{
+ if ( dyld::gLogAPIs )
+ dyld::log("%s(%p)\n", __func__, address);
+ ImageLoader* image = dyld::findImageContainingAddress(address);
+ if ( image != NULL )
+ return image->machHeader();
+ return NULL;
+}
+
+
+void _dyld_register_func_for_add_image(void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide))
+{
+ if ( dyld::gLogAPIs )
+ dyld::log("%s(%p)\n", __func__, (void *)func);
+ dyld::registerAddCallback(func);
+}
+
+void _dyld_register_func_for_remove_image(void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide))
+{
+ if ( dyld::gLogAPIs )
+ dyld::log("%s(%p)\n", __func__, (void *)func);
+ dyld::registerRemoveCallback(func);
+}
+
+
+// called by crt before main
+static void _dyld_make_delayed_module_initializer_calls()
+{
+ if ( dyld::gLogAPIs )
+ dyld::log("%s()\n", __func__);
+
+#if SUPPORT_OLD_CRT_INITIALIZATION
+ if ( dyld::gRunInitializersOldWay )
+ dyld::initializeMainExecutable();
+#endif
+}
void NSLinkEditError(NSLinkEditErrors* c, int* errorNumber, const char** fileName, const char** errorString)
@@ -1159,8 +1126,6 @@
*errorString = dyld::getErrorMessage();
}
-
-
static void _dyld_register_binding_handler(void * (*bindingHandler)(const char *, const char *, void *), ImageLoader::BindingOptions bindingOptions)
{
if ( dyld::gLogAPIs )
@@ -1169,11 +1134,9 @@
dyld::gLinkContext.bindingOptions = bindingOptions;
}
-#endif //DEPRECATED_APIS_SUPPORTED
-
// Call by fork() in libSystem after the kernel trap is done on the child side
-void _dyld_fork_child()
+static void _dyld_fork_child()
{
if ( dyld::gLogAPIs )
dyld::log("%s()\n", __func__);
@@ -1186,14 +1149,9 @@
//
extern mach_port_t mach_task_self_;
mach_task_self_ = task_self_trap();
-
- // 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;
- // for safety, make sure child starts with clean systemOrderFlag
- dyld::gProcessInfo->systemOrderFlag = 0;
-}
+}
+
+
typedef void (*MonitorProc)(char *lowpc, char *highpc);
@@ -1217,7 +1175,6 @@
dyld::forEachImageDo(&monInitCallback, (void*)proc);
}
-#if DEPRECATED_APIS_SUPPORTED
// returns true if prebinding was used in main executable
bool _dyld_launched_prebound()
{
@@ -1248,7 +1205,7 @@
return false;
}
-#endif // DEPRECATED_APIS_SUPPORTED
+
bool lookupDyldFunction(const char* name, uintptr_t* address)
{
@@ -1264,21 +1221,34 @@
return false;
}
+static bool readOnlyBootVolume()
+{
+ struct statfs sfs;
+ if ( statfs("/", &sfs) == 0 ) {
+ return ( sfs.f_flags & MNT_RDONLY );
+ }
+ // if statfs() fails, something is wrong, so don't rebuild dyld cache
+ return true;
+}
+
static void registerThreadHelpers(const dyld::LibSystemHelpers* helpers)
{
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 ( helpers->version >= 5 ) {
- // create key use by dyld exception handling
- pthread_key_t key;
- int result = helpers->pthread_key_create(&key, NULL);
- if ( result == 0 )
- __Unwind_SjLj_SetThreadKey(key);
+#if DYLD_SHARED_CACHE_SUPPORT
+ // notify dyld server if something is wrong with the shared cache
+ //dyld::log("helpers->version=%lu, gSharedCacheDontNotify=%d, gSharedCacheNotFound=%d, gSharedCacheNeedsUpdating=%d, readOnlyBootVolume()=%d\n",
+ // helpers->version, dyld::gSharedCacheDontNotify, dyld::gSharedCacheNotFound, dyld::gSharedCacheNeedsUpdating, readOnlyBootVolume());
+ if ( (helpers != NULL) && (helpers->version >= 3) && !dyld::gSharedCacheDontNotify ) {
+ if ( dyld::gSharedCacheNotFound || dyld::gSharedCacheNeedsUpdating ) {
+ if ( ! readOnlyBootVolume() ) {
+ if ( dyld::gSharedCacheNotFound )
+ (*helpers->dyld_shared_cache_missing)();
+ else if ( dyld::gSharedCacheNeedsUpdating )
+ (*helpers->dyld_shared_cache_out_of_date)();
+ }
+ }
}
#endif
}
@@ -1287,13 +1257,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';
@@ -1318,15 +1281,6 @@
dyld::log("%s(%s)\n", __func__, path);
dlerrorClear();
-
-#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,39 +1296,15 @@
}
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
- context.useLdLibraryPath= leafName; // a leafname implies should search
- context.implicitRPath = !absolutePath; // a non-absolute path implies try rpath searching
+ context.useLdLibraryPath= (strchr(path, '/') == NULL); // a leafname implies should search
+ context.implicitRPath = (path[0] != '/'); // a non-absolute path implies try rpath searching
context.matchByInstallName = true;
context.dontLoad = false;
context.mustBeBundle = false;
context.mustBeDylib = false;
- context.canBePIE = true;
+ context.findDLL = false;
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = &callersRPaths; // rpaths from caller and main executable
@@ -1388,14 +1318,12 @@
const char* str = dyld::mkstringf("dlopen_preflight(%s): %s", path, msg);
dlerrorSet(str);
free((void*)str);
- free((void*)msg); // our free() will do nothing if msg is a string literal
}
// free rpaths (getRPaths() malloc'ed each string)
for(std::vector<const char*>::iterator it=rpathsFromCallerImage.begin(); it != rpathsFromCallerImage.end(); ++it) {
const char* str = *it;
free((void*)str);
}
- CRSetCrashLogMessage(NULL);
return result;
}
@@ -1420,7 +1348,6 @@
bool lockHeld = false;
if ( (dyld::gLibSystemHelpers != NULL) && (dyld::gLibSystemHelpers->version >= 4) ) {
dyld::gLibSystemHelpers->acquireGlobalDyldLock();
- CRSetCrashLogMessage("dyld: in dlopen()");
lockHeld = true;
}
@@ -1438,39 +1365,15 @@
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
- context.useLdLibraryPath= leafName; // a leafname implies should search
- context.implicitRPath = !absolutePath; // a non-absolute path implies try rpath searching
+ context.useLdLibraryPath= (strchr(path, '/') == NULL); // a leafname implies should search
+ context.implicitRPath = (path[0] != '/'); // a non-absolute path implies try rpath searching
context.matchByInstallName = true;
context.dontLoad = ( (mode & RTLD_NOLOAD) != 0 );
context.mustBeBundle = false;
context.mustBeDylib = false;
- context.canBePIE = true;
+ context.findDLL = ( (mode & RTLD_DLL) != 0 );
context.origin = callerImage != NULL ? callerImage->getPath() : NULL; // caller's image's path
context.rpath = &callersRPaths; // rpaths from caller and main executable
@@ -1483,7 +1386,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, callersRPaths);
if ( ! alreadyLinked ) {
// only hide exports if image is not already in use
if ( (mode & RTLD_LOCAL) != 0 )
@@ -1501,7 +1404,6 @@
// release global dyld lock early, this enables initializers to do threaded operations
if ( lockHeld ) {
- CRSetCrashLogMessage(NULL);
dyld::gLibSystemHelpers->releaseGlobalDyldLock();
lockHeld = false;
}
@@ -1529,15 +1431,11 @@
// 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
result = NULL;
}
// free rpaths (getRPaths() malloc'ed each string)
@@ -1546,17 +1444,8 @@
free((void*)str);
}
- // when context.dontLoad is set, load() returns NULL instead of throwing an exception
- if ( (mode & RTLD_NOLOAD) && (result == NULL) ) {
- dlerrorSet("image not already loaded");
- }
-
- if ( lockHeld ) {
- CRSetCrashLogMessage(NULL);
+ if ( lockHeld )
dyld::gLibSystemHelpers->releaseGlobalDyldLock();
- }
- if ( dyld::gLogAPIs && (result != NULL) )
- dyld::log(" %s(%s) ==> %p\n", __func__, path, result);
return result;
}
@@ -1582,8 +1471,7 @@
return -1;
}
// remove image if reference count went to zero
- if ( image->dlopenCount() == 0 )
- dyld::garbageCollectImages();
+ dyld::garbageCollectImages();
return 0;
}
else {
@@ -1599,40 +1487,34 @@
if ( dyld::gLogAPIs )
dyld::log("%s(%p, %p)\n", __func__, address, info);
- CRSetCrashLogMessage("dyld: in dladdr()");
ImageLoader* image = dyld::findImageContainingAddress(address);
if ( image != NULL ) {
- info->dli_fname = image->getRealPath();
- info->dli_fbase = (void*)image->machHeader();
- if ( address == info->dli_fbase ) {
- // special case lookup of header
- info->dli_sname = "__dso_handle";
- info->dli_saddr = info->dli_fbase;
- CRSetCrashLogMessage(NULL);
- return 1; // success
- }
- // 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_fname = image->getLogicalPath();
+ info->dli_fbase = (void*)image->machHeader();
+ // find closest exported symbol in the image
+ const uint32_t exportCount = image->getExportedSymbolCount();
+ const ImageLoader::Symbol* bestSym = NULL;
+ const void* bestAddr = 0;
+ for(uint32_t i=0; i < exportCount; ++i) {
+ const ImageLoader::Symbol* sym = image->getIndexedExportedSymbol(i);
+ const void* symAddr = (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext);
+ if ( (symAddr <= address) && (bestAddr < symAddr) ) {
+ bestSym = sym;
+ bestAddr = symAddr;
+ }
+ }
+ if ( bestSym != NULL ) {
+ info->dli_sname = image->getExportedSymbolName(bestSym);
+ if ( info->dli_sname[0] == '_' )
+ info->dli_sname = info->dli_sname +1; // strip off leading underscore
+ info->dli_saddr = (void*)bestAddr;
+ }
+ else {
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
- //dyld::log("dladdr(%p) => %p %s\n", address, info->dli_saddr, info->dli_sname);
- CRSetCrashLogMessage(NULL);
- return 1; // success
- }
- info->dli_sname = NULL;
- info->dli_saddr = NULL;
- CRSetCrashLogMessage(NULL);
+ }
return 1; // success
}
- CRSetCrashLogMessage(NULL);
return 0; // failure
}
@@ -1643,12 +1525,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
@@ -1664,7 +1540,6 @@
if ( dyld::gLogAPIs )
dyld::log("%s(%p, %s)\n", __func__, handle, symbolName);
- CRSetCrashLogMessage("dyld: in dlsym()");
dlerrorClear();
const ImageLoader* image;
@@ -1679,28 +1554,24 @@
// magic "search all" handle
if ( handle == RTLD_DEFAULT ) {
if ( dyld::flatFindExportedSymbol(underscoredName, &sym, &image) ) {
- CRSetCrashLogMessage(NULL);
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);
return NULL;
}
// magic "search only main executable" handle
if ( handle == RTLD_MAIN_ONLY ) {
image = dyld::mainExecutable();
- sym = image->findExportedSymbol(underscoredName, true, &image); // search RTLD_FIRST way
+ sym = image->findExportedSymbol(underscoredName, NULL, true, &image); // search RTLD_FIRST way
if ( sym != NULL ) {
- CRSetCrashLogMessage(NULL);
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);
return NULL;
}
@@ -1710,13 +1581,11 @@
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);
}
const char* str = dyld::mkstringf("dlsym(RTLD_NEXT, %s): symbol not found", symbolName);
dlerrorSet(str);
free((void*)str);
- CRSetCrashLogMessage(NULL);
return NULL;
}
// magic "search me, then what I would see" handle
@@ -1725,25 +1594,22 @@
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);
}
const char* str = dyld::mkstringf("dlsym(RTLD_SELF, %s): symbol not found", symbolName);
dlerrorSet(str);
free((void*)str);
- CRSetCrashLogMessage(NULL);
return NULL;
}
// real handle
image = (ImageLoader*)(((uintptr_t)handle) & (-4)); // clear mode bits
if ( dyld::validImage(image) ) {
if ( (((uintptr_t)handle) & 1) != 0 )
- sym = image->findExportedSymbol(underscoredName, true, &image); // search RTLD_FIRST way
+ sym = image->findExportedSymbol(underscoredName, NULL, true, &image); // search RTLD_FIRST way
else
sym = image->findExportedSymbolInImageOrDependentImages(underscoredName, dyld::gLinkContext, &image); // search image and what it links against
if ( sym != NULL ) {
- CRSetCrashLogMessage(NULL);
return (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext);
}
const char* str = dyld::mkstringf("dlsym(%p, %s): symbol not found", handle, symbolName);
@@ -1753,38 +1619,81 @@
else {
dlerrorSet("invalid handle passed to dlsym()");
}
- CRSetCrashLogMessage(NULL);
return NULL;
}
-
-
-
-
-
-
-
-const struct dyld_all_image_infos* _dyld_get_all_image_infos()
-{
- return dyld::gProcessInfo;
-}
-
-#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);
-
- ImageLoader* image = dyld::findImageContainingAddress(addr);
- if ( image != NULL ) {
- image->getUnwindInfo(info);
- return true;
- }
- return false;
-}
-#endif
+void* dlord(void* handle, uint32_t ordinal)
+{
+ if ( dyld::gLogAPIs )
+ dyld::log("%s(%p, %u)\n", __func__, handle, ordinal);
+
+ dlerrorClear();
+
+
+ // magic "search all" handle
+ if ( handle == RTLD_DEFAULT ) {
+ const char* str = dyld::mkstringf("dlord(RTLD_DEFAULT, %u): not supported", ordinal);
+ dlerrorSet(str);
+ free((void*)str);
+ return NULL;
+ }
+ // magic "search only main executable" handle
+ if ( handle == RTLD_MAIN_ONLY ) {
+ const char* str = dyld::mkstringf("dlord(RTLD_MAIN_ONLY, %u): not supported", ordinal);
+ dlerrorSet(str);
+ free((void*)str);
+ return NULL;
+ }
+ // magic "search what I would see" handle
+ if ( handle == RTLD_NEXT ) {
+ const char* str = dyld::mkstringf("dlord(RTLD_NEXT, %u): not supported", ordinal);
+ dlerrorSet(str);
+ free((void*)str);
+ return NULL;
+ }
+ // magic "search me, then what I would see" handle
+ if ( handle == RTLD_SELF ) {
+ const char* str = dyld::mkstringf("dlord(RTLD_SELF, %u): not supported", ordinal);
+ dlerrorSet(str);
+ free((void*)str);
+ return NULL;
+ }
+
+ // real handle
+ const ImageLoader* image = (ImageLoader*)(((uintptr_t)handle) & (-4)); // clear mode bits
+ if ( dyld::validImage(image) ) {
+ const ImageLoader::Symbol* sym;
+ sym = image->getIndexedExportedSymbol(ordinal-1); // map ordinals to mach-o zero based index
+
+ if ( sym != NULL ) {
+ return (void*)image->getExportedSymbolAddress(sym, dyld::gLinkContext);
+ }
+ const char* str = dyld::mkstringf("dlord(%p, %u): ordinal not found", handle, ordinal);
+ dlerrorSet(str);
+ free((void*)str);
+ }
+ else {
+ dlerrorSet("invalid handle passed to dlord()");
+ }
+ return NULL;
+}
+
+
+
+
+
+
+
+
+
+
+static const struct dyld_all_image_infos* _dyld_get_all_image_infos()
+{
+ return &dyld_all_image_infos;
+}
+
void dyld_register_image_state_change_handler(dyld_image_states state, bool batch,
@@ -1798,29 +1707,10 @@
dyld::registerImageStateSingleChangeHandler(state, handler);
}
-const char* dyld_image_path_containing_address(const void* address)
-{
- if ( dyld::gLogAPIs )
- dyld::log("%s(%p)\n", __func__, address);
-
- ImageLoader* image = dyld::findImageContainingAddress(address);
- if ( image != NULL )
- return image->getRealPath();
- 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
-}
-#endif
-
-
-
+
+
+
+
+
+
+