Loading...
--- dyld/dyld-195.5/src/dyldAPIsInLibSystem.cpp
+++ dyld/dyld-44.4/src/dyldAPIsInLibSystem.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-2005 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
@@ -24,31 +24,12 @@
#include <stddef.h>
#include <string.h>
-#include <malloc/malloc.h>
-
#include <crt_externs.h>
-#include <Availability.h>
#include "mach-o/dyld.h"
#include "mach-o/dyld_priv.h"
#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_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 (__ppc__ || __i386__ || __ppc64__ || __x86_64__ || __arm__)
-
-// 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
-#endif
/*
* names_match() takes an install_name from an LC_LOAD_DYLIB command and a
@@ -103,29 +84,26 @@
return(FALSE);
}
-#if DEPRECATED_APIS_SUPPORTED
-
void NSInstallLinkEditErrorHandlers(
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;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
+ 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*
NSNameOfModule(
NSModule module)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static const char* (*p)(NSModule module) = NULL;
if(p == NULL)
@@ -137,7 +115,7 @@
NSLibraryNameForModule(
NSModule module)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static const char* (*p)(NSModule module) = NULL;
if(p == NULL)
@@ -149,7 +127,7 @@
NSIsSymbolNameDefined(
const char* symbolName)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(const char* symbolName) = NULL;
if(p == NULL)
@@ -162,7 +140,7 @@
const char* symbolName,
const char* libraryNameHint)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(const char* symbolName,
const char* libraryNameHint) = NULL;
@@ -176,7 +154,7 @@
const struct mach_header *image,
const char* symbolName)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(const struct mach_header *image,
const char* symbolName) = NULL;
@@ -189,7 +167,7 @@
NSLookupAndBindSymbol(
const char* symbolName)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static NSSymbol (*p)(const char* symbolName) = NULL;
if(p == NULL)
@@ -202,7 +180,7 @@
const char* symbolName,
const char* libraryNameHint)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static NSSymbol (*p)(const char* symbolName,
const char* libraryNameHint) = NULL;
@@ -216,7 +194,7 @@
NSModule module,
const char* symbolName)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static NSSymbol (*p)(NSModule module, const char* symbolName) = NULL;
if(p == NULL)
@@ -230,7 +208,7 @@
const char* symbolName,
uint32_t options)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static NSSymbol (*p)(const struct mach_header *image,
const char* symbolName,
uint32_t options) = NULL;
@@ -244,7 +222,7 @@
NSNameOfSymbol(
NSSymbol symbol)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static char * (*p)(NSSymbol symbol) = NULL;
if(p == NULL)
@@ -256,7 +234,7 @@
NSAddressOfSymbol(
NSSymbol symbol)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static void * (*p)(NSSymbol symbol) = NULL;
if(p == NULL)
@@ -268,7 +246,7 @@
NSModuleForSymbol(
NSSymbol symbol)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static NSModule (*p)(NSSymbol symbol) = NULL;
if(p == NULL)
@@ -280,7 +258,7 @@
NSAddLibrary(
const char* pathName)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static bool (*p)(const char* pathName) = NULL;
if(p == NULL)
@@ -292,7 +270,7 @@
NSAddLibraryWithSearching(
const char* pathName)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static bool (*p)(const char* pathName) = NULL;
if(p == NULL)
@@ -305,7 +283,7 @@
const char* image_name,
uint32_t options)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static const struct mach_header * (*p)(const char* image_name,
uint32_t options) = NULL;
@@ -313,7 +291,6 @@
_dyld_func_lookup("__dyld_NSAddImage", (void**)&p);
return(p(image_name, options));
}
-#endif // DEPRECATED_APIS_SUPPORTED
/*
* This routine returns the current version of the named shared library the
@@ -334,31 +311,30 @@
struct load_command *load_commands, *lc;
struct dylib_command *dl;
char *install_name;
-#if __LP64__
- static struct mach_header_64 *mh = NULL;
-#else
+#ifndef __OPENSTEP__
static struct mach_header *mh = NULL;
-#endif
if(mh == NULL)
mh = _NSGetMachExecuteHeader();
+#else /* defined(__OPENSTEP__) */
+#ifdef __DYNAMIC__
+ static struct mach_header *mh = NULL;
+ if(mh == NULL)
+ _dyld_lookup_and_bind("__mh_execute_header", &mh, NULL);
+#else
+ struct mach_header *mh;
+ mh = (struct mach_header *)&_mh_execute_header;
+#endif
+#endif /* __OPENSTEP__ */
load_commands = (struct load_command *)
-#if __LP64__
- ((char *)mh + sizeof(struct mach_header_64));
-#else
- ((char *)mh + sizeof(struct mach_header));
-#endif
+ ((char *)mh + sizeof(struct mach_header));
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:
- 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;
- }
+ if(lc->cmd == LC_LOAD_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);
@@ -387,11 +363,7 @@
if(mh->filetype != MH_DYLIB)
continue;
load_commands = (struct load_command *)
-#if __LP64__
- ((char *)mh + sizeof(struct mach_header_64));
-#else
((char *)mh + sizeof(struct mach_header));
-#endif
lc = load_commands;
for(j = 0; j < mh->ncmds; j++){
if(lc->cmd == LC_ID_DYLIB){
@@ -406,7 +378,6 @@
return(-1);
}
-#if DEPRECATED_APIS_SUPPORTED
/*
* NSCreateObjectFileImageFromFile() creates an NSObjectFileImage for the
* specified file name if the file is a correct Mach-O file that can be loaded
@@ -419,7 +390,7 @@
const char* pathName,
NSObjectFileImage *objectFileImage)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static NSObjectFileImageReturnCode (*p)(const char*, NSObjectFileImage*) = NULL;
if(p == NULL)
@@ -441,7 +412,7 @@
size_t size,
NSObjectFileImage *objectFileImage)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static NSObjectFileImageReturnCode (*p)(const void*, size_t, NSObjectFileImage*) = NULL;
if(p == NULL)
@@ -449,7 +420,6 @@
return p(address, size, objectFileImage);
}
-#if OBSOLETE_DYLD_API
/*
* NSCreateCoreFileImageFromFile() creates an NSObjectFileImage for the
* specified core file name if the file is a correct Mach-O core file.
@@ -461,20 +431,19 @@
const char* pathName,
NSObjectFileImage *objectFileImage)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static NSObjectFileImageReturnCode (*p)(const char*, NSObjectFileImage*) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_NSCreateCoreFileImageFromFile", (void**)&p);
return p(pathName, objectFileImage);
}
-#endif
bool
NSDestroyObjectFileImage(
NSObjectFileImage objectFileImage)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static bool (*p)(NSObjectFileImage) = NULL;
if(p == NULL)
@@ -489,7 +458,7 @@
const char* moduleName,
uint32_t options)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static NSModule (*p)(NSObjectFileImage, const char*, unsigned long) = NULL;
if(p == NULL)
@@ -499,6 +468,31 @@
}
+/*
+ * NSFindSectionAndOffsetInObjectFileImage() takes the specified imageOffset
+ * into the specified ObjectFileImage and 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.
+ *
+ * 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 */
+{
+ DYLD_READER_LOCK_THIS_BLOCK;
+ static bool (*p)(NSObjectFileImage, unsigned long, const char**, const char**, unsigned long*) = NULL;
+
+ if(p == NULL)
+ _dyld_func_lookup("__dyld_NSFindSectionAndOffsetInObjectFileImage", (void**)&p);
+
+ return p(objectFileImage, imageOffset, segmentName, sectionName, sectionOffset);
+}
/*
@@ -509,7 +503,7 @@
NSSymbolDefinitionCountInObjectFileImage(
NSObjectFileImage objectFileImage)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static unsigned long (*p)(NSObjectFileImage) = NULL;
if(p == NULL)
@@ -529,7 +523,7 @@
NSObjectFileImage objectFileImage,
uint32_t ordinal)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static const char* (*p)(NSObjectFileImage, uint32_t) = NULL;
if(p == NULL)
@@ -546,7 +540,7 @@
NSSymbolReferenceCountInObjectFileImage(
NSObjectFileImage objectFileImage)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static unsigned long (*p)(NSObjectFileImage) = NULL;
if(p == NULL)
@@ -567,7 +561,7 @@
uint32_t ordinal,
bool *tentative_definition) /* can be NULL */
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static const char* (*p)(NSObjectFileImage, uint32_t, bool*) = NULL;
if(p == NULL)
@@ -585,7 +579,7 @@
NSObjectFileImage objectFileImage,
const char* symbolName)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(NSObjectFileImage, const char*) = NULL;
if(p == NULL)
@@ -608,7 +602,7 @@
const char* sectionName,
unsigned long *size) /* can be NULL */
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static void* (*p)(NSObjectFileImage, const char*, const char*, unsigned long*) = NULL;
if(p == NULL)
@@ -617,6 +611,24 @@
return p(objectFileImage, segmentName, sectionName, size);
}
+/*
+ * NSHasModInitObjectFileImage() returns TRUE if the NSObjectFileImage has any
+ * module initialization sections and FALSE it it does not.
+ *
+ * SPI: currently only used by ZeroLink to detect C++ initializers
+ */
+bool
+NSHasModInitObjectFileImage(
+NSObjectFileImage objectFileImage)
+{
+ DYLD_READER_LOCK_THIS_BLOCK;
+ static bool (*p)(NSObjectFileImage) = NULL;
+
+ if(p == NULL)
+ _dyld_func_lookup("__dyld_NSHasModInitObjectFileImage", (void**)&p);
+
+ return p(objectFileImage);
+}
void
NSLinkEditError(
@@ -625,7 +637,7 @@
const char* *fileName,
const char* *errorString)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(NSLinkEditErrors *c,
int *errorNumber,
const char* *fileName,
@@ -642,7 +654,7 @@
NSModule module,
uint32_t options)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static bool (*p)(NSModule module, uint32_t options) = NULL;
if(p == NULL)
@@ -651,7 +663,6 @@
return p(module, options);
}
-#if OBSOLETE_DYLD_API
NSModule
NSReplaceModule(
NSModule moduleToReplace,
@@ -660,10 +671,6 @@
{
return(NULL);
}
-#endif
-
-
-#endif // DEPRECATED_APIS_SUPPORTED
/*
*_NSGetExecutablePath copies the path of the executable into the buffer and
@@ -679,7 +686,7 @@
char *buf,
uint32_t *bufsize)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static int (*p)(char *buf, uint32_t *bufsize) = NULL;
if(p == NULL)
@@ -687,14 +694,13 @@
return(p(buf, bufsize));
}
-#if DEPRECATED_APIS_SUPPORTED
void
_dyld_lookup_and_bind(
const char* symbol_name,
void** address,
NSModule* module)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(const char*, void** , NSModule*) = NULL;
if(p == NULL)
@@ -709,7 +715,7 @@
void** address,
NSModule* module)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(const char*, const char*, void**, NSModule*) = NULL;
if(p == NULL)
@@ -717,21 +723,19 @@
p(symbol_name, library_name_hint, address, module);
}
-#if OBSOLETE_DYLD_API
void
_dyld_lookup_and_bind_objc(
const char* symbol_name,
void** address,
NSModule* module)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(const char* , void**, NSModule*) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_lookup_and_bind_objc", (void**)&p);
p(symbol_name, address, module);
}
-#endif
void
_dyld_lookup_and_bind_fully(
@@ -739,7 +743,7 @@
void** address,
NSModule* module)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(const char*, void**, NSModule*) = NULL;
if(p == NULL)
@@ -751,14 +755,13 @@
_dyld_bind_fully_image_containing_address(
const void* address)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static bool (*p)(const void*) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_bind_fully_image_containing_address", (void**)&p);
return p(address);
}
-#endif // DEPRECATED_APIS_SUPPORTED
/*
@@ -771,9 +774,8 @@
_dyld_register_func_for_add_image(
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;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
+ 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);
@@ -789,16 +791,14 @@
_dyld_register_func_for_remove_image(
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;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
+ 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);
p(func);
}
-#if OBSOLETE_DYLD_API
/*
* _dyld_register_func_for_link_module registers the specified function to be
* called when a module is bound into the program. When this function is first
@@ -809,7 +809,7 @@
_dyld_register_func_for_link_module(
void (*func)(NSModule module))
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(void (*func)(NSModule module)) = NULL;
if(p == NULL)
@@ -825,7 +825,7 @@
_dyld_register_func_for_unlink_module(
void (*func)(NSModule module))
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(void (*func)(NSModule module)) = NULL;
if(p == NULL)
@@ -841,7 +841,7 @@
_dyld_register_func_for_replace_module(
void (*func)(NSModule oldmodule, NSModule newmodule))
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void (*p)(void (*func)(NSModule oldmodule,
NSModule newmodule)) = NULL;
@@ -862,7 +862,7 @@
void **objc_module,
unsigned long *size)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static void (*p)(NSModule module,
void **objc_module,
unsigned long *size) = NULL;
@@ -878,39 +878,45 @@
* to be bound.
*/
void
-_dyld_bind_objc_module(const void* objc_module)
-{
- DYLD_LOCK_THIS_BLOCK;
+_dyld_bind_objc_module(
+const void* objc_module)
+{
+ DYLD_READER_LOCK_THIS_BLOCK;
static void (*p)(const void *objc_module) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_bind_objc_module", (void**)&p);
p(objc_module);
}
+
+
+#if __DYNAMIC__
+bool
+_dyld_present(
+void)
+{
+ // hmmm, this code is in libSystem.dylib, which is loaded by dyld...
+ return true;
+}
#endif
-#if DEPRECATED_APIS_SUPPORTED
-bool
-_dyld_present(void)
-{
- // this function exists for compatiblity only
- return true;
-}
-#endif
-
uint32_t
-_dyld_image_count(void)
+_dyld_image_count(
+void)
{
DYLD_NO_LOCK_THIS_BLOCK;
static unsigned long (*p)(void) = NULL;
+ if(_dyld_present() == 0)
+ return(0);
if(p == NULL)
_dyld_func_lookup("__dyld_image_count", (void**)&p);
return(p());
}
const struct mach_header *
-_dyld_get_image_header(uint32_t image_index)
+_dyld_get_image_header(
+uint32_t image_index)
{
DYLD_NO_LOCK_THIS_BLOCK;
static struct mach_header * (*p)(uint32_t image_index) = NULL;
@@ -921,7 +927,8 @@
}
intptr_t
-_dyld_get_image_vmaddr_slide(uint32_t image_index)
+_dyld_get_image_vmaddr_slide(
+uint32_t image_index)
{
DYLD_NO_LOCK_THIS_BLOCK;
static unsigned long (*p)(uint32_t image_index) = NULL;
@@ -932,7 +939,8 @@
}
const char*
-_dyld_get_image_name(uint32_t image_index)
+_dyld_get_image_name(
+uint32_t image_index)
{
DYLD_NO_LOCK_THIS_BLOCK;
static const char* (*p)(uint32_t image_index) = NULL;
@@ -942,22 +950,11 @@
return(p(image_index));
}
-// SPI in Mac OS X 10.6
-intptr_t _dyld_get_image_slide(const struct mach_header* mh)
-{
- DYLD_NO_LOCK_THIS_BLOCK;
- static intptr_t (*p)(const struct mach_header*) = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_get_image_slide", (void**)&p);
- return(p(mh));
-}
-
-
-bool
-_dyld_image_containing_address(const void* address)
-{
- DYLD_LOCK_THIS_BLOCK;
+bool
+_dyld_image_containing_address(
+const void* address)
+{
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(const void*) = NULL;
if(p == NULL)
@@ -969,7 +966,7 @@
_dyld_get_image_header_containing_address(
const void* address)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static const struct mach_header * (*p)(const void*) = NULL;
if(p == NULL)
@@ -980,19 +977,18 @@
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;
+ DYLD_READER_LOCK_THIS_BLOCK;
+ static void (*p)(void (*monaddition)(char *lowpc, char *highpc)) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_moninit", (void**)&p);
p(monaddition);
}
-#if DEPRECATED_APIS_SUPPORTED
-bool _dyld_launched_prebound(void)
-{
- DYLD_LOCK_THIS_BLOCK;
+bool _dyld_launched_prebound(
+void)
+{
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(void) = NULL;
if(p == NULL)
@@ -1000,16 +996,16 @@
return(p());
}
-bool _dyld_all_twolevel_modules_prebound(void)
-{
- DYLD_LOCK_THIS_BLOCK;
+bool _dyld_all_twolevel_modules_prebound(
+void)
+{
+ DYLD_READER_LOCK_THIS_BLOCK;
static bool (*p)(void) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_all_twolevel_modules_prebound", (void**)&p);
return(p());
}
-#endif // DEPRECATED_APIS_SUPPORTED
#include <dlfcn.h>
@@ -1017,13 +1013,11 @@
#include <pthread.h>
#include <stdlib.h>
#include <mach-o/dyld.h>
-#include <servers/bootstrap.h>
-#include "dyldLibSystemInterface.h"
-
+#include "dyldLock.h"
+#include "dyldLibSystemThreadHelpers.h"
// pthread key used to access per-thread dlerror message
static pthread_key_t dlerrorPerThreadKey;
-static bool dlerrorPerThreadKeyInitialized = false;
// data kept per-thread
struct dlerrorPerThreadData
@@ -1035,13 +1029,6 @@
// function called by dyld to get buffer to store dlerror message
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 ) {
- // create key and tell pthread package to call free() on any data associated with key if thread dies
- pthread_key_create(&dlerrorPerThreadKey, &free);
- dlerrorPerThreadKeyInitialized = true;
- }
-
const int size = (sizeRequired < 256) ? 256 : sizeRequired;
dlerrorPerThreadData* data = (dlerrorPerThreadData*)pthread_getspecific(dlerrorPerThreadKey);
if ( data == NULL ) {
@@ -1062,58 +1049,37 @@
return data->message;
}
-
-#if DYLD_SHARED_CACHE_SUPPORT
-static void shared_cache_missing()
-{
- // leave until dyld's that might call this are rare
-}
-
-static void shared_cache_out_of_date()
-{
- // leave until dyld's that might call this are rare
-}
-#endif // DYLD_SHARED_CACHE_SUPPORT
-
-
-// the table passed to dyld containing thread helpers
-static dyld::LibSystemHelpers sHelpers = { 8, &dyldGlobalLockAcquire, &dyldGlobalLockRelease,
- &getPerThreadBufferFor_dlerror, &malloc, &free, &__cxa_atexit,
- #if DYLD_SHARED_CACHE_SUPPORT
- &shared_cache_missing, &shared_cache_out_of_date,
- #else
- NULL, NULL,
- #endif
- NULL, NULL,
- &pthread_key_create, &pthread_setspecific,
- &malloc_size,
- &pthread_getspecific,
- &__cxa_finalize};
-
+// that table passed to dyld containing thread helpers
+static dyld::ThreadingHelpers sThreadHelpers = { 1, &lockForLazyBinding, &unlockForLazyBinding, &getPerThreadBufferFor_dlerror };
//
// during initialization of libSystem this routine will run
-// and call dyld, registering the helper functions.
+// and call dyld, registering the threading helpers.
//
-extern "C" void tlv_initializer();
-extern "C" void _dyld_initializer();
-void _dyld_initializer()
-{
- DYLD_LOCK_INITIALIZER;
+//
+static int registerWithDyld()
+{
+ static void (*p)(dyld::ThreadingHelpers*) = NULL;
+
+ // create key and tell pthread package to call free() on any data associated with key if thread dies
+ pthread_key_create(&dlerrorPerThreadKey, &free);
- void (*p)(dyld::LibSystemHelpers*);
-
- _dyld_func_lookup("__dyld_register_thread_helpers", (void**)&p);
+ if(p == NULL)
+ _dyld_func_lookup("__dyld_register_thread_helpers", (void**)&p);
if(p != NULL)
- p(&sHelpers);
-
- tlv_initializer();
-}
+ p(&sThreadHelpers);
+
+ return 0;
+}
+
+// should be able to use __attribute__((constructor)) on registerWithDyld, but compiler has bug (3679135)
+// instead use initialization of global to force it to run.
+static int hack = registerWithDyld();
char* dlerror()
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static char* (*p)() = NULL;
if(p == NULL)
@@ -1123,7 +1089,7 @@
int dladdr(const void* addr, Dl_info* info)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static int (*p)(const void* , Dl_info*) = NULL;
if(p == NULL)
@@ -1133,7 +1099,7 @@
int dlclose(void* handle)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static int (*p)(void* handle) = NULL;
if(p == NULL)
@@ -1142,36 +1108,18 @@
}
void* dlopen(const char* path, int mode)
-{
- // dlopen is special. locking is done inside dyld to allow initializer to run without lock
- DYLD_NO_LOCK_THIS_BLOCK;
-
+{
+ DYLD_WRITER_LOCK_THIS_BLOCK;
static void* (*p)(const char* path, int) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_dlopen", (void**)&p);
- void* result = p(path, mode);
- // use asm block to prevent tail call optimization
- // this is needed because dlopen uses __builtin_return_address() and depends on this glue being in the frame chain
- // <rdar://problem/5313172 dlopen() looks too far up stack, can cause crash>
- __asm__ volatile("");
-
- return result;
-}
-
-bool dlopen_preflight(const char* path)
-{
- DYLD_LOCK_THIS_BLOCK;
- static bool (*p)(const char* path) = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_dlopen_preflight", (void**)&p);
- return(p(path));
+ return(p(path, mode));
}
void* dlsym(void* handle, const char* symbol)
{
- DYLD_LOCK_THIS_BLOCK;
+ DYLD_READER_LOCK_THIS_BLOCK;
static void* (*p)(void* handle, const char* symbol) = NULL;
if(p == NULL)
@@ -1179,89 +1127,7 @@
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()
-{
- DYLD_NO_LOCK_THIS_BLOCK;
- static struct dyld_all_image_infos* (*p)() = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_get_all_image_infos", (void**)&p);
- return p();
-}
-
-#if !__arm__
-bool _dyld_find_unwind_sections(void* addr, dyld_unwind_sections* info)
-{
- DYLD_NO_LOCK_THIS_BLOCK;
- static void* (*p)(void*, dyld_unwind_sections*) = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_find_unwind_sections", (void**)&p);
- return p(addr, info);
-}
-#endif
-
-
-#if __i386__ || __x86_64__ || __arm__
-__attribute__((visibility("hidden")))
-void* _dyld_fast_stub_entry(void* loadercache, long lazyinfo)
-{
- DYLD_NO_LOCK_THIS_BLOCK;
- static void* (*p)(void*, long) = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_fast_stub_entry", (void**)&p);
- return p(loadercache, lazyinfo);
-}
-#endif
-
-
-const char* dyld_image_path_containing_address(const void* addr)
-{
- DYLD_NO_LOCK_THIS_BLOCK;
- static const char* (*p)(const void*) = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_image_path_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;
- 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();
-}
-
-
-
-
+
+
+
+