Loading...
--- dyld/dyld-1340/libdyld/LibSystemHelpers.cpp
+++ dyld/dyld-957/libdyld/LibSystemHelpers.cpp
@@ -21,37 +21,30 @@
* @APPLE_LICENSE_HEADER_END@
*/
-#include <TargetConditionals.h>
-#include "Defines.h"
-
-#if !TARGET_OS_EXCLAVEKIT
- #include <_simple.h>
- #include <libc_private.h>
- #include <pthread/pthread.h>
- #include <pthread/tsd_private.h>
- #include <sys/errno.h>
- #include <sys/mman.h>
- #include <sys/stat.h>
-
-// atexit header is missing C++ guards
-extern "C" {
- #include <System/atexit.h>
-}
-#endif
-
-#if !TARGET_OS_DRIVERKIT && !TARGET_OS_EXCLAVEKIT
- #include <vproc_priv.h>
-#endif
#include <string.h>
#include <stdint.h>
+#include <sys/errno.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <TargetConditionals.h>
+#include <_simple.h>
#include <mach-o/dyld_priv.h>
#include <malloc/malloc.h>
#include <mach-o/dyld.h>
#include <mach-o/dyld_priv.h>
#include <dlfcn.h>
#include <dlfcn_private.h>
+#include <libc_private.h>
#include <ptrauth.h>
+#if !TARGET_OS_DRIVERKIT
+ #include <vproc_priv.h>
+#endif
+
+// atexit header is missing C++ guards
+extern "C" {
+ #include <System/atexit.h>
+}
// libc is missing header declaration for this
extern "C" int __cxa_atexit(void (*func)(void*), void* arg, void* dso);
@@ -59,24 +52,16 @@
#include "LibSystemHelpers.h"
#include "DyldProcessConfig.h"
#include "DyldAPIs.h"
-#include "ThreadLocalVariables.h"
-extern "C" struct mach_header __dso_handle; // mach_header of libdyld.dylib
+// implemented in assembly
+extern "C" void* tlv_get_addr(dyld3::MachOAnalyzer::TLV_Thunk*);
-namespace dyld4 {
- extern class APIs* gAPIs;
-}
-
-extern void _dyld_make_delayed_module_initializer_calls();
-
-
-uint8_t dyld_process_has_objc_patches = 0;
namespace dyld4 {
uintptr_t LibSystemHelpers::version() const
{
- return 7;
+ return 2;
}
void* LibSystemHelpers::malloc(size_t size) const
@@ -96,54 +81,40 @@
kern_return_t LibSystemHelpers::vm_allocate(vm_map_t task, vm_address_t* address, vm_size_t size, int flags) const
{
-#if !DYLD_FEATURE_EMBEDDED_PAGE_ALLOCATOR
return ::vm_allocate(task, address, size, flags);
-#else
- //TODO: EXCLAVES. Then replace calls to MemoryManager::allocate_pages
- return 0;
-#endif
}
kern_return_t LibSystemHelpers::vm_deallocate(vm_map_t task, vm_address_t address, vm_size_t size) const
{
-#if !TARGET_OS_EXCLAVEKIT
return ::vm_deallocate(task, address, size);
-#else
- return 0;
-#endif
}
// Note: driverkit uses a different arm64e ABI, so we cannot call libSystem's pthread_key_create() from dyld
-int LibSystemHelpers::pthread_key_create_free(dyld_thread_key_t* key) const
+int LibSystemHelpers::pthread_key_create_free(pthread_key_t* key) const
{
- return dyld_thread_key_create(key, &::free);
+ return ::pthread_key_create(key, &::free);
}
-void LibSystemHelpers::run_async(void* (*func)(void*), void* context) const
+static void finalizeListTLV_thunk(void* list)
{
-#if TARGET_OS_EXCLAVEKIT
- thrd_t workerThread;
- ::thrd_create(&workerThread, (thrd_start_t)func, context);
- ::thrd_detach(workerThread);
-#else
- pthread_t workerThread;
- ::pthread_create(&workerThread, NULL, func, context);
- ::pthread_detach(workerThread);
-#endif
+ // Called by pthreads when the current thread is going away
+ gDyld.apis->_finalizeListTLV(list);
}
-void* LibSystemHelpers::pthread_getspecific(dyld_thread_key_t key) const
+// Note: driverkit uses a different arm64e ABI, so we cannot call libSystem's pthread_key_create() from dyld
+int LibSystemHelpers::pthread_key_create_thread_exit(pthread_key_t* key) const
{
- return dyld_thread_getspecific(key);
+ return ::pthread_key_create(key, &finalizeListTLV_thunk);
}
-int LibSystemHelpers::pthread_setspecific(dyld_thread_key_t key, const void* value) const
+void* LibSystemHelpers::pthread_getspecific(pthread_key_t key) const
{
-#if TARGET_OS_EXCLAVEKIT
- return ::tss_set(key, (void*)value);
-#else
+ return ::pthread_getspecific(key);
+}
+
+int LibSystemHelpers::pthread_setspecific(pthread_key_t key, const void* value) const
+{
return ::pthread_setspecific(key, value);
-#endif
}
void LibSystemHelpers::__cxa_atexit(void (*func)(void*), void* arg, void* dso) const
@@ -157,16 +128,12 @@
void LibSystemHelpers::__cxa_finalize_ranges(const __cxa_range_t ranges[], unsigned int count) const
{
-#if TARGET_OS_EXCLAVEKIT
- //TODO: EXCLAVES
-#else
::__cxa_finalize_ranges(ranges, count);
-#endif
}
bool LibSystemHelpers::isLaunchdOwned() const
{
-#if TARGET_OS_DRIVERKIT || TARGET_OS_EXCLAVEKIT
+#if TARGET_OS_DRIVERKIT
return false;
#else
// the vproc_swap_integer() call has to be to libSystem.dylib's function - not a static copy in dyld
@@ -176,22 +143,14 @@
#endif
}
-void LibSystemHelpers::os_unfair_recursive_lock_lock_with_options(dyld_recursive_mutex_t lock, os_unfair_lock_options_t options) const
+void LibSystemHelpers::os_unfair_recursive_lock_lock_with_options(os_unfair_recursive_lock_t lock, os_unfair_lock_options_t options) const
{
-#if TARGET_OS_EXCLAVEKIT
- mtx_lock(lock);
-#else
::os_unfair_recursive_lock_lock_with_options(lock, options);
-#endif
}
-void LibSystemHelpers::os_unfair_recursive_lock_unlock(dyld_recursive_mutex_t lock) const
+void LibSystemHelpers::os_unfair_recursive_lock_unlock(os_unfair_recursive_lock_t lock) const
{
-#if TARGET_OS_EXCLAVEKIT
- mtx_unlock(lock);
-#else
::os_unfair_recursive_lock_unlock(lock);
-#endif
}
void LibSystemHelpers::exit(int result) const
@@ -201,115 +160,25 @@
const char* LibSystemHelpers::getenv(const char* key) const
{
-#if TARGET_OS_EXCLAVEKIT
- return NULL;
-#else
return ::getenv(key);
-#endif
}
int LibSystemHelpers::mkstemp(char* templatePath) const
{
-#if TARGET_OS_EXCLAVEKIT
- return -1;
-#else
return ::mkstemp(templatePath);
-#endif
+}
+
+LibSystemHelpers::TLVGetAddrFunc LibSystemHelpers::getTLVGetAddrFunc() const
+{
+ return &::tlv_get_addr;
}
// Added in version 2
-void LibSystemHelpers::os_unfair_recursive_lock_unlock_forked_child(dyld_recursive_mutex_t lock) const
+void LibSystemHelpers::os_unfair_recursive_lock_unlock_forked_child(os_unfair_recursive_lock_t lock) const
{
-#if !TARGET_OS_EXCLAVEKIT
::os_unfair_recursive_lock_unlock_forked_child(lock);
-#endif
}
-
-// Added in version 3
-
-void LibSystemHelpers::setDyldPatchedObjCClasses() const
-{
- dyld_process_has_objc_patches = 1;
-}
-
-// Added in version 6
-void LibSystemHelpers::os_unfair_lock_lock_with_options(dyld_mutex_t lock, os_unfair_lock_options_t options) const
-{
-#if TARGET_OS_EXCLAVEKIT
- //TODO: EXCLAVES?
-#else
- ::os_unfair_lock_lock_with_options(lock, options);
-#endif
-}
-void LibSystemHelpers::os_unfair_lock_unlock(dyld_mutex_t lock) const
-{
-#if TARGET_OS_EXCLAVEKIT
- //TODO: EXCLAVES?
-#else
- ::os_unfair_lock_unlock(lock);
-#endif
-}
-
-// Added in version 7
-
-
-static bool legacyDyldLookup4OldBinaries(const char* name, void** address)
-{
-#if SUPPPORT_PRE_LC_MAIN
- if (strcmp(name, "__dyld_dlopen") == 0) {
- *address = (void*)&dlopen;
- return true;
- }
- else if (strcmp(name, "__dyld_dlsym") == 0) {
- *address = (void*)&dlsym;
- return true;
- }
- else if (strcmp(name, "__dyld_dladdr") == 0) {
- *address = (void*)&dladdr;
- return true;
- }
- else if (strcmp(name, "__dyld_get_image_slide") == 0) {
- *address = (void*)&_dyld_get_image_slide;
- return true;
- }
- else if (strcmp(name, "__dyld_make_delayed_module_initializer_calls") == 0) {
- *address = (void*)&_dyld_make_delayed_module_initializer_calls;
- return true;
- }
- else if (strcmp(name, "__dyld_lookup_and_bind") == 0) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- *address = (void*)&_dyld_lookup_and_bind;
-#pragma clang diagnostic pop
- return true;
- }
-#endif
- *address = 0;
- return false;
-}
-
-void LibSystemHelpers::setDefaultProgramVars(ProgramVars& vars) const
-{
- vars.__prognamePtr = &__progname;
-#if !TARGET_OS_EXCLAVEKIT
- vars.NXArgcPtr = &NXArgc;
- vars.NXArgvPtr = &NXArgv;
- vars.environPtr = (const char***)&environ;
-#endif
-}
-
-
-FuncLookup LibSystemHelpers::legacyDyldFuncLookup() const
-{
- return &legacyDyldLookup4OldBinaries;
-}
-
-mach_o::Error LibSystemHelpers::setUpThreadLocals(const DyldSharedCache* cache, const Header* hdr) const
-{
- return dyld::sThreadLocalVariables.setUpImage(cache, hdr);
-}
-
} // namespace dyld4