Loading...
--- dyld/dyld-421.1/src/dyldAPIsInLibSystem.cpp
+++ dyld/dyld-239.3/src/dyldAPIsInLibSystem.cpp
@@ -31,21 +31,14 @@
#include <Availability.h>
#include <vproc_priv.h>
-#include <dirent.h>
-#include <sys/stat.h>
-
-#include "mach-o/dyld_images.h"
#include "mach-o/dyld.h"
#include "mach-o/dyld_priv.h"
-#include "dyld_cache_format.h"
-
-#include "ImageLoader.h"
+
#include "dyldLock.h"
#include "start_glue.h"
extern "C" int __cxa_atexit(void (*func)(void *), void *arg, void *dso);
extern "C" void __cxa_finalize(const void *dso);
-extern "C" void __cxa_finalize_ranges(const struct __cxa_range_t ranges[], int count);
#ifndef LC_VERSION_MIN_MACOSX
@@ -63,19 +56,12 @@
#define LC_VERSION_MIN_IPHONEOS 0x25
#endif
-#ifndef LC_VERSION_MIN_TVOS
- #define LC_VERSION_MIN_TVOS 0x2F
-#endif
-
-#ifndef LC_VERSION_MIN_WATCHOS
- #define LC_VERSION_MIN_WATCHOS 0x30
-#endif
-
#ifndef LC_LOAD_UPWARD_DYLIB
#define LC_LOAD_UPWARD_DYLIB (0x23|LC_REQ_DYLD) /* load of dylib whose initializers run later */
#endif
+#define DYLD_SHARED_CACHE_SUPPORT (__i386__ || __x86_64__ || __arm__)
// deprecated APIs are still availble on Mac OS X, but not on iPhone OS
#if __IPHONE_OS_VERSION_MIN_REQUIRED
@@ -93,10 +79,10 @@
static
bool
names_match(
-const char *install_name,
+char *install_name,
const char* libraryName)
{
- const char *basename;
+ char *basename;
unsigned long n;
/*
@@ -117,7 +103,7 @@
* of the -framework cases.
*/
if(strcmp(basename, libraryName) == 0)
- return true;
+ return(TRUE);
/*
* Now check the base name for "lib" if so proceed to check for the
@@ -127,14 +113,14 @@
n = strlen(libraryName);
if(strncmp(basename+3, libraryName, n) == 0){
if(strncmp(basename+3+n, ".dylib", 6) == 0)
- return true;
+ return(TRUE);
if(basename[3+n] == '.' &&
basename[3+n+1] != '\0' &&
strncmp(basename+3+n+2, ".dylib", 6) == 0)
- return true;
+ return(TRUE);
}
}
- return false;
+ return(FALSE);
}
#if DEPRECATED_APIS_SUPPORTED
@@ -360,35 +346,42 @@
* and not a list of current versions that dependent libraries and bundles the
* program is using were built with.
*/
-int32_t NSVersionOfLinkTimeLibrary(const char* libraryName)
-{
- // Lazily call _NSGetMachExecuteHeader() and cache result
+int32_t
+NSVersionOfLinkTimeLibrary(
+const char* libraryName)
+{
+ unsigned long i;
+ struct load_command *load_commands, *lc;
+ struct dylib_command *dl;
+ char *install_name;
#if __LP64__
- static mach_header_64* mh = NULL;
+ static struct mach_header_64 *mh = NULL;
#else
- static mach_header* mh = NULL;
-#endif
- if ( mh == NULL )
+ static struct mach_header *mh = NULL;
+#endif
+ if(mh == NULL)
mh = _NSGetMachExecuteHeader();
+ load_commands = (struct load_command *)
#if __LP64__
- const load_command* lc = (load_command*)((char*)mh + sizeof(mach_header_64));
+ ((char *)mh + sizeof(struct mach_header_64));
#else
- const load_command* lc = (load_command*)((char*)mh + sizeof(mach_header));
-#endif
- for(uint32_t i = 0; i < mh->ncmds; i++){
+ ((char *)mh + sizeof(struct mach_header));
+#endif
+ lc = load_commands;
+ for(i = 0; i < mh->ncmds; i++){
switch ( lc->cmd ) {
case LC_LOAD_DYLIB:
case LC_LOAD_WEAK_DYLIB:
case LC_LOAD_UPWARD_DYLIB:
- const dylib_command* dl = (dylib_command *)lc;
- const char* install_name = (char*)dl + dl->dylib.name.offset;
- if ( names_match(install_name, libraryName) )
- return dl->dylib.current_version;
+ dl = (struct dylib_command *)lc;
+ install_name = (char *)dl + dl->dylib.name.offset;
+ if(names_match(install_name, libraryName) == TRUE)
+ return(dl->dylib.current_version);
break;
}
- lc = (load_command*)((char*)lc + lc->cmdsize);
+ lc = (struct load_command *)((char *)lc + lc->cmdsize);
}
- return (-1);
+ return(-1);
}
/*
@@ -398,116 +391,103 @@
* it would be "x" and with -framework Foo it would be "Foo"). If the program
* is not using the specified library it returns -1.
*/
-int32_t NSVersionOfRunTimeLibrary(const char* libraryName)
-{
- uint32_t n = _dyld_image_count();
- for(uint32_t i = 0; i < n; i++){
- const mach_header* mh = _dyld_get_image_header(i);
- if ( mh == NULL )
- continue;
- if ( mh->filetype != MH_DYLIB )
- continue;
+int32_t
+NSVersionOfRunTimeLibrary(
+const char* libraryName)
+{
+ unsigned long i, j, n;
+ char *install_name;
+ struct load_command *load_commands, *lc;
+ struct dylib_command *dl;
+ const struct mach_header *mh;
+
+ n = _dyld_image_count();
+ for(i = 0; i < n; i++){
+ mh = _dyld_get_image_header(i);
+ if(mh->filetype != MH_DYLIB)
+ continue;
+ load_commands = (struct load_command *)
#if __LP64__
- const load_command* lc = (load_command*)((char*)mh + sizeof(mach_header_64));
+ ((char *)mh + sizeof(struct mach_header_64));
#else
- const load_command* lc = (load_command*)((char*)mh + sizeof(mach_header));
-#endif
- for(uint32_t j = 0; j < mh->ncmds; j++){
- if ( lc->cmd == LC_ID_DYLIB ) {
- const dylib_command* dl = (dylib_command*)lc;
- const char* install_name = (char *)dl + dl->dylib.name.offset;
- if ( names_match(install_name, libraryName) )
- return dl->dylib.current_version;
- }
- lc = (load_command*)((char*)lc + lc->cmdsize);
+ ((char *)mh + sizeof(struct mach_header));
+#endif
+ lc = load_commands;
+ for(j = 0; j < mh->ncmds; j++){
+ if(lc->cmd == LC_ID_DYLIB){
+ dl = (struct dylib_command *)lc;
+ install_name = (char *)dl + dl->dylib.name.offset;
+ if(names_match(install_name, libraryName) == TRUE)
+ return(dl->dylib.current_version);
+ }
+ lc = (struct load_command *)((char *)lc + lc->cmdsize);
}
}
- return (-1);
-}
-
+ return(-1);
+}
#define PACKED_VERSION(major, minor, tiny) ((((major) & 0xffff) << 16) | (((minor) & 0xff) << 8) | ((tiny) & 0xff))
-static bool getVersionLoadCommandInfo(const mach_header* mh, uint32_t* loadCommand, uint32_t* minOS, uint32_t* sdk)
-{
- const load_command* startCmds = NULL;
+/*
+ * Returns the sdk version (encode as nibble XXXX.YY.ZZ) the
+ * specified binary was built against.
+ *
+ * First looks for LC_VERSION_MIN_MACOSX/LC_VERSION_MIN_IPHONEOS
+ * in binary and if sdk field is not zero, return that value.
+ * Otherwise, looks for the libSystem.B.dylib the binary linked
+ * against and uses a table to convert that to an sdk version.
+ */
+uint32_t dyld_get_sdk_version(const mach_header* mh)
+{
+ const load_command* cmds = NULL;
if ( mh->magic == MH_MAGIC_64 )
- startCmds = (load_command*)((char *)mh + sizeof(mach_header_64));
+ cmds = (load_command*)((char *)mh + sizeof(mach_header_64));
else if ( mh->magic == MH_MAGIC )
- startCmds = (load_command*)((char *)mh + sizeof(mach_header));
- else
- return false; // not a mach-o file, or wrong endianness
-
- const load_command* const cmdsEnd = (load_command*)((char*)startCmds + mh->sizeofcmds);
- const load_command* cmd = startCmds;
- for(uint32_t i = 0; i < mh->ncmds; ++i) {
- const load_command* nextCmd = (load_command*)((char *)cmd + cmd->cmdsize);
- if ( (cmd->cmdsize < 8) || (nextCmd > cmdsEnd) || (nextCmd < startCmds)) {
- return 0;
- }
- const version_min_command* versCmd;
- switch ( cmd->cmd ) {
- case LC_VERSION_MIN_IPHONEOS:
- case LC_VERSION_MIN_MACOSX:
- case LC_VERSION_MIN_TVOS:
- case LC_VERSION_MIN_WATCHOS:
- versCmd = (version_min_command*)cmd;
- *loadCommand = versCmd->cmd;
- *minOS = versCmd->version;
- *sdk = versCmd->sdk;
- return true;
- }
- cmd = nextCmd;
- }
- return false;
-}
-
-#if !__WATCH_OS_VERSION_MIN_REQUIRED && !__TV_OS_VERSION_MIN_REQUIRED
-static uint32_t deriveSDKVersFromDylibs(const mach_header* mh)
-{
- const load_command* startCmds = NULL;
- if ( mh->magic == MH_MAGIC_64 )
- startCmds = (load_command*)((char *)mh + sizeof(mach_header_64));
- else if ( mh->magic == MH_MAGIC )
- startCmds = (load_command*)((char *)mh + sizeof(mach_header));
+ cmds = (load_command*)((char *)mh + sizeof(mach_header));
else
return 0; // not a mach-o file, or wrong endianness
- const load_command* const cmdsEnd = (load_command*)((char*)startCmds + mh->sizeofcmds);
+ const version_min_command* versCmd;
const dylib_command* dylibCmd;
- const load_command* cmd = startCmds;
+ const load_command* cmd = cmds;
const char* dylibName;
- #if __IPHONE_OS_VERSION_MIN_REQUIRED
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
uint32_t foundationVers = 0;
- #else
+#else
uint32_t libSystemVers = 0;
- #endif
+#endif
for(uint32_t i = 0; i < mh->ncmds; ++i) {
- const load_command* nextCmd = (load_command*)((char *)cmd + cmd->cmdsize);
- // <rdar://problem/14381579&16050962> sanity check size of command
- if ( (cmd->cmdsize < 8) || (nextCmd > cmdsEnd) || (nextCmd < startCmds)) {
- return 0;
- }
- switch ( cmd->cmd ) {
+ switch ( cmd->cmd ) {
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+ case LC_VERSION_MIN_IPHONEOS:
+#else
+ case LC_VERSION_MIN_MACOSX:
+#endif
+ versCmd = (version_min_command*)cmd;
+#ifdef DICE_KIND_DATA
+ if ( versCmd->sdk != 0 )
+ return versCmd->sdk; // found explicit SDK version
+#else
+ if ( versCmd->reserved != 0 )
+ return versCmd->reserved; // found explicit SDK version
+#endif
+ break;
case LC_LOAD_DYLIB:
case LC_LOAD_WEAK_DYLIB:
case LC_LOAD_UPWARD_DYLIB:
dylibCmd = (dylib_command*)cmd;
- // sanity check dylib command layout
- if ( dylibCmd->dylib.name.offset > cmd->cmdsize )
- return 0;
dylibName = (char*)dylibCmd + dylibCmd->dylib.name.offset;
- #if __IPHONE_OS_VERSION_MIN_REQUIRED
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
if ( strcmp(dylibName, "/System/Library/Frameworks/Foundation.framework/Foundation") == 0 )
foundationVers = dylibCmd->dylib.current_version;
- #else
+#else
if ( strcmp(dylibName, "/usr/lib/libSystem.B.dylib") == 0 )
libSystemVers = dylibCmd->dylib.current_version;
- #endif
+#endif
break;
}
- cmd = nextCmd;
+ cmd = (load_command*)((char *)cmd + cmd->cmdsize);
}
struct DylibToOSMapping {
@@ -515,7 +495,7 @@
uint32_t osVersion;
};
- #if __IPHONE_OS_VERSION_MIN_REQUIRED
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
static const DylibToOSMapping foundationMapping[] = {
{ PACKED_VERSION(678,24,0), DYLD_IOS_VERSION_2_0 },
{ PACKED_VERSION(678,26,0), DYLD_IOS_VERSION_2_1 },
@@ -531,10 +511,8 @@
{ PACKED_VERSION(890,1,0), DYLD_IOS_VERSION_5_1 },
{ PACKED_VERSION(992,0,0), DYLD_IOS_VERSION_6_0 },
{ PACKED_VERSION(993,0,0), DYLD_IOS_VERSION_6_1 },
- { PACKED_VERSION(1038,14,0),DYLD_IOS_VERSION_7_0 },
- { PACKED_VERSION(0,0,0), DYLD_IOS_VERSION_7_0 }
- // We don't need to expand this table because all recent
- // binaries have LC_VERSION_MIN_ load command.
+ { PACKED_VERSION(1038,14,0),DYLD_IOS_VERSION_7_0 }, // check final
+ { PACKED_VERSION(0,0,0), DYLD_IOS_VERSION_7_0 }
};
if ( foundationVers != 0 ) {
@@ -548,7 +526,7 @@
}
}
- #else
+#else
// Note: versions are for the GM release. The last entry should
// always be zero. At the start of the next major version,
// a new last entry needs to be added and the previous zero
@@ -561,8 +539,6 @@
{ PACKED_VERSION(169,3,0), DYLD_MACOSX_VERSION_10_8 },
{ PACKED_VERSION(1197,0,0), DYLD_MACOSX_VERSION_10_9 },
{ PACKED_VERSION(0,0,0), DYLD_MACOSX_VERSION_10_9 }
- // We don't need to expand this table because all recent
- // binaries have LC_VERSION_MIN_ load command.
};
if ( libSystemVers != 0 ) {
@@ -575,170 +551,50 @@
lastOsVersion = p->osVersion;
}
}
- #endif
- return 0;
-}
-#endif
-
-
-#if __WATCH_OS_VERSION_MIN_REQUIRED
-static uint32_t watchVersToIOSVers(uint32_t vers)
-{
- return vers + 0x00070000;
-}
-
-uint32_t dyld_get_program_sdk_watch_os_version()
-{
- const mach_header* mh = (mach_header*)_NSGetMachExecuteHeader();
- uint32_t loadCommand;
- uint32_t minOS;
- uint32_t sdk;
-
- if ( getVersionLoadCommandInfo(mh, &loadCommand, &minOS, &sdk) ) {
- if ( loadCommand == LC_VERSION_MIN_WATCHOS )
- return sdk;
+#endif
+
+ return 0;
+}
+
+uint32_t dyld_get_program_sdk_version()
+{
+ return dyld_get_sdk_version((mach_header*)_NSGetMachExecuteHeader());
+}
+
+
+uint32_t dyld_get_min_os_version(const struct mach_header* mh)
+{
+ const load_command* cmds = NULL;
+ if ( mh->magic == MH_MAGIC_64 )
+ cmds = (load_command*)((char *)mh + sizeof(mach_header_64));
+ else if ( mh->magic == MH_MAGIC )
+ cmds = (load_command*)((char *)mh + sizeof(mach_header));
+ else
+ return 0; // not a mach-o file, or wrong endianness
+
+ const version_min_command* versCmd;
+ const load_command* cmd = cmds;
+ for(uint32_t i = 0; i < mh->ncmds; ++i) {
+ switch ( cmd->cmd ) {
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+ case LC_VERSION_MIN_IPHONEOS:
+#else
+ case LC_VERSION_MIN_MACOSX:
+#endif
+ versCmd = (version_min_command*)cmd;
+ return versCmd->version; // found explicit min OS version
+ break;
+ }
+ cmd = (load_command*)((char *)cmd + cmd->cmdsize);
}
return 0;
}
-uint32_t dyld_get_program_min_watch_os_version()
-{
- const mach_header* mh = (mach_header*)_NSGetMachExecuteHeader();
- uint32_t loadCommand;
- uint32_t minOS;
- uint32_t sdk;
-
- if ( getVersionLoadCommandInfo(mh, &loadCommand, &minOS, &sdk) ) {
- if ( loadCommand == LC_VERSION_MIN_WATCHOS )
- return minOS; // return raw minOS (not mapped to iOS version)
- }
- return 0;
-}
-
-#endif
-
-/*
- * Returns the sdk version (encode as nibble XXXX.YY.ZZ) the
- * specified binary was built against.
- *
- * First looks for LC_VERSION_MIN_* in binary and if sdk field is
- * not zero, return that value.
- * Otherwise, looks for the libSystem.B.dylib the binary linked
- * against and uses a table to convert that to an sdk version.
- */
-uint32_t dyld_get_sdk_version(const mach_header* mh)
-{
- uint32_t loadCommand;
- uint32_t minOS;
- uint32_t sdk;
-
- if ( getVersionLoadCommandInfo(mh, &loadCommand, &minOS, &sdk) ) {
- switch (loadCommand) {
-#if __WATCH_OS_VERSION_MIN_REQUIRED
- case LC_VERSION_MIN_WATCHOS:
- // new binary. sdk version looks like "2.0" but API wants "9.0"
- return watchVersToIOSVers(sdk);
- case LC_VERSION_MIN_IPHONEOS:
- // old binary. sdk matches API semantics so can return directly.
- return sdk;
-#elif __TV_OS_VERSION_MIN_REQUIRED
- case LC_VERSION_MIN_TVOS:
- case LC_VERSION_MIN_IPHONEOS:
- return sdk;
-#elif __IPHONE_OS_VERSION_MIN_REQUIRED
- case LC_VERSION_MIN_IPHONEOS:
- if ( sdk != 0 ) // old binaries might not have SDK set
- return sdk;
- break;
-#else
- case LC_VERSION_MIN_MACOSX:
- if ( sdk != 0 ) // old binaries might not have SDK set
- return sdk;
- break;
-#endif
- }
- }
-
-#if __WATCH_OS_VERSION_MIN_REQUIRED ||__TV_OS_VERSION_MIN_REQUIRED
- // All WatchOS and tv OS binaries should have version load command.
- return 0;
-#else
- // MacOSX and iOS have old binaries without version load commmand.
- return deriveSDKVersFromDylibs(mh);
-#endif
-}
-
-uint32_t dyld_get_program_sdk_version()
-{
- return dyld_get_sdk_version((mach_header*)_NSGetMachExecuteHeader());
-}
-
-uint32_t dyld_get_min_os_version(const struct mach_header* mh)
-{
- uint32_t loadCommand;
- uint32_t minOS;
- uint32_t sdk;
-
- if ( getVersionLoadCommandInfo(mh, &loadCommand, &minOS, &sdk) ) {
- switch (loadCommand) {
-#if __WATCH_OS_VERSION_MIN_REQUIRED
- case LC_VERSION_MIN_WATCHOS:
- // new binary. OS version looks like "2.0" but API wants "9.0"
- return watchVersToIOSVers(minOS);
- case LC_VERSION_MIN_IPHONEOS:
- // old binary. OS matches API semantics so can return directly.
- return minOS;
-#elif __TV_OS_VERSION_MIN_REQUIRED
- case LC_VERSION_MIN_TVOS:
- case LC_VERSION_MIN_IPHONEOS:
- return minOS;
-#elif __IPHONE_OS_VERSION_MIN_REQUIRED
- case LC_VERSION_MIN_IPHONEOS:
- return minOS;
-#else
- case LC_VERSION_MIN_MACOSX:
- return minOS;
-#endif
- }
- }
- return 0;
-}
-
uint32_t dyld_get_program_min_os_version()
{
return dyld_get_min_os_version((mach_header*)_NSGetMachExecuteHeader());
}
-
-
-bool _dyld_get_image_uuid(const struct mach_header* mh, uuid_t uuid)
-{
- const load_command* startCmds = NULL;
- if ( mh->magic == MH_MAGIC_64 )
- startCmds = (load_command*)((char *)mh + sizeof(mach_header_64));
- else if ( mh->magic == MH_MAGIC )
- startCmds = (load_command*)((char *)mh + sizeof(mach_header));
- else
- return false; // not a mach-o file, or wrong endianness
-
- const load_command* const cmdsEnd = (load_command*)((char*)startCmds + mh->sizeofcmds);
- const load_command* cmd = startCmds;
- for(uint32_t i = 0; i < mh->ncmds; ++i) {
- const load_command* nextCmd = (load_command*)((char *)cmd + cmd->cmdsize);
- if ( (cmd->cmdsize < 8) || (nextCmd > cmdsEnd) || (nextCmd < startCmds)) {
- return false;
- }
- if ( cmd->cmd == LC_UUID ) {
- const uuid_command* uuidCmd = (uuid_command*)cmd;
- memcpy(uuid, uuidCmd->uuid, 16);
- return true;
- }
- cmd = nextCmd;
- }
- bzero(uuid, 16);
- return false;
-}
-
#if DEPRECATED_APIS_SUPPORTED
@@ -845,7 +701,7 @@
NSObjectFileImage objectFileImage)
{
DYLD_LOCK_THIS_BLOCK;
- static uint32_t (*p)(NSObjectFileImage) = NULL;
+ static unsigned long (*p)(NSObjectFileImage) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_NSSymbolDefinitionCountInObjectFileImage", (void**)&p);
@@ -882,7 +738,7 @@
NSObjectFileImage objectFileImage)
{
DYLD_LOCK_THIS_BLOCK;
- static uint32_t (*p)(NSObjectFileImage) = NULL;
+ static unsigned long (*p)(NSObjectFileImage) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_NSSymbolReferenceCountInObjectFileImage", (void**)&p);
@@ -1014,7 +870,7 @@
char *buf,
uint32_t *bufsize)
{
- DYLD_NO_LOCK_THIS_BLOCK;
+ DYLD_LOCK_THIS_BLOCK;
static int (*p)(char *buf, uint32_t *bufsize) = NULL;
if(p == NULL)
@@ -1237,7 +1093,7 @@
_dyld_image_count(void)
{
DYLD_NO_LOCK_THIS_BLOCK;
- static uint32_t (*p)(void) = NULL;
+ static unsigned long (*p)(void) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_image_count", (void**)&p);
@@ -1312,6 +1168,17 @@
return p(address);
}
+void _dyld_moninit(
+void (*monaddition)(char *lowpc, char *highpc))
+{
+ DYLD_LOCK_THIS_BLOCK;
+ typedef void (*monproc)(char *lowpc, char *highpc);
+ static void (*p)(monproc monaddition) = NULL;
+
+ if(p == NULL)
+ _dyld_func_lookup("__dyld_moninit", (void**)&p);
+ p(monaddition);
+}
#if DEPRECATED_APIS_SUPPORTED
bool _dyld_launched_prebound(void)
@@ -1352,12 +1219,12 @@
// data kept per-thread
struct dlerrorPerThreadData
{
- size_t sizeAllocated;
+ uint32_t sizeAllocated;
char message[1];
};
// function called by dyld to get buffer to store dlerror message
-static char* getPerThreadBufferFor_dlerror(size_t sizeRequired)
+static char* getPerThreadBufferFor_dlerror(uint32_t sizeRequired)
{
// ok to create key lazily because this function is called within dyld lock, so there is no race condition
if (!dlerrorPerThreadKeyInitialized ) {
@@ -1366,11 +1233,11 @@
dlerrorPerThreadKeyInitialized = true;
}
- const size_t size = (sizeRequired < 256) ? 256 : sizeRequired;
+ const int size = (sizeRequired < 256) ? 256 : sizeRequired;
dlerrorPerThreadData* data = (dlerrorPerThreadData*)pthread_getspecific(dlerrorPerThreadKey);
if ( data == NULL ) {
//int mallocSize = offsetof(dlerrorPerThreadData, message[size]);
- const size_t mallocSize = sizeof(dlerrorPerThreadData)+size;
+ const int mallocSize = sizeof(dlerrorPerThreadData)+size;
data = (dlerrorPerThreadData*)malloc(mallocSize);
data->sizeAllocated = size;
pthread_setspecific(dlerrorPerThreadKey, data);
@@ -1378,7 +1245,7 @@
else if ( data->sizeAllocated < sizeRequired ) {
free(data);
//int mallocSize = offsetof(dlerrorPerThreadData, message[size]);
- const size_t mallocSize = sizeof(dlerrorPerThreadData)+size;
+ const int mallocSize = sizeof(dlerrorPerThreadData)+size;
data = (dlerrorPerThreadData*)malloc(mallocSize);
data->sizeAllocated = size;
pthread_setspecific(dlerrorPerThreadKey, data);
@@ -1400,12 +1267,18 @@
typedef vproc_err_t (*vswapproc)(vproc_t vp, vproc_gsk_t key,int64_t *inval, int64_t *outval);
static vswapproc swapProc = &vproc_swap_integer;
-static bool isLaunchdOwned()
-{
- int64_t val = 0;
- (*swapProc)(NULL, VPROC_GSK_IS_MANAGED, NULL, &val);
- return ( val != 0 );
-}
+static bool isLaunchdOwned() {
+ static bool first = true;
+ static bool result;
+ if ( first ) {
+ int64_t val = 0;
+ (*swapProc)(NULL, VPROC_GSK_IS_MANAGED, NULL, &val);
+ result = ( val != 0 );
+ first = false;
+ }
+ return result;
+}
+
#if DYLD_SHARED_CACHE_SUPPORT
static void shared_cache_missing()
@@ -1421,7 +1294,7 @@
// the table passed to dyld containing thread helpers
-static dyld::LibSystemHelpers sHelpers = { 13, &dyldGlobalLockAcquire, &dyldGlobalLockRelease,
+static dyld::LibSystemHelpers sHelpers = { 12, &dyldGlobalLockAcquire, &dyldGlobalLockRelease,
&getPerThreadBufferFor_dlerror, &malloc, &free, &__cxa_atexit,
#if DYLD_SHARED_CACHE_SUPPORT
&shared_cache_missing, &shared_cache_out_of_date,
@@ -1437,9 +1310,7 @@
&hasPerThreadBufferFor_dlerror,
&isLaunchdOwned,
&vm_allocate,
- &mmap,
- &__cxa_finalize_ranges
- };
+ &mmap};
//
@@ -1528,6 +1399,17 @@
return(p(handle, symbol));
}
+void dyld_register_image_state_change_handler(dyld_image_states state,
+ bool batch, dyld_image_state_change_handler handler)
+{
+ DYLD_LOCK_THIS_BLOCK;
+ static void* (*p)(dyld_image_states, bool, dyld_image_state_change_handler) = NULL;
+
+ if(p == NULL)
+ _dyld_func_lookup("__dyld_dyld_register_image_state_change_handler", (void**)&p);
+ p(state, batch, handler);
+}
+
const struct dyld_all_image_infos* _dyld_get_all_image_infos()
{
@@ -1539,7 +1421,7 @@
return p();
}
-#if SUPPORT_ZERO_COST_EXCEPTIONS
+#if !__arm__
bool _dyld_find_unwind_sections(void* addr, dyld_unwind_sections* info)
{
DYLD_NO_LOCK_THIS_BLOCK;
@@ -1552,7 +1434,7 @@
#endif
-#if __i386__ || __x86_64__ || __arm__ || __arm64__
+#if __i386__ || __x86_64__ || __arm__
__attribute__((visibility("hidden")))
void* _dyld_fast_stub_entry(void* loadercache, long lazyinfo)
{
@@ -1576,17 +1458,7 @@
return p(addr);
}
-const struct mach_header* dyld_image_header_containing_address(const void* addr)
-{
- DYLD_NO_LOCK_THIS_BLOCK;
- static const mach_header* (*p)(const void*) = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_get_image_header_containing_address", (void**)&p);
- return p(addr);
-}
-
-
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
bool dyld_shared_cache_some_image_overridden()
{
DYLD_NO_LOCK_THIS_BLOCK;
@@ -1596,16 +1468,7 @@
_dyld_func_lookup("__dyld_shared_cache_some_image_overridden", (void**)&p);
return p();
}
-
-bool _dyld_get_shared_cache_uuid(uuid_t uuid)
-{
- DYLD_NO_LOCK_THIS_BLOCK;
- static bool (*p)(uuid_t) = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_get_shared_cache_uuid", (void**)&p);
- return p(uuid);
-}
+#endif
bool dyld_process_is_restricted()
@@ -1618,27 +1481,7 @@
return p();
}
-#if DYLD_SHARED_CACHE_SUPPORT
-const char* dyld_shared_cache_file_path()
-{
- DYLD_NO_LOCK_THIS_BLOCK;
- static const char* (*p)() = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_shared_cache_file_path", (void**)&p);
- return p();
-}
-#endif
-
-void dyld_dynamic_interpose(const struct mach_header* mh, const struct dyld_interpose_tuple array[], size_t count)
-{
- DYLD_LOCK_THIS_BLOCK;
- static void (*p)(const struct mach_header* mh, const struct dyld_interpose_tuple array[], size_t count) = NULL;
-
- if (p == NULL)
- _dyld_func_lookup("__dyld_dynamic_interpose", (void**)&p);
- p(mh, array, count);
-}
+
// SPI called __fork
@@ -1654,154 +1497,4 @@
-static void* mapStartOfCache(const char* path, size_t length)
-{
- struct stat statbuf;
- if ( ::stat(path, &statbuf) == -1 )
- return NULL;
-
- if ( statbuf.st_size < length )
- return NULL;
-
- int cache_fd = ::open(path, O_RDONLY);
- if ( cache_fd < 0 )
- return NULL;
-
- void* result = ::mmap(NULL, length, PROT_READ, MAP_PRIVATE, cache_fd, 0);
- close(cache_fd);
-
- if ( result == MAP_FAILED )
- return NULL;
-
- return result;
-}
-
-
-static const dyld_cache_header* findCacheInDirAndMap(const uuid_t cacheUuid, const char* dirPath)
-{
- DIR* dirp = ::opendir(dirPath);
- if ( dirp != NULL) {
- dirent entry;
- dirent* entp = NULL;
- char cachePath[PATH_MAX];
- while ( ::readdir_r(dirp, &entry, &entp) == 0 ) {
- if ( entp == NULL )
- break;
- if ( entp->d_type != DT_REG )
- continue;
- if ( strlcpy(cachePath, dirPath, PATH_MAX) >= PATH_MAX )
- continue;
- if ( strlcat(cachePath, "/", PATH_MAX) >= PATH_MAX )
- continue;
- if ( strlcat(cachePath, entp->d_name, PATH_MAX) >= PATH_MAX )
- continue;
- if ( const dyld_cache_header* cacheHeader = (dyld_cache_header*)mapStartOfCache(cachePath, 0x00100000) ) {
- if ( ::memcmp(cacheHeader->uuid, cacheUuid, 16) != 0 ) {
- // wrong uuid, unmap and keep looking
- ::munmap((void*)cacheHeader, 0x00100000);
- }
- else {
- // found cache
- closedir(dirp);
- return cacheHeader;
- }
- }
- }
- closedir(dirp);
- }
- return NULL;
-}
-
-int dyld_shared_cache_find_iterate_text(const uuid_t cacheUuid, const char* extraSearchDirs[], void (^callback)(const dyld_shared_cache_dylib_text_info* info))
-{
- const dyld_cache_header* cacheHeader = NULL;
- bool needToUnmap = true;
-
- // get info from dyld about this process, to see if requested cache is already mapped into this process
- const dyld_all_image_infos* allInfo = _dyld_get_all_image_infos();
- if ( (allInfo != NULL) && (memcmp(allInfo->sharedCacheUUID, cacheUuid, 16) == 0) ) {
- // requested cache is already mapped, just re-use it
- cacheHeader = (dyld_cache_header*)(SHARED_REGION_BASE + allInfo->sharedCacheSlide);
- needToUnmap = false;
- }
- else {
- // look first is default location for cache files
- #if __IPHONE_OS_VERSION_MIN_REQUIRED
- const char* defaultSearchDir = IPHONE_DYLD_SHARED_CACHE_DIR;
- #else
- const char* defaultSearchDir = MACOSX_DYLD_SHARED_CACHE_DIR;
- #endif
- cacheHeader = findCacheInDirAndMap(cacheUuid, defaultSearchDir);
- // if not there, look in extra search locations
- if ( cacheHeader == NULL ) {
- for (const char** p = extraSearchDirs; *p != NULL; ++p) {
- cacheHeader = findCacheInDirAndMap(cacheUuid, *p);
- if ( cacheHeader != NULL )
- break;
- }
- }
- }
-
- if ( cacheHeader == NULL )
- return -1;
-
- if ( cacheHeader->mappingOffset < sizeof(dyld_cache_header) ) {
- // old cache without imagesText array
- if ( needToUnmap )
- ::munmap((void*)cacheHeader, 0x00100000);
- return -1;
- }
-
- // walk imageText table and call callback for each entry
- const dyld_cache_image_text_info* imagesText = (dyld_cache_image_text_info*)((char*)cacheHeader + cacheHeader->imagesTextOffset);
- const dyld_cache_image_text_info* imagesTextEnd = &imagesText[cacheHeader->imagesTextCount];
- for (const dyld_cache_image_text_info* p=imagesText; p < imagesTextEnd; ++p) {
- dyld_shared_cache_dylib_text_info dylibTextInfo;
- dylibTextInfo.version = 1;
- dylibTextInfo.loadAddressUnslid = p->loadAddress;
- dylibTextInfo.textSegmentSize = p->textSegmentSize;
- dylibTextInfo.path = (char*)cacheHeader + p->pathOffset;
- ::memcpy(dylibTextInfo.dylibUuid, p->uuid, 16);
- callback(&dylibTextInfo);
- }
-
- if ( needToUnmap )
- ::munmap((void*)cacheHeader, 0x00100000);
-
- return 0;
-}
-
-int dyld_shared_cache_iterate_text(const uuid_t cacheUuid, void (^callback)(const dyld_shared_cache_dylib_text_info* info))
-{
- const char* extraSearchDirs[] = { NULL };
- return dyld_shared_cache_find_iterate_text(cacheUuid, extraSearchDirs, callback);
-}
-
-
-bool _dyld_is_memory_immutable(const void* addr, size_t length)
-{
- DYLD_NO_LOCK_THIS_BLOCK;
- static bool (*p)(const void*, size_t) = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_is_memory_immutable", (void**)&p);
- return p(addr, length);
-}
-
-
-void _dyld_objc_notify_register(_dyld_objc_notify_mapped mapped,
- _dyld_objc_notify_init init,
- _dyld_objc_notify_unmapped unmapped)
-{
- DYLD_LOCK_THIS_BLOCK;
- static bool (*p)(_dyld_objc_notify_mapped, _dyld_objc_notify_init, _dyld_objc_notify_unmapped) = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_objc_notify_register", (void**)&p);
- p(mapped, init, unmapped);
-}
-
-
-
-
-
+