Implement internal multiply (for the compiler).

[cycript.git] / Trampoline.t.cpp

diff --git a/Trampoline.t.cpp b/Trampoline.t.cpp
index 1bcbb18c9afcf1de9181d05b5f52528111b99b0f..7c6b388bb491a23f36491a93d1ccfba4a0c54866 100644 (file)
--- a/Trampoline.t.cpp
+++ b/Trampoline.t.cpp
@@ -52,6 +52,18 @@ static int $strcmp(const char *lhs, const char *rhs) {
     } return *lhs < *rhs ? -1 : 1;
 }
 
     } 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;
 #ifdef __LP64__
 typedef struct mach_header_64 mach_header_xx;
 typedef struct nlist_64 nlist_xx;


@@ -177,21 +189,21 @@ void *Routine(void *arg) {
 
     void *handle($dlopen(baton->library, RTLD_LAZY | RTLD_LOCAL));
     if (handle == NULL) {
 
     void *handle($dlopen(baton->library, RTLD_LAZY | RTLD_LOCAL));
     if (handle == NULL) {

-        $dlerror();
+        $strlcpy(baton->error, $dlerror(), sizeof(baton->error));

         return NULL;
     }
 
     void *(*$dlsym)(void *, const char *);
     cyset($dlsym, "_dlsym", dyld);
 
         return NULL;
     }
 
     void *(*$dlsym)(void *, const char *);
     cyset($dlsym, "_dlsym", dyld);
 

-    void (*CYHandleServer)(pid_t);
-    CYHandleServer = reinterpret_cast<void (*)(pid_t)>($dlsym(handle, "CYHandleServer"));
+    void (*CYHandleServer)(pid_t, char *, size_t);
+    CYHandleServer = reinterpret_cast<void (*)(pid_t, char *, size_t)>($dlsym(handle, "CYHandleServer"));

     if (CYHandleServer == NULL) {
     if (CYHandleServer == NULL) {

-        $dlerror();
+        $strlcpy(baton->error, $dlerror(), sizeof(baton->error));

         return NULL;
     }
 
         return NULL;
     }
 

-    CYHandleServer(baton->pid);
+    CYHandleServer(baton->pid, baton->error, sizeof(baton->error));

     return NULL;
 }
 
     return NULL;
 }
 


@@ -207,11 +219,11 @@ extern "C" void Start(Baton *baton) {
     if (pthread == NULL)
         pthread = Library(baton, "/usr/lib/libSystem.B.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;
     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);
 
     int (*$pthread_attr_init)(pthread_attr_t *);
     cyset($pthread_attr_init, "_pthread_attr_init", pthread);


@@ -239,24 +251,6 @@ extern "C" void Start(Baton *baton) {
     $pthread_attr_destroy(&attr);
 #endif
 
     $pthread_attr_destroy(&attr);
 #endif
 

-#if defined(__arm__) || defined(__arm64__)
-    uintptr_t tpid;
-#if defined(__arm__)
-    __asm__ ("mrc p15, 0, %0, c13, c0, 3\n" : "=r" (tpid));
-#elif defined(__arm64__)
-    __asm__ ("mrs %0, tpidrro_el0\n" : "=r" (tpid));
-#else
-#error XXX
-#endif
-
-    void **tsd;
-    tsd = reinterpret_cast<void **>(tpid & ~3);
-    if (tsd != NULL)
-        tsd[0] = &self;
-#else
-    _pthread_setspecific_direct(0, &self);
-#endif
-

     int (*$pthread_join)(pthread_t, void **);
     cyset($pthread_join, "_pthread_join", pthread);
 
     int (*$pthread_join)(pthread_t, void **);
     cyset($pthread_join, "_pthread_join", pthread);