Add .constant to Type (although encoding is weird).

[cycript.git] / Mach / Inject.cpp

diff --git a/Mach/Inject.cpp b/Mach/Inject.cpp
index a2c5f045c3abee148259ec3d255c43596f1c38cb..8679e03a332c938e184dfff53b88532423de6ef3 100644 (file)
--- a/Mach/Inject.cpp
+++ b/Mach/Inject.cpp
@@ -1,9 +1,28 @@
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2012  Jay Freeman (saurik)
+*/
+
+/* GNU Lesser 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 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.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/
+/* }}} */
+

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

-extern "C" {
-#include <mach-o/nlist.h>
-}
+#include <mach/machine/thread_status.h>

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


@@ -14,20 +33,10 @@ extern "C" {
 #include "Pooling.hpp"
 #include "Trampoline.t.hpp"
 
 #include "Pooling.hpp"
 #include "Trampoline.t.hpp"
 

-extern "C" void _pthread_set_self(pthread_t);
-
-template <typename Type_>
-static void nlset(Type_ &function, struct nlist *nl, size_t index) {
-    struct nlist &name(nl[index]);
-    uintptr_t value(name.n_value);
-    if ((name.n_desc & N_ARM_THUMB_DEF) != 0)
-        value |= 0x00000001;
-    function = reinterpret_cast<Type_>(value);
-}
+extern "C" void __pthread_set_self(pthread_t);

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

-    // XXX: break this into the build environment
-    const char *library("/usr/lib/libcycript.dylib");
+    const char *library(CY_LIBRARY);

 
     static const size_t Stack_(8 * 1024);
     size_t length(strlen(library) + 1), depth(sizeof(Baton) + length);
 
     static const size_t Stack_(8 * 1024);
     size_t length(strlen(library) + 1), depth(sizeof(Baton) + length);


@@ -37,21 +46,15 @@ void InjectLibrary(pid_t pid) {
     uint8_t *local(reinterpret_cast<uint8_t *>(apr_palloc(pool, depth)));
     Baton *baton(reinterpret_cast<Baton *>(local));
 
     uint8_t *local(reinterpret_cast<uint8_t *>(apr_palloc(pool, depth)));
     Baton *baton(reinterpret_cast<Baton *>(local));
 

-    struct nlist nl[2];
-    memset(nl, 0, sizeof(nl));
-    nl[0].n_un.n_name = (char *) "__pthread_set_self";
-    nlist("/usr/lib/libSystem.B.dylib", nl);
-    nlset(baton->_pthread_set_self, nl, 0);
-
+    baton->__pthread_set_self = &__pthread_set_self;

     baton->pthread_create = &pthread_create;
     baton->pthread_create = &pthread_create;

-    baton->pthread_join = &pthread_join;
-
-    baton->dlopen = &dlopen;
-    baton->dlsym = &dlsym;

 
     baton->mach_thread_self = &mach_thread_self;
     baton->thread_terminate = &thread_terminate;
 
 
     baton->mach_thread_self = &mach_thread_self;
     baton->thread_terminate = &thread_terminate;
 

+    baton->dlerror = &dlerror;
+    baton->dlsym = &dlsym;
+

     baton->pid = getpid();
     memcpy(baton->library, library, length);
 
     baton->pid = getpid();
     memcpy(baton->library, library, length);
 


@@ -60,30 +63,57 @@ void InjectLibrary(pid_t pid) {
     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 data;
-    _krncall(vm_allocate(task, &data, size, true));
-    vm_address_t stack(data + depth);
-    vm_write(task, data, reinterpret_cast<vm_address_t>(baton), depth);
+    vm_address_t stack;
+    _krncall(vm_allocate(task, &stack, size, true));
+    vm_address_t data(stack + Stack_);

 
 

-    vm_address_t code;
-    _krncall(vm_allocate(task, &code, sizeof(Trampoline_), true));
-    vm_write(task, code, reinterpret_cast<vm_address_t>(Trampoline_), sizeof(Trampoline_));
-    _krncall(vm_protect(task, code, sizeof(Trampoline_), false, VM_PROT_READ | VM_PROT_EXECUTE));
+    vm_write(task, data, reinterpret_cast<vm_address_t>(baton), depth);

 
     thread_act_t thread;
     _krncall(thread_create(task, &thread));
 
     thread_state_flavor_t flavor;
     mach_msg_type_number_t count;
 
     thread_act_t thread;
     _krncall(thread_create(task, &thread));
 
     thread_state_flavor_t flavor;
     mach_msg_type_number_t count;

+    size_t push;
+
+    Trampoline *trampoline;

 
 #if defined(__arm__)
 
 #if defined(__arm__)

+    trampoline = &Trampoline_armv6_;

     arm_thread_state_t state;
     flavor = ARM_THREAD_STATE;
     count = ARM_THREAD_STATE_COUNT;
     arm_thread_state_t state;
     flavor = ARM_THREAD_STATE;
     count = ARM_THREAD_STATE_COUNT;

+    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));
+
+    /*
+    printf("_ptss:%p\n", baton->__pthread_set_self);
+    printf("dlsym:%p\n", baton->dlsym);
+    printf("code:%zx\n", (size_t) code);
+    */
+
+    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);
     memset(&state, 0, sizeof(state));
 
     mach_msg_type_number_t read(count);


@@ -91,19 +121,31 @@ void InjectLibrary(pid_t pid) {
     _assert(count == count);
 
 #if defined(__arm__)
     _assert(count == count);
 
 #if defined(__arm__)

-    state.r[0] = data;
-    state.r[1] = RTLD_LAZY | RTLD_GLOBAL;
-    state.sp = stack + Stack_;
-    state.pc = code;
-
-    if ((state.pc & 0x1) != 0) {
-        state.pc &= ~0x1;
-        state.cpsr |= 0x20;
+    state.__r[0] = data;
+    state.__sp = stack + Stack_;
+    state.__pc = code + trampoline->entry_;
+
+    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
 
 #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(thread_set_state(thread, flavor, reinterpret_cast<thread_state_t>(&state), count));
     _krncall(thread_resume(thread));
 
     _krncall(thread_set_state(thread, flavor, reinterpret_cast<thread_state_t>(&state), count));
     _krncall(thread_resume(thread));