Loading...
--- dyld/dyld-210.2.3/src/dyldAPIsInLibSystem.cpp
+++ dyld/dyld-132.13/src/dyldAPIsInLibSystem.cpp
@@ -34,31 +34,9 @@
#include "dyldLock.h"
-extern "C" int __cxa_atexit(void (*func)(void *), void *arg, void *dso);
-extern "C" void __cxa_finalize(const void *dso);
-
-
-#ifndef LC_VERSION_MIN_MACOSX
- #define LC_VERSION_MIN_MACOSX 0x24
- struct version_min_command {
- uint32_t cmd; /* LC_VERSION_MIN_MACOSX or
- LC_VERSION_MIN_IPHONEOS */
- uint32_t cmdsize; /* sizeof(struct min_version_command) */
- uint32_t version; /* X.Y.Z is encoded in nibbles xxxx.yy.zz */
- uint32_t sdk; /* X.Y.Z is encoded in nibbles xxxx.yy.zz */
- };
-#endif
-
-#ifndef LC_VERSION_MIN_IPHONEOS
- #define LC_VERSION_MIN_IPHONEOS 0x25
-#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__)
+extern "C" int __cxa_atexit(void (*func)(void *), void *arg, void *dso);
+
+#define DYLD_SHARED_CACHE_SUPPORT (__ppc__ || __i386__ || __ppc64__ || __x86_64__)
// deprecated APIs are still availble on Mac OS X, but not on iPhone OS
#if __IPHONE_OS_VERSION_MIN_REQUIRED
@@ -126,16 +104,15 @@
const NSLinkEditErrorHandlers* handlers)
{
DYLD_LOCK_THIS_BLOCK;
- typedef void (*ucallback_t)(const char* symbol_name);
- typedef NSModule (*mcallback_t)(NSSymbol s, NSModule old, NSModule newhandler);
- typedef void (*lcallback_t)(NSLinkEditErrors c, int errorNumber,
- const char* fileName, const char* errorString);
- static void (*p)(ucallback_t undefined, mcallback_t multiple, lcallback_t linkEdit) = NULL;
+ static void (*p)(
+ void (*undefined)(const char* symbol_name),
+ NSModule (*multiple)(NSSymbol s, NSModule old, NSModule newhandler),
+ void (*linkEdit)(NSLinkEditErrors c, int errorNumber,
+ const char* fileName, const char* errorString)) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_install_handlers", (void**)&p);
- mcallback_t m = handlers->multiple;
- p(handlers->undefined, m, handlers->linkEdit);
+ p(handlers->undefined, handlers->multiple, handlers->linkEdit);
}
const char*
@@ -369,7 +346,6 @@
switch ( lc->cmd ) {
case LC_LOAD_DYLIB:
case LC_LOAD_WEAK_DYLIB:
- case LC_LOAD_UPWARD_DYLIB:
dl = (struct dylib_command *)lc;
install_name = (char *)dl + dl->dylib.name.offset;
if(names_match(install_name, libraryName) == TRUE)
@@ -423,119 +399,6 @@
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) {
- switch ( cmd->cmd ) {
- case LC_VERSION_MIN_MACOSX:
- case LC_VERSION_MIN_IPHONEOS:
- versCmd = (version_min_command*)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;
- if ( strcmp((char*)dylibCmd + dylibCmd->dylib.name.offset, "/usr/lib/libSystem.B.dylib") == 0 )
- libSystemVers = dylibCmd->dylib.current_version;
- 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 = (load_command*)((char *)cmd + cmd->cmdsize);
- }
-
- 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;
- }
- cmd = (load_command*)((char *)cmd + cmd->cmdsize);
- }
- return 0;
-}
-
-
-uint32_t dyld_get_program_min_os_version()
-{
- return dyld_get_min_os_version((mach_header*)_NSGetMachExecuteHeader());
-}
-
-
#if DEPRECATED_APIS_SUPPORTED
/*
* NSCreateObjectFileImageFromFile() creates an NSObjectFileImage for the
@@ -902,8 +765,7 @@
void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide))
{
DYLD_LOCK_THIS_BLOCK;
- typedef void (*callback_t)(const struct mach_header *mh, intptr_t vmaddr_slide);
- static void (*p)(callback_t func) = NULL;
+ static void (*p)(void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide)) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_register_func_for_add_image", (void**)&p);
@@ -920,8 +782,7 @@
void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide))
{
DYLD_LOCK_THIS_BLOCK;
- typedef void (*callback_t)(const struct mach_header *mh, intptr_t vmaddr_slide);
- static void (*p)(callback_t func) = NULL;
+ static void (*p)(void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide)) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_register_func_for_remove_image", (void**)&p);
@@ -1111,8 +972,7 @@
void (*monaddition)(char *lowpc, char *highpc))
{
DYLD_LOCK_THIS_BLOCK;
- typedef void (*monproc)(char *lowpc, char *highpc);
- static void (*p)(monproc monaddition) = NULL;
+ static void (*p)(void (*monaddition)(char *lowpc, char *highpc)) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_moninit", (void**)&p);
@@ -1205,10 +1065,9 @@
}
#endif // DYLD_SHARED_CACHE_SUPPORT
-extern void* start;
// the table passed to dyld containing thread helpers
-static dyld::LibSystemHelpers sHelpers = { 9, &dyldGlobalLockAcquire, &dyldGlobalLockRelease,
+static dyld::LibSystemHelpers sHelpers = { 6, &dyldGlobalLockAcquire, &dyldGlobalLockRelease,
&getPerThreadBufferFor_dlerror, &malloc, &free, &__cxa_atexit,
#if DYLD_SHARED_CACHE_SUPPORT
&shared_cache_missing, &shared_cache_out_of_date,
@@ -1217,18 +1076,14 @@
#endif
NULL, NULL,
&pthread_key_create, &pthread_setspecific,
- &malloc_size,
- &pthread_getspecific,
- &__cxa_finalize,
- &start};
+ &malloc_size };
//
// during initialization of libSystem this routine will run
// and call dyld, registering the helper functions.
//
-extern "C" void tlv_initializer();
-extern "C" void _dyld_initializer();
+extern "C" void _dyld_initializer() __attribute__((visibility("hidden")));
void _dyld_initializer()
{
DYLD_LOCK_INITIALIZER;
@@ -1238,8 +1093,6 @@
_dyld_func_lookup("__dyld_register_thread_helpers", (void**)&p);
if(p != NULL)
p(&sHelpers);
-
- tlv_initializer();
}
@@ -1334,6 +1187,7 @@
}
#if !__arm__
+__attribute__((visibility("hidden")))
bool _dyld_find_unwind_sections(void* addr, dyld_unwind_sections* info)
{
DYLD_NO_LOCK_THIS_BLOCK;
@@ -1346,7 +1200,7 @@
#endif
-#if __i386__ || __x86_64__ || __arm__
+#if __i386__ || __x86_64__
__attribute__((visibility("hidden")))
void* _dyld_fast_stub_entry(void* loadercache, long lazyinfo)
{
@@ -1370,30 +1224,4 @@
return p(addr);
}
-#if __IPHONE_OS_VERSION_MIN_REQUIRED
-bool dyld_shared_cache_some_image_overridden()
-{
- DYLD_NO_LOCK_THIS_BLOCK;
- static bool (*p)() = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_shared_cache_some_image_overridden", (void**)&p);
- return p();
-}
-#endif
-
-
-// SPI called __fork
-void _dyld_fork_child()
-{
- DYLD_NO_LOCK_THIS_BLOCK;
- static void (*p)() = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_fork_child", (void**)&p);
- return p();
-}
-
-
-
-
+