Upgrade simulator compilation for Xcode 4.6 clang.

[cycript.git] / Trampoline.t.cpp

diff --git a/Trampoline.t.cpp b/Trampoline.t.cpp
index 7229c2552592b1508918e81451d25aeed2b3d17c..5b5fc4efe523a4701a6a1acf8ff5f3d17df8bbd9 100644 (file)
--- a/Trampoline.t.cpp
+++ b/Trampoline.t.cpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2010  Jay Freeman (saurik)
+ * Copyright (C) 2009-2012  Jay Freeman (saurik)
 */
 
 /* GNU Lesser General Public License, Version 3 {{{ */
@@ -32,12 +32,22 @@ static _finline void dlset(Baton *baton, Type_ &function, const char *name, void
         baton->dlerror();
 }
 
+// XXX: where you find this needs to be relative to CoreFoundation (or something)
+// XXX: this needs to check if the framework is under PrivateFrameworks instead
 #define Framework(framework) \
     "/System/Library/Frameworks/" #framework ".framework/" #framework
 
-static void *Routine(void *arg) {
+void *Routine(void *arg) {
     Baton *baton(reinterpret_cast<Baton *>(arg));
 
+    int (*pthread_detach)(pthread_t);
+    dlset(baton, pthread_detach, "pthread_detach");
+
+    pthread_t (*pthread_self)();
+    dlset(baton, pthread_self, "pthread_self");
+
+    pthread_detach(pthread_self());
+
     void *(*dlopen)(const char *, int);
     dlset(baton, dlopen, "dlopen");
 
@@ -58,31 +68,40 @@ static void *Routine(void *arg) {
 
     void (*CYHandleServer)(pid_t);
     dlset(baton, CYHandleServer, "CYHandleServer", handle);
+    if (CYHandleServer == NULL) {
+        baton->dlerror();
+        return NULL;
+    }
 
     CYHandleServer(baton->pid);
-
     return NULL;
 }
 
-static void *Thread(void *arg) {
-    Baton *baton(reinterpret_cast<Baton *>(arg));
+static void $bzero(void *data, size_t size) {
+    char *bytes(reinterpret_cast<char *>(data));
+    for (size_t i(0); i != size; ++i)
+        bytes[i] = 0;
+}
 
-    int (*pthread_create)(pthread_t *, const pthread_attr_t *, void *(*)(void *), void *);
-    dlset(baton, pthread_create, "pthread_create");
+extern "C" void Start(Baton *baton) {
+    struct _pthread self;
+    $bzero(&self, sizeof(self));
 
-    pthread_t thread;
-    pthread_create(&thread, NULL, &Routine, baton);
+    // this code comes from _pthread_set_self
+    self.tsd[0] = &self;
+    baton->__pthread_set_self(&self);
 
-    int (*pthread_join)(pthread_t, void **);
-    dlset(baton, pthread_join, "pthread_join");
+    //int (*pthread_create)(pthread_t *, const pthread_attr_t *, void *(*)(void *), void *);
+    //dlset(baton, pthread_create, "pthread_create");
 
-    void *result;
-    pthread_join(thread, &result);
+    pthread_t thread;
+    baton->pthread_create(&thread, NULL, &Routine, baton);
 
-    return NULL;
-}
+    //mach_port_t (*mach_thread_self)();
+    //dlset(baton, mach_thread_self, "mach_thread_self");
 
-extern "C" void Start(Baton *baton) {
-    struct _pthread self;
-    baton->_pthread_start(&self, NULL, &Thread, baton, 8 * 1024, 0);
+    //kern_return_t (*thread_terminate)(thread_act_t);
+    //dlset(baton, thread_terminate, "thread_terminate");
+
+    baton->thread_terminate(baton->mach_thread_self());
 }