Tab-complete FTW!

[cycript.git] / Mach / Inject.cpp

diff --git a/Mach/Inject.cpp b/Mach/Inject.cpp
index 198f2f3ae0db67e94b5c648c36138f3eb58c2e1e..0f89bb20fb8cfe902f7cf7b2e0439e284dbb862b 100644 (file)
--- a/Mach/Inject.cpp
+++ b/Mach/Inject.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.
+*/
+/* }}} */
+
 #include <dlfcn.h>
 #include <mach/mach.h>
 
@@ -41,6 +80,7 @@ void InjectLibrary(pid_t pid) {
     uintptr_t set_self_internal;
     uintptr_t set_self_external;
 
+#if defined(__i386__)
     struct nlist nl[3];
     memset(nl, 0, sizeof(nl));
     nl[0].n_un.n_name = (char *) "__pthread_set_self";
@@ -48,6 +88,10 @@ void InjectLibrary(pid_t pid) {
     nlist("/usr/lib/libSystem.B.dylib", nl);
     nlset(set_self_internal, nl, 0);
     nlset(set_self_external, nl, 1);
+#else
+    set_self_internal = 0;
+    set_self_external = 0;
+#endif
 
     baton->_pthread_set_self = reinterpret_cast<void (*)(pthread_t)>(reinterpret_cast<uintptr_t>(&__pthread_set_self) - set_self_external + set_self_internal);
 
@@ -91,7 +135,7 @@ void InjectLibrary(pid_t pid) {
     flavor = ARM_THREAD_STATE;
     count = ARM_THREAD_STATE_COUNT;
     push = 0;
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
     i386_thread_state_t state;
     flavor = i386_THREAD_STATE;
     count = i386_THREAD_STATE_COUNT;
@@ -119,7 +163,7 @@ void InjectLibrary(pid_t pid) {
         state.pc &= ~0x1;
         state.cpsr |= 0x20;
     }
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
     frame[0] = 0;
     frame[1] = data;