Loading...
--- dyld/dyld-360.14/src/dyldAPIsInLibSystem.cpp
+++ dyld/dyld-210.2.3/src/dyldAPIsInLibSystem.cpp
@@ -1,6 +1,6 @@
/* -*- mode: C++; c-basic-offset: 4; tab-width: 4 -*-
*
- * Copyright (c) 2004-2012 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2009 Apple Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
@@ -25,22 +25,17 @@
#include <stddef.h>
#include <string.h>
#include <malloc/malloc.h>
-#include <sys/mman.h>
#include <crt_externs.h>
#include <Availability.h>
-#include <vproc_priv.h>
#include "mach-o/dyld.h"
#include "mach-o/dyld_priv.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
@@ -58,19 +53,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
@@ -88,10 +76,10 @@
static
bool
names_match(
-const char *install_name,
+char *install_name,
const char* libraryName)
{
- const char *basename;
+ char *basename;
unsigned long n;
/*
@@ -112,7 +100,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
@@ -122,14 +110,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
@@ -355,35 +343,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);
}
/*
@@ -393,293 +388,143 @@
* 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);
-}
-
-
-#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;
- 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;
+ return(-1);
+}
+
+
+/*
+ * 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)
+{
+#if __LP64__
+ const load_command* cmds = (load_command*)((char *)mh + sizeof(mach_header_64));
+#else
+ const load_command* cmds = (load_command*)((char *)mh + sizeof(mach_header));
+#endif
+ const version_min_command* versCmd;
+ const dylib_command* dylibCmd;
+ const load_command* cmd = cmds;
+ uint32_t libSystemVers = 0;
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 ) {
+ switch ( cmd->cmd ) {
+ case LC_VERSION_MIN_MACOSX:
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));
- else
- return 0; // not a mach-o file, or wrong endianness
-
- const load_command* const cmdsEnd = (load_command*)((char*)startCmds + mh->sizeofcmds);
- const dylib_command* dylibCmd;
- const load_command* cmd = startCmds;
- const char* dylibName;
- #if __IPHONE_OS_VERSION_MIN_REQUIRED
- uint32_t foundationVers = 0;
- #else
- uint32_t libSystemVers = 0;
- #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 ) {
+ if ( versCmd->sdk != 0 )
+ return versCmd->sdk; // found explicit SDK version
+ 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 ( strcmp(dylibName, "/System/Library/Frameworks/Foundation.framework/Foundation") == 0 )
- foundationVers = dylibCmd->dylib.current_version;
- #else
- if ( strcmp(dylibName, "/usr/lib/libSystem.B.dylib") == 0 )
+ if ( strcmp((char*)dylibCmd + dylibCmd->dylib.name.offset, "/usr/lib/libSystem.B.dylib") == 0 )
libSystemVers = dylibCmd->dylib.current_version;
- #endif
+ else if ( strcmp((char*)dylibCmd + dylibCmd->dylib.name.offset, "/usr/lib/libSystem.dylib") == 0 )
+ return 0x00040000; // all iOS simulator have same libSystem.dylib version
break;
}
- cmd = nextCmd;
+ cmd = (load_command*)((char *)cmd + cmd->cmdsize);
}
-
- struct DylibToOSMapping {
- uint32_t dylibVersion;
- uint32_t osVersion;
- };
- #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 },
- { PACKED_VERSION(678,29,0), DYLD_IOS_VERSION_2_2 },
- { PACKED_VERSION(678,47,0), DYLD_IOS_VERSION_3_0 },
- { PACKED_VERSION(678,51,0), DYLD_IOS_VERSION_3_1 },
- { PACKED_VERSION(678,60,0), DYLD_IOS_VERSION_3_2 },
- { PACKED_VERSION(751,32,0), DYLD_IOS_VERSION_4_0 },
- { PACKED_VERSION(751,37,0), DYLD_IOS_VERSION_4_1 },
- { PACKED_VERSION(751,49,0), DYLD_IOS_VERSION_4_2 },
- { PACKED_VERSION(751,58,0), DYLD_IOS_VERSION_4_3 },
- { PACKED_VERSION(881,0,0), DYLD_IOS_VERSION_5_0 },
- { 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.
- };
-
- if ( foundationVers != 0 ) {
- uint32_t lastOsVersion = 0;
- for (const DylibToOSMapping* p=foundationMapping; ; ++p) {
- if ( p->dylibVersion == 0 )
- return p->osVersion;
- if ( foundationVers < p->dylibVersion )
- return lastOsVersion;
- lastOsVersion = p->osVersion;
+ if ( libSystemVers != 0 ) {
+ // found linked libSystem.B.dylib version linked against
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
+ // convert libSystem.B.dylib version to iOS sdk version
+ if ( libSystemVers < 0x006F0010 ) // libSystem 111.0.16 in 3.0
+ return 0x00020000; // 2.0
+ else if ( libSystemVers < 0x006F0201 ) // libSystem 111.2.1 in 3.1
+ return 0x00030000; // 3.0
+ else if ( libSystemVers < 0x007D020B ) // libSystem 125.2.11 in 4.0
+ return 0x00030100; // 3.1
+ else if ( libSystemVers < 0x007D0400 ) // libSystem 125.4 in 4.1 and in 4.2
+ return 0x00040000; // 4.0
+ else if ( libSystemVers < 0x009F0000 ) // libSystem 159 in 4.3
+ return 0x00040100; // 4.1
+ else if ( libSystemVers < 0x00A10000 ) // libSystem 161 in 5.0
+ return 0x00040300; // 4.3
+ else
+ return 0x00050000;
+#else
+ // convert libSystem.B.dylib version to MacOSX sdk version
+ if ( libSystemVers < 0x006F0000 ) // libSystem 111 in 10.5
+ return 0x000A0400; // 10.4
+ else if ( libSystemVers < 0x007B0000 ) // libSystem 123 in 10.6
+ return 0x000A0500; // 10.5
+ else if ( libSystemVers < 0x009F0000 ) // libSystem 159 in 10.7
+ return 0x000A0600; // 10.6
+ else if ( libSystemVers < 0x00A10000 ) // libSystem 161 in 10.8
+ return 0x000A0700; // 10.7
+ else
+ return 0x000A0800; // 10.8
+#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)
+{
+#if __LP64__
+ const load_command* cmds = (load_command*)((char *)mh + sizeof(mach_header_64));
+#else
+ const load_command* cmds = (load_command*)((char *)mh + sizeof(mach_header));
+#endif
+ const version_min_command* versCmd;
+ const load_command* cmd = cmds;
+ for(uint32_t i = 0; i < mh->ncmds; ++i) {
+ switch ( cmd->cmd ) {
+ case LC_VERSION_MIN_MACOSX:
+ case LC_VERSION_MIN_IPHONEOS:
+ versCmd = (version_min_command*)cmd;
+ return versCmd->version; // found explicit min OS version
+ break;
}
- }
-
- #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
- // updated to the GM dylib version.
- static const DylibToOSMapping libSystemMapping[] = {
- { PACKED_VERSION(88,1,3), DYLD_MACOSX_VERSION_10_4 },
- { PACKED_VERSION(111,0,0), DYLD_MACOSX_VERSION_10_5 },
- { PACKED_VERSION(123,0,0), DYLD_MACOSX_VERSION_10_6 },
- { PACKED_VERSION(159,0,0), DYLD_MACOSX_VERSION_10_7 },
- { 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 ) {
- uint32_t lastOsVersion = 0;
- for (const DylibToOSMapping* p=libSystemMapping; ; ++p) {
- if ( p->dylibVersion == 0 )
- return p->osVersion;
- if ( libSystemVers < p->dylibVersion )
- return lastOsVersion;
- 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;
- }
- 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
- }
+ cmd = (load_command*)((char *)cmd + cmd->cmdsize);
}
return 0;
}
@@ -1187,7 +1032,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);
@@ -1262,6 +1107,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)
@@ -1302,12 +1158,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 ) {
@@ -1316,11 +1172,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);
@@ -1328,7 +1184,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);
@@ -1336,32 +1192,6 @@
return data->message;
}
-// <rdar://problem/10595338> dlerror buffer leak
-// Only allocate buffer if an actual error message needs to be set
-static bool hasPerThreadBufferFor_dlerror()
-{
- if (!dlerrorPerThreadKeyInitialized )
- return false;
-
- return (pthread_getspecific(dlerrorPerThreadKey) != NULL);
-}
-
-// use non-lazy pointer to vproc_swap_integer so that lazy binding does not recurse
-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() {
- 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()
@@ -1375,9 +1205,10 @@
}
#endif // DYLD_SHARED_CACHE_SUPPORT
+extern void* start;
// the table passed to dyld containing thread helpers
-static dyld::LibSystemHelpers sHelpers = { 13, &dyldGlobalLockAcquire, &dyldGlobalLockRelease,
+static dyld::LibSystemHelpers sHelpers = { 9, &dyldGlobalLockAcquire, &dyldGlobalLockRelease,
&getPerThreadBufferFor_dlerror, &malloc, &free, &__cxa_atexit,
#if DYLD_SHARED_CACHE_SUPPORT
&shared_cache_missing, &shared_cache_out_of_date,
@@ -1389,12 +1220,7 @@
&malloc_size,
&pthread_getspecific,
&__cxa_finalize,
- address_of_start,
- &hasPerThreadBufferFor_dlerror,
- &isLaunchdOwned,
- &vm_allocate,
- &mmap,
- &__cxa_finalize_ranges};
+ &start};
//
@@ -1404,7 +1230,9 @@
extern "C" void tlv_initializer();
extern "C" void _dyld_initializer();
void _dyld_initializer()
-{
+{
+ DYLD_LOCK_INITIALIZER;
+
void (*p)(dyld::LibSystemHelpers*);
_dyld_func_lookup("__dyld_register_thread_helpers", (void**)&p);
@@ -1505,7 +1333,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;
@@ -1518,7 +1346,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)
{
@@ -1542,17 +1370,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;
@@ -1562,39 +1380,7 @@
_dyld_func_lookup("__dyld_shared_cache_some_image_overridden", (void**)&p);
return p();
}
-
-
-bool dyld_process_is_restricted()
-{
- DYLD_NO_LOCK_THIS_BLOCK;
- static bool (*p)() = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_process_is_restricted", (void**)&p);
- 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);
-}
+#endif
// SPI called __fork