Loading...
--- dyld/dyld-551.4/src/dyldAPIsInLibSystem.cpp
+++ dyld/dyld-360.19/src/dyldAPIsInLibSystem.cpp
@@ -31,39 +31,17 @@
#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"
-#include "../dyld3/APIs.h"
-#include "../dyld3/AllImages.h"
-
-
-// this was in dyld_priv.h but it is no longer exported
-extern "C" {
- const struct dyld_all_image_infos* _dyld_get_all_image_infos() __attribute__((visibility("hidden")));
-}
-
-
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);
-//
-// private interface between libSystem.dylib and dyld
-//
-extern "C" int _dyld_func_lookup(const char* dyld_func_name, void **address);
-
-
-extern bool gUseDyld3;
#ifndef LC_VERSION_MIN_MACOSX
#define LC_VERSION_MIN_MACOSX 0x24
@@ -91,42 +69,6 @@
#ifndef LC_LOAD_UPWARD_DYLIB
#define LC_LOAD_UPWARD_DYLIB (0x23|LC_REQ_DYLD) /* load of dylib whose initializers run later */
-#endif
-
-#ifndef LC_BUILD_VERSION
- #define LC_BUILD_VERSION 0x32 /* build for platform min OS version */
-
- /*
- * The build_version_command contains the min OS version on which this
- * binary was built to run for its platform. The list of known platforms and
- * tool values following it.
- */
- struct build_version_command {
- uint32_t cmd; /* LC_BUILD_VERSION */
- uint32_t cmdsize; /* sizeof(struct build_version_command) plus */
- /* ntools * sizeof(struct build_tool_version) */
- uint32_t platform; /* platform */
- uint32_t minos; /* X.Y.Z is encoded in nibbles xxxx.yy.zz */
- uint32_t sdk; /* X.Y.Z is encoded in nibbles xxxx.yy.zz */
- uint32_t ntools; /* number of tool entries following this */
- };
-
- struct build_tool_version {
- uint32_t tool; /* enum for the tool */
- uint32_t version; /* version number of the tool */
- };
-
- /* Known values for the platform field above. */
- #define PLATFORM_MACOS 1
- #define PLATFORM_IOS 2
- #define PLATFORM_TVOS 3
- #define PLATFORM_WATCHOS 4
- #define PLATFORM_BRIDGEOS 5
-
- /* Known values for the tool field above. */
- #define TOOL_CLANG 1
- #define TOOL_SWIFT 2
- #define TOOL_LD 3
#endif
@@ -195,9 +137,6 @@
void NSInstallLinkEditErrorHandlers(
const NSLinkEditErrorHandlers* handlers)
{
- if ( gUseDyld3 )
- return dyld3::NSInstallLinkEditErrorHandlers(handlers);
-
DYLD_LOCK_THIS_BLOCK;
typedef void (*ucallback_t)(const char* symbol_name);
typedef NSModule (*mcallback_t)(NSSymbol s, NSModule old, NSModule newhandler);
@@ -215,9 +154,6 @@
NSNameOfModule(
NSModule module)
{
- if ( gUseDyld3 )
- return dyld3::NSNameOfModule(module);
-
DYLD_LOCK_THIS_BLOCK;
static const char* (*p)(NSModule module) = NULL;
@@ -230,9 +166,6 @@
NSLibraryNameForModule(
NSModule module)
{
- if ( gUseDyld3 )
- return dyld3::NSLibraryNameForModule(module);
-
DYLD_LOCK_THIS_BLOCK;
static const char* (*p)(NSModule module) = NULL;
@@ -245,9 +178,6 @@
NSIsSymbolNameDefined(
const char* symbolName)
{
- if ( gUseDyld3 )
- return dyld3::NSIsSymbolNameDefined(symbolName);
-
DYLD_LOCK_THIS_BLOCK;
static bool (*p)(const char* symbolName) = NULL;
@@ -261,9 +191,6 @@
const char* symbolName,
const char* libraryNameHint)
{
- if ( gUseDyld3 )
- return dyld3::NSIsSymbolNameDefinedWithHint(symbolName, libraryNameHint);
-
DYLD_LOCK_THIS_BLOCK;
static bool (*p)(const char* symbolName,
const char* libraryNameHint) = NULL;
@@ -278,9 +205,6 @@
const struct mach_header *image,
const char* symbolName)
{
- if ( gUseDyld3 )
- return dyld3::NSIsSymbolNameDefinedInImage(image, symbolName);
-
DYLD_LOCK_THIS_BLOCK;
static bool (*p)(const struct mach_header *image,
const char* symbolName) = NULL;
@@ -294,9 +218,6 @@
NSLookupAndBindSymbol(
const char* symbolName)
{
- if ( gUseDyld3 )
- return dyld3::NSLookupAndBindSymbol(symbolName);
-
DYLD_LOCK_THIS_BLOCK;
static NSSymbol (*p)(const char* symbolName) = NULL;
@@ -310,9 +231,6 @@
const char* symbolName,
const char* libraryNameHint)
{
- if ( gUseDyld3 )
- return dyld3::NSLookupAndBindSymbolWithHint(symbolName, libraryNameHint);
-
DYLD_LOCK_THIS_BLOCK;
static NSSymbol (*p)(const char* symbolName,
const char* libraryNameHint) = NULL;
@@ -327,9 +245,6 @@
NSModule module,
const char* symbolName)
{
- if ( gUseDyld3 )
- return dyld3::NSLookupSymbolInModule(module, symbolName);
-
DYLD_LOCK_THIS_BLOCK;
static NSSymbol (*p)(NSModule module, const char* symbolName) = NULL;
@@ -344,11 +259,8 @@
const char* symbolName,
uint32_t options)
{
- if ( gUseDyld3 )
- return dyld3::NSLookupSymbolInImage(image, symbolName, options);
-
DYLD_LOCK_THIS_BLOCK;
- static NSSymbol (*p)(const struct mach_header *image,
+ static NSSymbol (*p)(const struct mach_header *image,
const char* symbolName,
uint32_t options) = NULL;
@@ -361,9 +273,6 @@
NSNameOfSymbol(
NSSymbol symbol)
{
- if ( gUseDyld3 )
- return dyld3::NSNameOfSymbol(symbol);
-
DYLD_LOCK_THIS_BLOCK;
static char * (*p)(NSSymbol symbol) = NULL;
@@ -376,9 +285,6 @@
NSAddressOfSymbol(
NSSymbol symbol)
{
- if ( gUseDyld3 )
- return dyld3::NSAddressOfSymbol(symbol);
-
DYLD_LOCK_THIS_BLOCK;
static void * (*p)(NSSymbol symbol) = NULL;
@@ -391,9 +297,6 @@
NSModuleForSymbol(
NSSymbol symbol)
{
- if ( gUseDyld3 )
- return dyld3::NSModuleForSymbol(symbol);
-
DYLD_LOCK_THIS_BLOCK;
static NSModule (*p)(NSSymbol symbol) = NULL;
@@ -406,9 +309,6 @@
NSAddLibrary(
const char* pathName)
{
- if ( gUseDyld3 )
- return dyld3::NSAddLibrary(pathName);
-
DYLD_LOCK_THIS_BLOCK;
static bool (*p)(const char* pathName) = NULL;
@@ -421,9 +321,6 @@
NSAddLibraryWithSearching(
const char* pathName)
{
- if ( gUseDyld3 )
- return dyld3::NSAddLibrary(pathName);
-
DYLD_LOCK_THIS_BLOCK;
static bool (*p)(const char* pathName) = NULL;
@@ -437,9 +334,6 @@
const char* image_name,
uint32_t options)
{
- if ( gUseDyld3 )
- return dyld3::NSAddImage(image_name, options);
-
DYLD_LOCK_THIS_BLOCK;
static const struct mach_header * (*p)(const char* image_name,
uint32_t options) = NULL;
@@ -463,9 +357,6 @@
*/
int32_t NSVersionOfLinkTimeLibrary(const char* libraryName)
{
- if ( gUseDyld3 )
- return dyld3::NSVersionOfLinkTimeLibrary(libraryName);
-
// Lazily call _NSGetMachExecuteHeader() and cache result
#if __LP64__
static mach_header_64* mh = NULL;
@@ -504,9 +395,6 @@
*/
int32_t NSVersionOfRunTimeLibrary(const char* libraryName)
{
- if ( gUseDyld3 )
- return dyld3::NSVersionOfRunTimeLibrary(libraryName);
-
uint32_t n = _dyld_image_count();
for(uint32_t i = 0; i < n; i++){
const mach_header* mh = _dyld_get_image_header(i);
@@ -536,7 +424,7 @@
#define PACKED_VERSION(major, minor, tiny) ((((major) & 0xffff) << 16) | (((minor) & 0xff) << 8) | ((tiny) & 0xff))
-static bool getVersionLoadCommandInfo(const mach_header* mh, uint32_t* platform, uint32_t* minOS, uint32_t* sdk)
+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 )
@@ -554,37 +442,15 @@
return 0;
}
const version_min_command* versCmd;
- const build_version_command* buildVersCmd;
switch ( cmd->cmd ) {
case LC_VERSION_MIN_IPHONEOS:
- versCmd = (version_min_command*)cmd;
- *platform = PLATFORM_IOS;
- *minOS = versCmd->version;
- *sdk = versCmd->sdk;
- return true;
case LC_VERSION_MIN_MACOSX:
- versCmd = (version_min_command*)cmd;
- *platform = PLATFORM_MACOS;
- *minOS = versCmd->version;
- *sdk = versCmd->sdk;
- return true;
case LC_VERSION_MIN_TVOS:
- versCmd = (version_min_command*)cmd;
- *platform = PLATFORM_TVOS;
- *minOS = versCmd->version;
- *sdk = versCmd->sdk;
- return true;
case LC_VERSION_MIN_WATCHOS:
versCmd = (version_min_command*)cmd;
- *platform = PLATFORM_WATCHOS;
- *minOS = versCmd->version;
- *sdk = versCmd->sdk;
- return true;
- case LC_BUILD_VERSION:
- buildVersCmd = (build_version_command*)cmd;
- *platform = buildVersCmd->platform;
- *minOS = buildVersCmd->minos;
- *sdk = buildVersCmd->sdk;
+ *loadCommand = versCmd->cmd;
+ *minOS = versCmd->version;
+ *sdk = versCmd->sdk;
return true;
}
cmd = nextCmd;
@@ -646,22 +512,22 @@
#if __IPHONE_OS_VERSION_MIN_REQUIRED
static const DylibToOSMapping foundationMapping[] = {
- { PACKED_VERSION(678,24,0), 0x00020000 },
- { PACKED_VERSION(678,26,0), 0x00020100 },
- { PACKED_VERSION(678,29,0), 0x00020200 },
- { PACKED_VERSION(678,47,0), 0x00030000 },
- { PACKED_VERSION(678,51,0), 0x00030100 },
- { PACKED_VERSION(678,60,0), 0x00030200 },
- { PACKED_VERSION(751,32,0), 0x00040000 },
- { PACKED_VERSION(751,37,0), 0x00040100 },
- { PACKED_VERSION(751,49,0), 0x00040200 },
- { PACKED_VERSION(751,58,0), 0x00040300 },
- { PACKED_VERSION(881,0,0), 0x00050000 },
- { PACKED_VERSION(890,1,0), 0x00050100 },
- { PACKED_VERSION(992,0,0), 0x00060000 },
- { PACKED_VERSION(993,0,0), 0x00060100 },
- { PACKED_VERSION(1038,14,0),0x00070000 },
- { PACKED_VERSION(0,0,0), 0x00070000 }
+ { 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.
};
@@ -683,13 +549,13 @@
// 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), 0x000A0400 },
- { PACKED_VERSION(111,0,0), 0x000A0500 },
- { PACKED_VERSION(123,0,0), 0x000A0600 },
- { PACKED_VERSION(159,0,0), 0x000A0700 },
- { PACKED_VERSION(169,3,0), 0x000A0800 },
- { PACKED_VERSION(1197,0,0), 0x000A0900 },
- { PACKED_VERSION(0,0,0), 0x000A0900 }
+ { 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.
};
@@ -718,76 +584,17 @@
uint32_t dyld_get_program_sdk_watch_os_version()
{
- if ( gUseDyld3 )
- return dyld3::dyld_get_program_sdk_watch_os_version();
-
const mach_header* mh = (mach_header*)_NSGetMachExecuteHeader();
- uint32_t platform;
+ uint32_t loadCommand;
uint32_t minOS;
uint32_t sdk;
- if ( getVersionLoadCommandInfo(mh, &platform, &minOS, &sdk) ) {
- if ( platform == PLATFORM_WATCHOS )
+ if ( getVersionLoadCommandInfo(mh, &loadCommand, &minOS, &sdk) ) {
+ if ( loadCommand == LC_VERSION_MIN_WATCHOS )
return sdk;
}
return 0;
}
-
-uint32_t dyld_get_program_min_watch_os_version()
-{
- if ( gUseDyld3 )
- return dyld3::dyld_get_program_min_watch_os_version();
-
- const mach_header* mh = (mach_header*)_NSGetMachExecuteHeader();
- uint32_t platform;
- uint32_t minOS;
- uint32_t sdk;
-
- if ( getVersionLoadCommandInfo(mh, &platform, &minOS, &sdk) ) {
- if ( platform == PLATFORM_WATCHOS )
- return minOS; // return raw minOS (not mapped to iOS version)
- }
- return 0;
-}
-
-#endif
-
-
-
-#if TARGET_OS_BRIDGE
-static uint32_t bridgeVersToIOSVers(uint32_t vers)
-{
- return vers + 0x00090000;
-}
-
-uint32_t dyld_get_program_sdk_bridge_os_version()
-{
- const mach_header* mh = (mach_header*)_NSGetMachExecuteHeader();
- uint32_t platform;
- uint32_t minOS;
- uint32_t sdk;
-
- if ( getVersionLoadCommandInfo(mh, &platform, &minOS, &sdk) ) {
- if ( platform == PLATFORM_BRIDGEOS )
- return sdk;
- }
- return 0;
-}
-
-uint32_t dyld_get_program_min_bridge_os_version()
-{
- const mach_header* mh = (mach_header*)_NSGetMachExecuteHeader();
- uint32_t platform;
- uint32_t minOS;
- uint32_t sdk;
-
- if ( getVersionLoadCommandInfo(mh, &platform, &minOS, &sdk) ) {
- if ( platform == PLATFORM_BRIDGEOS )
- return minOS; // return raw minOS (not mapped to iOS version)
- }
- return 0;
-}
-
#endif
/*
@@ -801,40 +608,30 @@
*/
uint32_t dyld_get_sdk_version(const mach_header* mh)
{
- if ( gUseDyld3 )
- return dyld3::dyld_get_sdk_version(mh);
-
- uint32_t platform;
+ uint32_t loadCommand;
uint32_t minOS;
uint32_t sdk;
- if ( getVersionLoadCommandInfo(mh, &platform, &minOS, &sdk) ) {
- switch (platform) {
-#if TARGET_OS_BRIDGE
- case PLATFORM_BRIDGEOS:
- // new binary. sdk version looks like "2.0" but API wants "11.0"
- return bridgeVersToIOSVers(sdk);
- case PLATFORM_IOS:
- // old binary. sdk matches API semantics so can return directly.
- return sdk;
-#elif __WATCH_OS_VERSION_MIN_REQUIRED
- case PLATFORM_WATCHOS:
+ 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 PLATFORM_IOS:
+ case LC_VERSION_MIN_IPHONEOS:
// old binary. sdk matches API semantics so can return directly.
return sdk;
#elif __TV_OS_VERSION_MIN_REQUIRED
- case PLATFORM_TVOS:
- case PLATFORM_IOS:
+ case LC_VERSION_MIN_TVOS:
+ case LC_VERSION_MIN_IPHONEOS:
return sdk;
#elif __IPHONE_OS_VERSION_MIN_REQUIRED
- case PLATFORM_IOS:
+ case LC_VERSION_MIN_IPHONEOS:
if ( sdk != 0 ) // old binaries might not have SDK set
return sdk;
break;
#else
- case PLATFORM_MACOS:
+ case LC_VERSION_MIN_MACOSX:
if ( sdk != 0 ) // old binaries might not have SDK set
return sdk;
break;
@@ -842,7 +639,7 @@
}
}
-#if __WATCH_OS_VERSION_MIN_REQUIRED || __TV_OS_VERSION_MIN_REQUIRED || TARGET_OS_BRIDGE
+#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
@@ -853,46 +650,33 @@
uint32_t dyld_get_program_sdk_version()
{
- if ( gUseDyld3 )
- return dyld3::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 ( gUseDyld3 )
- return dyld3::dyld_get_min_os_version(mh);
-
- uint32_t platform;
+ uint32_t loadCommand;
uint32_t minOS;
uint32_t sdk;
- if ( getVersionLoadCommandInfo(mh, &platform, &minOS, &sdk) ) {
- switch (platform) {
-#if TARGET_OS_BRIDGE
- case PLATFORM_BRIDGEOS:
- // new binary. sdk version looks like "2.0" but API wants "11.0"
- return bridgeVersToIOSVers(minOS);
- case PLATFORM_IOS:
- // old binary. sdk matches API semantics so can return directly.
- return minOS;
-#elif __WATCH_OS_VERSION_MIN_REQUIRED
- case PLATFORM_WATCHOS:
+ 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 PLATFORM_IOS:
+ case LC_VERSION_MIN_IPHONEOS:
// old binary. OS matches API semantics so can return directly.
return minOS;
#elif __TV_OS_VERSION_MIN_REQUIRED
- case PLATFORM_TVOS:
- case PLATFORM_IOS:
+ case LC_VERSION_MIN_TVOS:
+ case LC_VERSION_MIN_IPHONEOS:
return minOS;
#elif __IPHONE_OS_VERSION_MIN_REQUIRED
- case PLATFORM_IOS:
+ case LC_VERSION_MIN_IPHONEOS:
return minOS;
#else
- case PLATFORM_MACOS:
+ case LC_VERSION_MIN_MACOSX:
return minOS;
#endif
}
@@ -903,44 +687,8 @@
uint32_t dyld_get_program_min_os_version()
{
- if ( gUseDyld3 )
- return dyld3::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)
-{
- if ( gUseDyld3 )
- return dyld3::_dyld_get_image_uuid(mh, 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
@@ -956,9 +704,6 @@
const char* pathName,
NSObjectFileImage *objectFileImage)
{
- if ( gUseDyld3 )
- return dyld3::NSCreateObjectFileImageFromFile(pathName, objectFileImage);
-
DYLD_LOCK_THIS_BLOCK;
static NSObjectFileImageReturnCode (*p)(const char*, NSObjectFileImage*) = NULL;
@@ -981,9 +726,6 @@
size_t size,
NSObjectFileImage *objectFileImage)
{
- if ( gUseDyld3 )
- return dyld3::NSCreateObjectFileImageFromMemory(address, size, objectFileImage);
-
DYLD_LOCK_THIS_BLOCK;
static NSObjectFileImageReturnCode (*p)(const void*, size_t, NSObjectFileImage*) = NULL;
@@ -1017,9 +759,6 @@
NSDestroyObjectFileImage(
NSObjectFileImage objectFileImage)
{
- if ( gUseDyld3 )
- return dyld3::NSDestroyObjectFileImage(objectFileImage);
-
DYLD_LOCK_THIS_BLOCK;
static bool (*p)(NSObjectFileImage) = NULL;
@@ -1035,9 +774,6 @@
const char* moduleName,
uint32_t options)
{
- if ( gUseDyld3 )
- return dyld3::NSLinkModule(objectFileImage, moduleName, options);
-
DYLD_LOCK_THIS_BLOCK;
static NSModule (*p)(NSObjectFileImage, const char*, unsigned long) = NULL;
@@ -1058,11 +794,8 @@
NSSymbolDefinitionCountInObjectFileImage(
NSObjectFileImage objectFileImage)
{
- if ( gUseDyld3 )
- return dyld3::NSSymbolDefinitionCountInObjectFileImage(objectFileImage);
-
- DYLD_LOCK_THIS_BLOCK;
- static uint32_t (*p)(NSObjectFileImage) = NULL;
+ DYLD_LOCK_THIS_BLOCK;
+ static unsigned long (*p)(NSObjectFileImage) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_NSSymbolDefinitionCountInObjectFileImage", (void**)&p);
@@ -1081,9 +814,6 @@
NSObjectFileImage objectFileImage,
uint32_t ordinal)
{
- if ( gUseDyld3 )
- return dyld3::NSSymbolDefinitionNameInObjectFileImage(objectFileImage, ordinal);
-
DYLD_LOCK_THIS_BLOCK;
static const char* (*p)(NSObjectFileImage, uint32_t) = NULL;
@@ -1101,11 +831,8 @@
NSSymbolReferenceCountInObjectFileImage(
NSObjectFileImage objectFileImage)
{
- if ( gUseDyld3 )
- return dyld3::NSSymbolReferenceCountInObjectFileImage(objectFileImage);
-
- DYLD_LOCK_THIS_BLOCK;
- static uint32_t (*p)(NSObjectFileImage) = NULL;
+ DYLD_LOCK_THIS_BLOCK;
+ static unsigned long (*p)(NSObjectFileImage) = NULL;
if(p == NULL)
_dyld_func_lookup("__dyld_NSSymbolReferenceCountInObjectFileImage", (void**)&p);
@@ -1125,9 +852,6 @@
uint32_t ordinal,
bool *tentative_definition) /* can be NULL */
{
- if ( gUseDyld3 )
- return dyld3::NSSymbolReferenceNameInObjectFileImage(objectFileImage, ordinal, tentative_definition);
-
DYLD_LOCK_THIS_BLOCK;
static const char* (*p)(NSObjectFileImage, uint32_t, bool*) = NULL;
@@ -1146,9 +870,6 @@
NSObjectFileImage objectFileImage,
const char* symbolName)
{
- if ( gUseDyld3 )
- return dyld3::NSIsSymbolDefinedInObjectFileImage(objectFileImage, symbolName);
-
DYLD_LOCK_THIS_BLOCK;
static bool (*p)(NSObjectFileImage, const char*) = NULL;
@@ -1172,9 +893,6 @@
const char* sectionName,
unsigned long *size) /* can be NULL */
{
- if ( gUseDyld3 )
- return dyld3::NSGetSectionDataInObjectFileImage(objectFileImage, segmentName, sectionName, size);
-
DYLD_LOCK_THIS_BLOCK;
static void* (*p)(NSObjectFileImage, const char*, const char*, unsigned long*) = NULL;
@@ -1192,9 +910,6 @@
const char* *fileName,
const char* *errorString)
{
- if ( gUseDyld3 )
- return dyld3::NSLinkEditError(c, errorNumber, fileName, errorString);
-
DYLD_LOCK_THIS_BLOCK;
static void (*p)(NSLinkEditErrors *c,
int *errorNumber,
@@ -1212,9 +927,6 @@
NSModule module,
uint32_t options)
{
- if ( gUseDyld3 )
- return dyld3::NSUnLinkModule(module, options);
-
DYLD_LOCK_THIS_BLOCK;
static bool (*p)(NSModule module, uint32_t options) = NULL;
@@ -1252,10 +964,7 @@
char *buf,
uint32_t *bufsize)
{
- if ( gUseDyld3 )
- return dyld3::_NSGetExecutablePath(buf, bufsize);
-
- DYLD_NO_LOCK_THIS_BLOCK;
+ DYLD_LOCK_THIS_BLOCK;
static int (*p)(char *buf, uint32_t *bufsize) = NULL;
if(p == NULL)
@@ -1347,9 +1056,6 @@
_dyld_register_func_for_add_image(
void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide))
{
- if ( gUseDyld3 )
- return dyld3::_dyld_register_func_for_add_image(func);
-
DYLD_LOCK_THIS_BLOCK;
typedef void (*callback_t)(const struct mach_header *mh, intptr_t vmaddr_slide);
static void (*p)(callback_t func) = NULL;
@@ -1368,9 +1074,6 @@
_dyld_register_func_for_remove_image(
void (*func)(const struct mach_header *mh, intptr_t vmaddr_slide))
{
- if ( gUseDyld3 )
- return dyld3::_dyld_register_func_for_remove_image(func);
-
DYLD_LOCK_THIS_BLOCK;
typedef void (*callback_t)(const struct mach_header *mh, intptr_t vmaddr_slide);
static void (*p)(callback_t func) = NULL;
@@ -1454,6 +1157,21 @@
p(module, objc_module, size);
}
+/*
+ * _dyld_bind_objc_module() is passed a pointer to something in an (__OBJC,
+ * __module) section and causes the module that is associated with that address
+ * to be bound.
+ */
+void
+_dyld_bind_objc_module(const void* objc_module)
+{
+ DYLD_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);
+}
#endif
#if DEPRECATED_APIS_SUPPORTED
@@ -1468,9 +1186,6 @@
uint32_t
_dyld_image_count(void)
{
- if ( gUseDyld3 )
- return dyld3::_dyld_image_count();
-
DYLD_NO_LOCK_THIS_BLOCK;
static uint32_t (*p)(void) = NULL;
@@ -1482,9 +1197,6 @@
const struct mach_header *
_dyld_get_image_header(uint32_t image_index)
{
- if ( gUseDyld3 )
- return dyld3::_dyld_get_image_header(image_index);
-
DYLD_NO_LOCK_THIS_BLOCK;
static struct mach_header * (*p)(uint32_t image_index) = NULL;
@@ -1496,9 +1208,6 @@
intptr_t
_dyld_get_image_vmaddr_slide(uint32_t image_index)
{
- if ( gUseDyld3 )
- return dyld3::_dyld_get_image_vmaddr_slide(image_index);
-
DYLD_NO_LOCK_THIS_BLOCK;
static unsigned long (*p)(uint32_t image_index) = NULL;
@@ -1510,9 +1219,6 @@
const char*
_dyld_get_image_name(uint32_t image_index)
{
- if ( gUseDyld3 )
- return dyld3::_dyld_get_image_name(image_index);
-
DYLD_NO_LOCK_THIS_BLOCK;
static const char* (*p)(uint32_t image_index) = NULL;
@@ -1524,9 +1230,6 @@
// SPI in Mac OS X 10.6
intptr_t _dyld_get_image_slide(const struct mach_header* mh)
{
- if ( gUseDyld3 )
- return dyld3::_dyld_get_image_slide(mh);
-
DYLD_NO_LOCK_THIS_BLOCK;
static intptr_t (*p)(const struct mach_header*) = NULL;
@@ -1536,13 +1239,9 @@
}
-#if DEPRECATED_APIS_SUPPORTED
bool
_dyld_image_containing_address(const void* address)
{
- if ( gUseDyld3 )
- return dyld3::_dyld_image_containing_address(address);
-
DYLD_LOCK_THIS_BLOCK;
static bool (*p)(const void*) = NULL;
@@ -1555,9 +1254,6 @@
_dyld_get_image_header_containing_address(
const void* address)
{
- if ( gUseDyld3 )
- return dyld3::_dyld_get_image_header_containing_address(address);
-
DYLD_LOCK_THIS_BLOCK;
static const struct mach_header * (*p)(const void*) = NULL;
@@ -1566,6 +1262,8 @@
return p(address);
}
+
+#if DEPRECATED_APIS_SUPPORTED
bool _dyld_launched_prebound(void)
{
DYLD_LOCK_THIS_BLOCK;
@@ -1652,13 +1350,20 @@
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()
{
// leave until dyld's that might call this are rare
@@ -1668,12 +1373,17 @@
{
// 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 = { 13, &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,
@@ -1684,8 +1394,7 @@
&isLaunchdOwned,
&vm_allocate,
&mmap,
- &__cxa_finalize_ranges
- };
+ &__cxa_finalize_ranges};
//
@@ -1693,28 +1402,21 @@
// and call dyld, registering the helper functions.
//
extern "C" void tlv_initializer();
+extern "C" void _dyld_initializer();
void _dyld_initializer()
{
void (*p)(dyld::LibSystemHelpers*);
- if ( gUseDyld3 ) {
- dyld3::gAllImages.applyInitialImages();
- }
- else {
- _dyld_func_lookup("__dyld_register_thread_helpers", (void**)&p);
- if(p != NULL)
- p(&sHelpers);
- }
-
+ _dyld_func_lookup("__dyld_register_thread_helpers", (void**)&p);
+ if(p != NULL)
+ p(&sHelpers);
+
tlv_initializer();
}
char* dlerror()
{
- if ( gUseDyld3 )
- return dyld3::dlerror();
-
DYLD_LOCK_THIS_BLOCK;
static char* (*p)() = NULL;
@@ -1725,9 +1427,6 @@
int dladdr(const void* addr, Dl_info* info)
{
- if ( gUseDyld3 )
- return dyld3::dladdr(addr, info);
-
DYLD_LOCK_THIS_BLOCK;
static int (*p)(const void* , Dl_info*) = NULL;
@@ -1738,9 +1437,6 @@
int dlclose(void* handle)
{
- if ( gUseDyld3 )
- return dyld3::dlclose(handle);
-
DYLD_LOCK_THIS_BLOCK;
static int (*p)(void* handle) = NULL;
@@ -1751,9 +1447,6 @@
void* dlopen(const char* path, int mode)
{
- if ( gUseDyld3 )
- return dyld3::dlopen(path, mode);
-
// dlopen is special. locking is done inside dyld to allow initializer to run without lock
DYLD_NO_LOCK_THIS_BLOCK;
@@ -1772,9 +1465,6 @@
bool dlopen_preflight(const char* path)
{
- if ( gUseDyld3 )
- return dyld3::dlopen_preflight(path);
-
DYLD_LOCK_THIS_BLOCK;
static bool (*p)(const char* path) = NULL;
@@ -1785,9 +1475,6 @@
void* dlsym(void* handle, const char* symbol)
{
- if ( gUseDyld3 )
- return dyld3::dlsym(handle, symbol);
-
DYLD_LOCK_THIS_BLOCK;
static void* (*p)(void* handle, const char* symbol) = NULL;
@@ -1796,11 +1483,20 @@
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()
{
- if ( gUseDyld3 )
- return dyld3::_dyld_get_all_image_infos();
-
DYLD_NO_LOCK_THIS_BLOCK;
static struct dyld_all_image_infos* (*p)() = NULL;
@@ -1812,9 +1508,6 @@
#if SUPPORT_ZERO_COST_EXCEPTIONS
bool _dyld_find_unwind_sections(void* addr, dyld_unwind_sections* info)
{
- if ( gUseDyld3 )
- return dyld3::_dyld_find_unwind_sections(addr, info);
-
DYLD_NO_LOCK_THIS_BLOCK;
static void* (*p)(void*, dyld_unwind_sections*) = NULL;
@@ -1841,9 +1534,6 @@
const char* dyld_image_path_containing_address(const void* addr)
{
- if ( gUseDyld3 )
- return dyld3::dyld_image_path_containing_address(addr);
-
DYLD_NO_LOCK_THIS_BLOCK;
static const char* (*p)(const void*) = NULL;
@@ -1854,9 +1544,6 @@
const struct mach_header* dyld_image_header_containing_address(const void* addr)
{
- if ( gUseDyld3 )
- return dyld3::dyld_image_header_containing_address(addr);
-
DYLD_NO_LOCK_THIS_BLOCK;
static const mach_header* (*p)(const void*) = NULL;
@@ -1868,9 +1555,6 @@
bool dyld_shared_cache_some_image_overridden()
{
- if ( gUseDyld3 )
- return dyld3::dyld_shared_cache_some_image_overridden();
-
DYLD_NO_LOCK_THIS_BLOCK;
static bool (*p)() = NULL;
@@ -1879,38 +1563,9 @@
return p();
}
-bool _dyld_get_shared_cache_uuid(uuid_t uuid)
-{
- if ( gUseDyld3 )
- return dyld3::_dyld_get_shared_cache_uuid(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);
-}
-
-const void* _dyld_get_shared_cache_range(size_t* length)
-{
- if ( gUseDyld3 )
- return dyld3::_dyld_get_shared_cache_range(length);
-
- DYLD_NO_LOCK_THIS_BLOCK;
- static const void* (*p)(size_t*) = NULL;
-
- if(p == NULL)
- _dyld_func_lookup("__dyld_get_shared_cache_range", (void**)&p);
- return p(length);
-}
-
bool dyld_process_is_restricted()
{
- if ( gUseDyld3 )
- return dyld3::dyld_process_is_restricted();
-
DYLD_NO_LOCK_THIS_BLOCK;
static bool (*p)() = NULL;
@@ -1919,11 +1574,9 @@
return p();
}
+#if DYLD_SHARED_CACHE_SUPPORT
const char* dyld_shared_cache_file_path()
{
- if ( gUseDyld3 )
- return dyld3::dyld_shared_cache_file_path();
-
DYLD_NO_LOCK_THIS_BLOCK;
static const char* (*p)() = NULL;
@@ -1931,12 +1584,10 @@
_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)
{
- if ( gUseDyld3 )
- return dyld3::dyld_dynamic_interpose(mh, array, count);
-
DYLD_LOCK_THIS_BLOCK;
static void (*p)(const struct mach_header* mh, const struct dyld_interpose_tuple array[], size_t count) = NULL;
@@ -1949,9 +1600,6 @@
// SPI called __fork
void _dyld_fork_child()
{
- if ( gUseDyld3 )
- return dyld3::_dyld_fork_child();
-
DYLD_NO_LOCK_THIS_BLOCK;
static void (*p)() = NULL;
@@ -1962,169 +1610,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))
-{
- if ( gUseDyld3 )
- return dyld3::dyld_shared_cache_find_iterate_text(cacheUuid, extraSearchDirs, callback);
-
- 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) && (allInfo->sharedCacheBaseAddress != 0) && (memcmp(allInfo->sharedCacheUUID, cacheUuid, 16) == 0) ) {
- // requested cache is already mapped, just re-use it
- cacheHeader = (dyld_cache_header*)(allInfo->sharedCacheBaseAddress);
- 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_mapping_info* mappings = (dyld_cache_mapping_info*)((char*)cacheHeader + cacheHeader->mappingOffset);
- const uint64_t cacheUnslidBaseAddress = mappings[0].address;
- 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 = 2;
- dylibTextInfo.loadAddressUnslid = p->loadAddress;
- dylibTextInfo.textSegmentSize = p->textSegmentSize;
- dylibTextInfo.path = (char*)cacheHeader + p->pathOffset;
- ::memcpy(dylibTextInfo.dylibUuid, p->uuid, 16);
- dylibTextInfo.textSegmentOffset = p->loadAddress - cacheUnslidBaseAddress;
- 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))
-{
- if ( gUseDyld3 )
- return dyld3::dyld_shared_cache_iterate_text(cacheUuid, callback);
-
- 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)
-{
- if ( gUseDyld3 )
- return dyld3::_dyld_is_memory_immutable(addr, 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)
-{
- if ( gUseDyld3 )
- return dyld3::_dyld_objc_notify_register(mapped, init, 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);
-}
-
-
-
-
-
+