Temporary hacks to make 64-bit compile work.

[cycript.git] / Trampoline.t.cpp

diff --git a/Trampoline.t.cpp b/Trampoline.t.cpp
index 8689df34bf74bbddc71375e95968a1d251aaf83c..c228259e357ed3715a8d142eb8ec5f9848815dd9 100644 (file)
--- a/Trampoline.t.cpp
+++ b/Trampoline.t.cpp
@@ -1,3 +1,42 @@
+/* Cycript - Inlining/Optimizing JavaScript Compiler
+ * Copyright (C) 2009  Jay Freeman (saurik)
+*/
+
+/* Modified BSD License {{{ */
+/*
+ *        Redistribution and use in source and binary
+ * forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the
+ *    above copyright notice, this list of conditions
+ *    and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the
+ *    above copyright notice, this list of conditions
+ *    and the following disclaimer in the documentation
+ *    and/or other materials provided with the
+ *    distribution.
+ * 3. The name of the author may not be used to endorse
+ *    or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/* }}} */
+
 #define _PTHREAD_ATTR_T
 #include <pthread_internals.h>
 
@@ -13,13 +52,15 @@ extern "C" void Start(Baton *baton) {
     baton->pthread_create(&thread, NULL, &Routine, baton);
 
     void *result;
-    baton->pthread_detach(thread);
+    baton->pthread_join(thread, &result);
 
     baton->thread_terminate(baton->mach_thread_self());
 }
 
 void *Routine(void *arg) {
     Baton *baton(reinterpret_cast<Baton *>(arg));
-    baton->dlopen(baton->library, RTLD_LAZY | RTLD_GLOBAL);
+    void *handle(baton->dlopen(baton->library, RTLD_LAZY | RTLD_LOCAL));
+    void (*HandleServer)(pid_t) = reinterpret_cast<void (*)(pid_t)>(baton->dlsym(handle, "CYHandleServer"));
+    HandleServer(baton->pid);
     return arg;
 }