X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/85b57b573b647209a00a75667e6ea9a7cf309f4c..c22e009d49bb891a560f8a6219fe3499859eff4b:/Trampoline.t.cpp?ds=inline

diff --git a/Trampoline.t.cpp b/Trampoline.t.cpp
index f6832bd..7c6b388 100644
--- a/Trampoline.t.cpp
+++ b/Trampoline.t.cpp
@@ -19,16 +19,21 @@
 **/
 /* }}} */
 
+#include <TargetConditionals.h>
+#if defined(__arm__) || defined(__arm64__)
+#undef TARGET_IPHONE_SIMULATOR
+#define TARGET_IPHONE_SIMULATOR 1
+#endif
 #define _PTHREAD_ATTR_T
 #include <pthread_internals.h>
+#if defined(__arm__) || defined(__arm64__)
+#undef TARGET_IPHONE_SIMULATOR
+#endif
 
 #include <mach-o/dyld.h>
 #include <mach-o/dyld_images.h>
 #include <mach-o/loader.h>
-
-extern "C" {
 #include <mach-o/nlist.h>
-}
 
 #include "Standard.hpp"
 #include "Baton.hpp"
@@ -47,6 +52,18 @@ static int $strcmp(const char *lhs, const char *rhs) {
     } return *lhs < *rhs ? -1 : 1;
 }
 
+static void $strlcpy(char *dst, const char *src, size_t size) {
+    if (size == 0)
+        return;
+    size_t i(0);
+    while (i != size - 1) {
+        char value(src[i]);
+        if (value == '\0')
+            break;
+        dst[i++] = value;
+    } dst[i] = '\0';
+}
+
 #ifdef __LP64__
 typedef struct mach_header_64 mach_header_xx;
 typedef struct nlist_64 nlist_xx;
@@ -133,6 +150,11 @@ static void *Symbol(const mach_header_xx *mach, const char *name) {
         if (value == 0)
             continue;
 
+#ifdef __arm__
+        if ((symbol->n_desc & N_ARM_THUMB_DEF) != 0)
+            value |= 0x00000001;
+#endif
+
         value += slide;
         return reinterpret_cast<void *>(value);
     }
@@ -140,18 +162,6 @@ static void *Symbol(const mach_header_xx *mach, const char *name) {
     return NULL;
 }
 
-struct Dynamic {
-    char *(*dlerror)();
-    void *(*dlsym)(void *, const char *);
-};
-
-template <typename Type_>
-static _finline void dlset(Dynamic *dynamic, Type_ &function, const char *name, void *handle = RTLD_DEFAULT) {
-    function = reinterpret_cast<Type_>(dynamic->dlsym(handle, name));
-    if (function == NULL)
-        dynamic->dlerror();
-}
-
 template <typename Type_>
 static _finline void cyset(Type_ &function, const char *name, const mach_header_xx *mach) {
     function = reinterpret_cast<Type_>(Symbol(mach, name));
@@ -165,37 +175,35 @@ static _finline const mach_header_xx *Library(Baton *baton, const char *name) {
 void *Routine(void *arg) {
     Baton *baton(reinterpret_cast<Baton *>(arg));
 
-    const mach_header_xx *dyld(Library(baton, "/usr/lib/system/libdyld.dylib"));
-
-    Dynamic dynamic;
-    cyset(dynamic.dlerror, "_dlerror", dyld);
-    cyset(dynamic.dlsym, "_dlsym", dyld);
-
-    int (*pthread_detach)(pthread_t);
-    dlset(&dynamic, pthread_detach, "pthread_detach");
+    const mach_header_xx *dyld(NULL);
+    if (dyld == NULL)
+        dyld = Library(baton, "/usr/lib/system/libdyld.dylib");
+    if (dyld == NULL)
+        dyld = Library(baton, "/usr/lib/libSystem.B.dylib");
 
-    pthread_t (*pthread_self)();
-    dlset(&dynamic, pthread_self, "pthread_self");
+    char *(*$dlerror)();
+    cyset($dlerror, "_dlerror", dyld);
 
-    pthread_detach(pthread_self());
+    void *(*$dlopen)(const char *, int);
+    cyset($dlopen, "_dlopen", dyld);
 
-    void *(*dlopen)(const char *, int);
-    dlset(&dynamic, dlopen, "dlopen");
-
-    void *handle(dlopen(baton->library, RTLD_LAZY | RTLD_LOCAL));
+    void *handle($dlopen(baton->library, RTLD_LAZY | RTLD_LOCAL));
     if (handle == NULL) {
-        dynamic.dlerror();
+        $strlcpy(baton->error, $dlerror(), sizeof(baton->error));
         return NULL;
     }
 
-    void (*CYHandleServer)(pid_t);
-    dlset(&dynamic, CYHandleServer, "CYHandleServer", handle);
+    void *(*$dlsym)(void *, const char *);
+    cyset($dlsym, "_dlsym", dyld);
+
+    void (*CYHandleServer)(pid_t, char *, size_t);
+    CYHandleServer = reinterpret_cast<void (*)(pid_t, char *, size_t)>($dlsym(handle, "CYHandleServer"));
     if (CYHandleServer == NULL) {
-        dynamic.dlerror();
+        $strlcpy(baton->error, $dlerror(), sizeof(baton->error));
         return NULL;
     }
 
-    CYHandleServer(baton->pid);
+    CYHandleServer(baton->pid, baton->error, sizeof(baton->error));
     return NULL;
 }
 
@@ -203,15 +211,32 @@ extern "C" void Start(Baton *baton) {
     struct _pthread self;
     $bzero(&self, sizeof(self));
 
-    const mach_header_xx *pthread(Library(baton, "/usr/lib/system/libsystem_pthread.dylib"));
+    const mach_header_xx *pthread(NULL);
+    if (pthread == NULL)
+        pthread = Library(baton, "/usr/lib/system/libsystem_pthread.dylib");
     if (pthread == NULL)
         pthread = Library(baton, "/usr/lib/system/libsystem_c.dylib");
+    if (pthread == NULL)
+        pthread = Library(baton, "/usr/lib/libSystem.B.dylib");
 
-    void (*$__pthread_set_self)(pthread_t);
+    void (*$__pthread_set_self)(void **);
     cyset($__pthread_set_self, "___pthread_set_self", pthread);
 
     self.tsd[0] = &self;
-    $__pthread_set_self(&self);
+    $__pthread_set_self(&self.tsd[0]);
+
+    int (*$pthread_attr_init)(pthread_attr_t *);
+    cyset($pthread_attr_init, "_pthread_attr_init", pthread);
+
+#if 0
+    pthread_attr_t attr;
+    $pthread_attr_init(&attr);
+
+    int (*$pthread_attr_setdetachstate)(pthread_attr_t *, int);
+    cyset($pthread_attr_setdetachstate, "_pthread_attr_setdetachstate", pthread);
+
+    $pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+#endif
 
     int (*$pthread_create)(pthread_t *, const pthread_attr_t *, void *(*)(void *), void *);
     cyset($pthread_create, "_pthread_create", pthread);
@@ -219,7 +244,24 @@ extern "C" void Start(Baton *baton) {
     pthread_t thread;
     $pthread_create(&thread, NULL, &Routine, baton);
 
-    const mach_header_xx *kernel(Library(baton, "/usr/lib/system/libsystem_kernel.dylib"));
+#if 0
+    int (*$pthread_attr_destroy)(pthread_attr_t *);
+    cyset($pthread_attr_destroy, "_pthread_attr_destroy", pthread);
+
+    $pthread_attr_destroy(&attr);
+#endif
+
+    int (*$pthread_join)(pthread_t, void **);
+    cyset($pthread_join, "_pthread_join", pthread);
+
+    void *status;
+    $pthread_join(thread, &status);
+
+    const mach_header_xx *kernel(NULL);
+    if (kernel == NULL)
+        kernel = Library(baton, "/usr/lib/system/libsystem_kernel.dylib");
+    if (kernel == NULL)
+        kernel = Library(baton, "/usr/lib/libSystem.B.dylib");
 
     mach_port_t (*$mach_thread_self)();
     cyset($mach_thread_self, "_mach_thread_self", kernel);