Switch from gcc to clang (Apple is incompetent).

[cycript.git] / Mach / Inject.cpp

diff --git a/Mach/Inject.cpp b/Mach/Inject.cpp
index c629939610469954275a80094e52b64bbc226fe6..74e5b308ec0579da634f2cd40fc206501f56a92c 100644 (file)
--- a/Mach/Inject.cpp
+++ b/Mach/Inject.cpp
@@ -22,7 +22,20 @@
 #include <dlfcn.h>
 
 #include <mach/mach.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>
 
@@ -35,8 +48,12 @@
 #include "Pooling.hpp"
 #include "Trampoline.t.hpp"
 
+extern "C" void CYHandleServer(pid_t);
+
 void InjectLibrary(pid_t pid) {
-    const char *library(CY_LIBRARY);
+    Dl_info addr;
+    _assert(dladdr(reinterpret_cast<void *>(&CYHandleServer), &addr) != 0);
+    const char *library(addr.dli_fname);
 
     mach_port_t self(mach_task_self()), task;
     _krncall(task_for_pid(self, pid, &task));
@@ -52,23 +69,18 @@ void InjectLibrary(pid_t pid) {
     thread_act_t thread;
     _krncall(thread_create(task, &thread));
 
-    thread_state_flavor_t flavor;
 #if defined (__i386__) || defined(__x86_64__)
     x86_thread_state_t state;
-    flavor = x86_THREAD_STATE;
-    count = x86_THREAD_STATE_COUNT;
 #elif defined(__arm__)
     arm_thread_state_t state;
-    flavor = ARM_THREAD_STATE;
-    count = ARM_THREAD_STATE_COUNT;
 #else
     #error XXX: implement
 #endif
 
     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(read == count);
+    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;
     size_t align;
@@ -156,7 +168,7 @@ void InjectLibrary(pid_t pid) {
     if (sizeof(frame) != 0)
         _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));