Restructure Mach/Inject for iOS 4.3.

diff --git a/Baton.hpp b/Baton.hpp
index 3ce4e621b1c6815a6787b7949d3069f97f3c97e7..d930121a1ba7301afcee26b54b481bac6250b807 100644 (file)
--- a/Baton.hpp
+++ b/Baton.hpp
@@ -24,18 +24,11 @@
 #include <sys/types.h>
 
 struct Baton {
-    void (*__pthread_set_self)(pthread_t);
+    void (*_pthread_start)(pthread_t, mach_port_t, void *(*)(void *), void *, size_t, unsigned int);
 
-    int (*pthread_create)(pthread_t *, const pthread_attr_t *, void *(*)(void *), void *);
-    int (*pthread_join)(pthread_t, void **);
-
-    void *(*dlopen)(const char *, int);
     char *(*dlerror)();
     void *(*dlsym)(void *, const char *);
 
-    mach_port_t (*mach_thread_self)();
-    kern_return_t (*thread_terminate)(thread_act_t);
-
     pid_t pid;
     char library[];
 };

diff --git a/Darwin-arm.mk b/Darwin-arm.mk
index cc970778984f81250b4e5913868d4fb9a78485a0..6c24e6ee94676cd234cf0ad8cb1452c192c02ded 100644 (file)
--- a/Darwin-arm.mk
+++ b/Darwin-arm.mk
@@ -9,6 +9,7 @@ depends += apr-lib readline libffi mobilesubstrate
 library += -framework WebCore
 # XXX: all Darwin, maybe all device, should have this
 library += -lsubstrate
+console += -lsubstrate
 
 ldid := ldid -S
 entitle := ldid -Scycript.xml

diff --git a/Mach/Inject.cpp b/Mach/Inject.cpp
index 45c33beaa26722a748f4ebe6593d28f612bc3f35..92a395ec371f29f21b9c66c669327be97c70d6f8 100644 (file)
--- a/Mach/Inject.cpp
+++ b/Mach/Inject.cpp
@@ -33,7 +33,9 @@
 #include "Pooling.hpp"
 #include "Trampoline.t.hpp"
 
-extern "C" void __pthread_set_self(pthread_t);
+#include <substrate.h>
+
+extern "C" void _pthread_start(pthread_t, mach_port_t, void *(*)(void *), void *, size_t, unsigned int);
 
 void InjectLibrary(pid_t pid) {
     const char *library(CY_LIBRARY);
@@ -46,18 +48,10 @@ void InjectLibrary(pid_t pid) {
     uint8_t *local(reinterpret_cast<uint8_t *>(apr_palloc(pool, depth)));
     Baton *baton(reinterpret_cast<Baton *>(local));
 
-    baton->__pthread_set_self = &__pthread_set_self;
-
-    baton->pthread_create = &pthread_create;
-    baton->pthread_join = &pthread_join;
-
-    baton->dlopen = &dlopen;
+    baton->_pthread_start = reinterpret_cast<void (*)(pthread_t, mach_port_t, void *(*)(void *), void *, size_t, unsigned int)>(MSFindSymbol(NULL, "__pthread_start"));
     baton->dlerror = &dlerror;
     baton->dlsym = &dlsym;
 
-    baton->mach_thread_self = &mach_thread_self;
-    baton->thread_terminate = &thread_terminate;
-
     baton->pid = getpid();
     memcpy(baton->library, library, length);
 
@@ -109,7 +103,8 @@ void InjectLibrary(pid_t pid) {
     _krncall(vm_protect(task, code, trampoline->size_, false, VM_PROT_READ | VM_PROT_EXECUTE));
 
     /*
-    printf("_ptss:%p\n", baton->__pthread_set_self);
+    printf("_pts:%p\n", baton->_pthread_start);
+    printf("dlerror:%p\n", baton->dlerror);
     printf("dlsym:%p\n", baton->dlsym);
     printf("code:%zx\n", (size_t) code);
     */

diff --git a/Trampoline.t.cpp b/Trampoline.t.cpp
index e52962afa37b224945219b8095fc2607407184bc..7229c2552592b1508918e81451d25aeed2b3d17c 100644 (file)
--- a/Trampoline.t.cpp
+++ b/Trampoline.t.cpp
@@ -35,7 +35,7 @@ static _finline void dlset(Baton *baton, Type_ &function, const char *name, void
 #define Framework(framework) \
     "/System/Library/Frameworks/" #framework ".framework/" #framework
 
-void *Routine(void *arg) {
+static void *Routine(void *arg) {
     Baton *baton(reinterpret_cast<Baton *>(arg));
 
     void *(*dlopen)(const char *, int);
@@ -64,37 +64,25 @@ void *Routine(void *arg) {
     return NULL;
 }
 
-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;
-}
-
-extern "C" void Start(Baton *baton) {
-    struct _pthread self;
-    $bzero(&self, sizeof(self));
-
-    // this code comes from _pthread_set_self
-    self.tsd[0] = &self;
-    baton->__pthread_set_self(&self);
+static void *Thread(void *arg) {
+    Baton *baton(reinterpret_cast<Baton *>(arg));
 
     int (*pthread_create)(pthread_t *, const pthread_attr_t *, void *(*)(void *), void *);
     dlset(baton, pthread_create, "pthread_create");
 
     pthread_t thread;
-    baton->pthread_create(&thread, NULL, &Routine, baton);
+    pthread_create(&thread, NULL, &Routine, baton);
 
     int (*pthread_join)(pthread_t, void **);
     dlset(baton, pthread_join, "pthread_join");
 
     void *result;
-    baton->pthread_join(thread, &result);
+    pthread_join(thread, &result);
 
-    mach_port_t (*mach_thread_self)();
-    dlset(baton, mach_thread_self, "mach_thread_self");
-
-    kern_return_t (*thread_terminate)(thread_act_t);
-    dlset(baton, thread_terminate, "thread_terminate");
+    return NULL;
+}
 
-    baton->thread_terminate(baton->mach_thread_self());
+extern "C" void Start(Baton *baton) {
+    struct _pthread self;
+    baton->_pthread_start(&self, NULL, &Thread, baton, 8 * 1024, 0);
 }