Finish new build environment, relocatable objects.

[cycript.git] / Mach / Inject.cpp

diff --git a/Mach/Inject.cpp b/Mach/Inject.cpp
index 45c33beaa26722a748f4ebe6593d28f612bc3f35..feb2c3c7cb6c696b848a06dd61fb63ff059c9d7b 100644 (file)
--- a/Mach/Inject.cpp
+++ b/Mach/Inject.cpp
@@ -1,28 +1,43 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2010  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)

 */
 
 */
 

-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */

 /*
 /*

- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.

  *
  *

- * Cycript is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
+ * Cycript is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.

  *
  *

- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License

  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
 
 #include <dlfcn.h>
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
 
 #include <dlfcn.h>

+

 #include <mach/mach.h>
 
 #include <mach/mach.h>
 

-#include <mach/i386/thread_status.h>
+#ifdef __APPLE__
+#include "TargetConditionals.h"
+#endif
+
+#ifdef TARGET_OS_IPHONE
+#include <mach/vm_map.h>
+#define mach_vm_allocate vm_allocate
+#define mach_vm_protect vm_protect
+#define mach_vm_write vm_write
+#define mach_vm_address_t vm_address_t
+#else
+#include <mach/mach_vm.h>
+#endif
+
+#include <mach/machine/thread_status.h>

 
 #include <cstdio>
 #include <pthread.h>
 
 #include <cstdio>
 #include <pthread.h>


@@ -33,123 +48,133 @@
 #include "Pooling.hpp"
 #include "Trampoline.t.hpp"
 
 #include "Pooling.hpp"
 #include "Trampoline.t.hpp"
 

-extern "C" void __pthread_set_self(pthread_t);
+extern "C" void CYHandleServer(pid_t);

 
 void InjectLibrary(pid_t pid) {
 
 void InjectLibrary(pid_t pid) {

-    const char *library(CY_LIBRARY);
-
-    static const size_t Stack_(8 * 1024);
-    size_t length(strlen(library) + 1), depth(sizeof(Baton) + length);
-    depth = (depth + sizeof(uintptr_t) + 1) / sizeof(uintptr_t) * sizeof(uintptr_t);
-
-    CYPool pool;
-    uint8_t *local(reinterpret_cast<uint8_t *>(apr_palloc(pool, depth)));
-    Baton *baton(reinterpret_cast<Baton *>(local));
+    Dl_info addr;
+    _assert(dladdr(reinterpret_cast<void *>(&CYHandleServer), &addr) != 0);

 
 

-    baton->__pthread_set_self = &__pthread_set_self;
-
-    baton->pthread_create = &pthread_create;
-    baton->pthread_join = &pthread_join;
-
-    baton->dlopen = &dlopen;
-    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);
-
-    vm_size_t size(depth + Stack_);
+    size_t flength(strlen(addr.dli_fname));
+    char library[flength + 4 + 1];
+    memcpy(library, addr.dli_fname, flength);
+    library[flength] = '\0';
+    _assert(strcmp(library + flength - 6, ".dylib") == 0);
+    strcpy(library + flength - 6, "-any.dylib");

 
     mach_port_t self(mach_task_self()), task;
     _krncall(task_for_pid(self, pid, &task));
 
 
     mach_port_t self(mach_task_self()), task;
     _krncall(task_for_pid(self, pid, &task));
 

-    vm_address_t stack;
-    _krncall(vm_allocate(task, &stack, size, true));
-    vm_address_t data(stack + Stack_);
+    mach_msg_type_number_t count;

 
 

-    vm_write(task, data, reinterpret_cast<vm_address_t>(baton), depth);
+    task_dyld_info info;
+    count = TASK_DYLD_INFO_COUNT;
+    _krncall(task_info(task, TASK_DYLD_INFO, reinterpret_cast<task_info_t>(&info), &count));
+    _assert(count == TASK_DYLD_INFO_COUNT);
+    _assert(info.all_image_info_addr != 0);

 
     thread_act_t thread;
     _krncall(thread_create(task, &thread));
 
 
     thread_act_t thread;
     _krncall(thread_create(task, &thread));
 

-    thread_state_flavor_t flavor;
-    mach_msg_type_number_t count;
-    size_t push;
+#if defined (__i386__) || defined(__x86_64__)
+    x86_thread_state_t state;
+#elif defined(__arm__)
+    arm_thread_state_t state;
+#else
+    #error XXX: implement
+#endif
+
+    memset(&state, 0, sizeof(state));
+    mach_msg_type_number_t read(MACHINE_THREAD_STATE_COUNT);
+    _krncall(thread_get_state(thread, MACHINE_THREAD_STATE, reinterpret_cast<thread_state_t>(&state), &read));
+    _assert(read == MACHINE_THREAD_STATE_COUNT);

 
     Trampoline *trampoline;
 
     Trampoline *trampoline;

+    size_t align;
+    size_t push;

 
 

-#if defined(__arm__)
-    trampoline = &Trampoline_arm_;
-    arm_thread_state_t state;
-    flavor = ARM_THREAD_STATE;
-    count = ARM_THREAD_STATE_COUNT;
+#if defined(__i386__) || defined(__x86_64__)
+    switch (state.tsh.flavor) {
+        case i386_THREAD_STATE:
+            trampoline = &Trampoline_i386_;
+            align = 4;
+            push = 5;
+            break;
+        case x86_THREAD_STATE64:
+            trampoline = &Trampoline_x86_64_;
+            align = 8;
+            push = 2;
+            break;
+        default:
+            _assert(false);
+    }
+#elif defined(__arm__)
+    trampoline = &Trampoline_armv6_;
+    align = 4;

     push = 0;
     push = 0;

-#elif defined(__i386__)
-    trampoline = &Trampoline_i386_;
-    i386_thread_state_t state;
-    flavor = i386_THREAD_STATE;
-    count = i386_THREAD_STATE_COUNT;
-    push = 5;
-#elif defined(__x86_64__)
-    trampoline = &Trampoline_x86_64_;
-    x86_thread_state64_t state;
-    flavor = x86_THREAD_STATE64;
-    count = x86_THREAD_STATE64_COUNT;
-    push = 2;

 #else
     #error XXX: implement
 #endif
 
 #else
     #error XXX: implement
 #endif
 

-    vm_address_t code;
-    _krncall(vm_allocate(task, &code, trampoline->size_, true));
-    vm_write(task, code, reinterpret_cast<vm_address_t>(trampoline->data_), trampoline->size_);
-    _krncall(vm_protect(task, code, trampoline->size_, false, VM_PROT_READ | VM_PROT_EXECUTE));
+    static const size_t Stack_(8 * 1024);
+    size_t length(strlen(library) + 1), depth(sizeof(Baton) + length);
+    depth = (depth + align + 1) / align * align;
+
+    CYPool pool;
+    uint8_t *local(pool.malloc<uint8_t>(depth));
+    Baton *baton(reinterpret_cast<Baton *>(local));
+
+    baton->dyld = info.all_image_info_addr;
+    baton->pid = getpid();
+    memcpy(baton->library, library, length);
+
+    mach_vm_size_t size(depth + Stack_);
+    mach_vm_address_t stack;
+    _krncall(mach_vm_allocate(task, &stack, size, true));

 
 

-    /*
-    printf("_ptss:%p\n", baton->__pthread_set_self);
-    printf("dlsym:%p\n", baton->dlsym);
-    printf("code:%zx\n", (size_t) code);
-    */
+    mach_vm_address_t data(stack + Stack_);
+    _krncall(mach_vm_write(task, data, reinterpret_cast<mach_vm_address_t>(baton), depth));
+
+    mach_vm_address_t code;
+    _krncall(mach_vm_allocate(task, &code, trampoline->size_, true));
+    _krncall(mach_vm_write(task, code, reinterpret_cast<mach_vm_address_t>(trampoline->data_), trampoline->size_));
+    _krncall(mach_vm_protect(task, code, trampoline->size_, false, VM_PROT_READ | VM_PROT_EXECUTE));

 
     uint32_t frame[push];
     if (sizeof(frame) != 0)
         memset(frame, 0, sizeof(frame));
 
     uint32_t frame[push];
     if (sizeof(frame) != 0)
         memset(frame, 0, sizeof(frame));

-    memset(&state, 0, sizeof(state));
-
-    mach_msg_type_number_t read(count);
-    _krncall(thread_get_state(thread, flavor, reinterpret_cast<thread_state_t>(&state), &read));
-    _assert(count == count);

 
 

-#if defined(__arm__)
-    state.r[0] = data;
-    state.sp = stack + Stack_;
-    state.pc = code + trampoline->entry_;
-
-    if ((state.pc & 0x1) != 0) {
-        state.pc &= ~0x1;
-        state.cpsr |= 0x20;
+#if defined(__i386__) || defined(__x86_64__)
+    switch (state.tsh.flavor) {
+        case i386_THREAD_STATE:
+            frame[1] = data;
+            state.uts.ts32.__eip = code + trampoline->entry_;
+            state.uts.ts32.__esp = stack + Stack_ - sizeof(frame);
+            break;
+        case x86_THREAD_STATE64:
+            state.uts.ts64.__rdi = data;
+            state.uts.ts64.__rip = code + trampoline->entry_;
+            state.uts.ts64.__rsp = stack + Stack_ - sizeof(frame);
+            break;
+        default:
+            _assert(false);
+    }
+#elif defined(__arm__)
+    state.__r[0] = data;
+    state.__pc = code + trampoline->entry_;
+    state.__sp = stack + Stack_ - sizeof(frame);
+
+    if ((state.__pc & 0x1) != 0) {
+        state.__pc &= ~0x1;
+        state.__cpsr |= 0x20;

     }
     }

-#elif defined(__i386__)
-    frame[1] = data;
-
-    state.__eip = code + trampoline->entry_;
-    state.__esp = stack + Stack_ - sizeof(frame);
-#elif defined(__x86_64__)
-    frame[0] = 0xdeadbeef;
-    state.__rdi = data;
-    state.__rip = code + trampoline->entry_;
-    state.__rsp = stack + Stack_ - sizeof(frame);

 #else
     #error XXX: implement
 #endif
 
     if (sizeof(frame) != 0)
 #else
     #error XXX: implement
 #endif
 
     if (sizeof(frame) != 0)

-        vm_write(task, stack + Stack_ - sizeof(frame), reinterpret_cast<vm_address_t>(frame), sizeof(frame));
+        _krncall(mach_vm_write(task, stack + Stack_ - sizeof(frame), reinterpret_cast<mach_vm_address_t>(frame), sizeof(frame)));

 
 

-    _krncall(thread_set_state(thread, flavor, reinterpret_cast<thread_state_t>(&state), count));
+    _krncall(thread_set_state(thread, MACHINE_THREAD_STATE, reinterpret_cast<thread_state_t>(&state), MACHINE_THREAD_STATE_COUNT));

     _krncall(thread_resume(thread));
 
     _krncall(mach_port_deallocate(self, task));
     _krncall(thread_resume(thread));
 
     _krncall(mach_port_deallocate(self, task));