Loading...
--- dyld/dyld-353.2.1/src/dyldAPIsInLibSystem.cpp
+++ dyld/dyld-239.3/src/dyldAPIsInLibSystem.cpp
@@ -34,13 +34,11 @@
#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
@@ -63,6 +61,7 @@
#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
@@ -80,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;
/*
@@ -104,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
@@ -114,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
@@ -347,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);
}
/*
@@ -385,31 +391,39 @@
* 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))
@@ -426,18 +440,17 @@
*/
uint32_t dyld_get_sdk_version(const mach_header* mh)
{
- const load_command* startCmds = NULL;
+ 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));
+ 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
uint32_t foundationVers = 0;
@@ -445,12 +458,7 @@
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 ) {
+ switch ( cmd->cmd ) {
#if __IPHONE_OS_VERSION_MIN_REQUIRED
case LC_VERSION_MIN_IPHONEOS:
#else
@@ -469,9 +477,6 @@
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 )
@@ -482,7 +487,7 @@
#endif
break;
}
- cmd = nextCmd;
+ cmd = (load_command*)((char *)cmd + cmd->cmdsize);
}
struct DylibToOSMapping {
@@ -556,26 +561,21 @@
return dyld_get_sdk_version((mach_header*)_NSGetMachExecuteHeader());
}
+
uint32_t dyld_get_min_os_version(const struct mach_header* mh)
{
- const load_command* startCmds = NULL;
+ 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));
+ 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 load_command* cmd = startCmds;
+ const load_command* cmd = cmds;
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
@@ -585,7 +585,7 @@
return versCmd->version; // found explicit min OS version
break;
}
- cmd = nextCmd;
+ cmd = (load_command*)((char *)cmd + cmd->cmdsize);
}
return 0;
}
@@ -1093,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);
@@ -1168,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)
@@ -1208,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 ) {
@@ -1222,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);
@@ -1234,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);
@@ -1283,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,
@@ -1299,8 +1310,7 @@
&hasPerThreadBufferFor_dlerror,
&isLaunchdOwned,
&vm_allocate,
- &mmap,
- &__cxa_finalize_ranges};
+ &mmap};
//
@@ -1411,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;
@@ -1424,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)
{
@@ -1448,6 +1458,7 @@
return p(addr);
}
+#if __IPHONE_OS_VERSION_MIN_REQUIRED
bool dyld_shared_cache_some_image_overridden()
{
DYLD_NO_LOCK_THIS_BLOCK;
@@ -1457,6 +1468,7 @@
_dyld_func_lookup("__dyld_shared_cache_some_image_overridden", (void**)&p);
return p();
}
+#endif
bool dyld_process_is_restricted()
@@ -1470,15 +1482,6 @@
}
-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