X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/f2c357f9fb922258dac9f808df0143e548c4bfdc..88c31c1e00d8a528f46aabe2e4886a78c8eedd3b:/Java/Execute.cpp

diff --git a/Java/Execute.cpp b/Java/Execute.cpp
index 471f71c..d9eb1e6 100644
--- a/Java/Execute.cpp
+++ b/Java/Execute.cpp
@@ -25,7 +25,7 @@
 
 #include <dlfcn.h>
 
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(__arm__)
 #include <JavaVM/jni.h>
 #else
 #include <jni.h>
@@ -77,8 +77,6 @@ _value; })
         return value; \
     }
 
-static JNIEnv *GetJNI(JSContextRef context);
-
 #define CYJavaForEachPrimitive \
     CYJavaForEachPrimitive_(Z, z, Boolean, Boolean, boolean) \
     CYJavaForEachPrimitive_(B, b, Byte, Byte, byte) \
@@ -636,10 +634,13 @@ struct CYJavaArray :
 struct CYJavaPackage :
     CYPrivate<CYJavaPackage>
 {
+    JNIEnv *jni_;
+
     typedef std::vector<std::string> Path;
     Path package_;
 
-    _finline CYJavaPackage(const Path &package) :
+    _finline CYJavaPackage(JNIEnv *jni, const Path &package) :
+        jni_(jni),
         package_(package)
     {
     }
@@ -940,8 +941,9 @@ static bool CYCastJavaArguments(const CYJavaFrame &frame, const CYJavaShorty &sh
 }
 
 static JSValueRef JavaMethod_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    CYJavaMethod *internal(reinterpret_cast<CYJavaMethod *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaMethod::Get(context, object));
     CYJavaObject *self(CYGetJavaObject(context, _this));
+    _assert(self != NULL);
     CYJavaEnv jni(self->value_);
 
     CYJavaSignature bound(count);
@@ -970,7 +972,7 @@ CYJavaForEachPrimitive
 } CYCatch(NULL) }
 
 static JSValueRef JavaStaticMethod_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    CYJavaMethod *internal(reinterpret_cast<CYJavaMethod *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaStaticMethod::Get(context, object));
     CYJavaClass *table(CYGetJavaTable(context, _this));
     CYJavaEnv jni(table->value_);
 
@@ -1000,7 +1002,7 @@ CYJavaForEachPrimitive
 } CYCatch(NULL) }
 
 static JSObjectRef JavaClass_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    CYJavaClass *table(reinterpret_cast<CYJavaClass *>(JSObjectGetPrivate(object)));
+    auto table(CYJavaClass::Get(context, object));
     CYJavaEnv jni(table->value_);
     jclass _class(table->value_);
 
@@ -1025,7 +1027,7 @@ static JSObjectRef JavaClass_callAsConstructor(JSContextRef context, JSObjectRef
 } CYCatch(NULL) }
 
 static bool JavaStaticInterior_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
-    CYJavaStaticInterior *internal(reinterpret_cast<CYJavaStaticInterior *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaStaticInterior::Get(context, object));
     CYJavaClass *table(internal->table_);
     CYPool pool;
     auto name(CYPoolUTF8String(pool, context, property));
@@ -1036,7 +1038,7 @@ static bool JavaStaticInterior_hasProperty(JSContextRef context, JSObjectRef obj
 }
 
 static JSValueRef JavaStaticInterior_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    CYJavaStaticInterior *internal(reinterpret_cast<CYJavaStaticInterior *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaStaticInterior::Get(context, object));
     CYJavaClass *table(internal->table_);
     CYJavaEnv jni(table->value_);
     CYPool pool;
@@ -1058,7 +1060,7 @@ CYJavaForEachPrimitive
 } CYCatch(NULL) }
 
 static bool JavaStaticInterior_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
-    CYJavaStaticInterior *internal(reinterpret_cast<CYJavaStaticInterior *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaStaticInterior::Get(context, object));
     CYJavaClass *table(internal->table_);
     CYJavaEnv jni(table->value_);
     CYPool pool;
@@ -1083,19 +1085,19 @@ CYJavaForEachPrimitive
 } CYCatch(false) }
 
 static void JavaStaticInterior_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
-    CYJavaStaticInterior *internal(reinterpret_cast<CYJavaStaticInterior *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaStaticInterior::Get(context, object));
     CYJavaClass *table(internal->table_);
     for (const auto &field : table->static_)
         JSPropertyNameAccumulatorAddName(names, CYJSString(field.first));
 }
 
 static JSValueRef JavaClass_getProperty_class(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    CYJavaClass *table(reinterpret_cast<CYJavaClass *>(JSObjectGetPrivate(object)));
+    auto table(CYJavaClass::Get(context, object));
     return CYCastJSValue(context, table->value_);
 } CYCatch(NULL) }
 
 static bool JavaInterior_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
-    CYJavaInterior *internal(reinterpret_cast<CYJavaInterior *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaInterior::Get(context, object));
     CYJavaClass *table(internal->table_);
     CYPool pool;
     auto name(CYPoolUTF8String(pool, context, property));
@@ -1106,7 +1108,7 @@ static bool JavaInterior_hasProperty(JSContextRef context, JSObjectRef object, J
 }
 
 static JSValueRef JavaInterior_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    CYJavaInterior *internal(reinterpret_cast<CYJavaInterior *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaInterior::Get(context, object));
     CYJavaEnv jni(internal->value_);
     CYJavaClass *table(internal->table_);
     CYPool pool;
@@ -1128,7 +1130,7 @@ CYJavaForEachPrimitive
 } CYCatch(NULL) }
 
 static bool JavaInterior_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
-    CYJavaInterior *internal(reinterpret_cast<CYJavaInterior *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaInterior::Get(context, object));
     CYJavaEnv jni(internal->value_);
     CYJavaClass *table(internal->table_);
     CYPool pool;
@@ -1153,30 +1155,30 @@ CYJavaForEachPrimitive
 } CYCatch(false) }
 
 static void JavaInterior_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
-    CYJavaInterior *internal(reinterpret_cast<CYJavaInterior *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaInterior::Get(context, object));
     CYJavaClass *table(internal->table_);
     for (const auto &field : table->instance_)
         JSPropertyNameAccumulatorAddName(names, CYJSString(field.first));
 }
 
 static JSValueRef JavaObject_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    CYJavaObject *internal(reinterpret_cast<CYJavaObject *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaObject::Get(context, object));
     CYJavaEnv jni(internal->value_);
     return CYGetJavaClass(context, jni.GetObjectClass(internal->value_));
 } CYCatch(NULL) }
 
 static JSValueRef JavaClass_getProperty_$cyi(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    CYJavaClass *internal(reinterpret_cast<CYJavaClass *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaClass::Get(context, object));
     return CYJavaStaticInterior::Make(context, internal->value_, internal);
 } CYCatch(NULL) }
 
 static JSValueRef JavaObject_getProperty_$cyi(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    CYJavaObject *internal(reinterpret_cast<CYJavaObject *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaObject::Get(context, object));
     return CYJavaInterior::Make(context, internal->value_, internal->table_);
 } CYCatch(NULL) }
 
 static JSValueRef JavaClass_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    CYJavaClass *internal(reinterpret_cast<CYJavaClass *>(JSObjectGetPrivate(_this)));
+    auto internal(CYJavaClass::Get(context, _this));
     CYJavaEnv jni(internal->value_);
     auto Class$(jni.FindClass("java/lang/Class"));
     auto Class$getCanonicalName(jni.GetMethodID(Class$, "getCanonicalName", "()Ljava/lang/String;"));
@@ -1194,7 +1196,7 @@ static JSValueRef JavaStaticMethod_callAsFunction_toCYON(JSContextRef context, J
 } CYCatch(NULL) }
 
 static JSValueRef JavaArray_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    CYJavaArray *internal(reinterpret_cast<CYJavaArray *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaArray::Get(context, object));
     CYJavaEnv jni(internal->value_);
     if (JSStringIsEqual(property, length_s))
         return CYCastJSValue(context, jni.GetArrayLength(internal->value_));
@@ -1220,7 +1222,7 @@ CYJavaForEachPrimitive
 } CYCatch(NULL) }
 
 static bool JavaArray_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
-    CYJavaArray *internal(reinterpret_cast<CYJavaArray *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaArray::Get(context, object));
     CYJavaEnv jni(internal->value_);
 
     CYPool pool;
@@ -1245,8 +1247,10 @@ CYJavaForEachPrimitive
     return true;
 } CYCatch(false) }
 
+static JNIEnv *GetJNI(JSContextRef context, JNIEnv *&env);
+
 static JSValueRef JavaPackage_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    CYJavaPackage *internal(reinterpret_cast<CYJavaPackage *>(JSObjectGetPrivate(_this)));
+    auto internal(CYJavaPackage::Get(context, _this));
     std::ostringstream name;
     for (auto &package : internal->package_)
         name << package << '.';
@@ -1259,7 +1263,7 @@ static bool CYJavaPackage_hasProperty(JSContextRef context, JSObjectRef object,
 }
 
 static JSValueRef CYJavaPackage_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    CYJavaPackage *internal(reinterpret_cast<CYJavaPackage *>(JSObjectGetPrivate(object)));
+    auto internal(CYJavaPackage::Get(context, object));
     CYJavaPackage::Path package(internal->package_);
 
     CYPool pool;
@@ -1270,13 +1274,16 @@ static JSValueRef CYJavaPackage_getProperty(JSContextRef context, JSObjectRef ob
         name << package << '/';
     name << next;
 
-    JNIEnv *jni(GetJNI(context));
+    if (internal->jni_ == NULL)
+        GetJNI(context, internal->jni_);
+    JNIEnv *jni(internal->jni_);
+
     if (auto _class = jni->FindClass(name.str().c_str()))
         return CYGetJavaClass(context, CYJavaLocal<jclass>(jni, _class));
     jni->ExceptionClear();
 
     package.push_back(next);
-    return CYJavaPackage::Make(context, package);
+    return CYJavaPackage::Make(context, jni, package);
 } CYCatch(NULL) }
 
 static void Cycript_delete(JNIEnv *env, jclass api, jlong jprotect) { CYJavaTry {
@@ -1308,26 +1315,17 @@ static _finline void dlset(Type_ &function, const char *name, void *handle) {
 
 jint CYJavaVersion(JNI_VERSION_1_4);
 
-static JNIEnv *CYGetCreatedJava(jint (*$JNI_GetCreatedJavaVMs)(JavaVM **, jsize, jsize *)) {
+static JavaVM *CYGetJavaVM(jint (*$JNI_GetCreatedJavaVMs)(JavaVM **, jsize, jsize *)) {
     jsize capacity(16);
     JavaVM *jvms[capacity];
     jsize size;
     _jnicall($JNI_GetCreatedJavaVMs(jvms, capacity, &size));
     if (size == 0)
         return NULL;
-    JavaVM *jvm(jvms[0]);
-    JNIEnv *jni;
-    _jnicall(jvm->GetEnv(reinterpret_cast<void **>(&jni), CYJavaVersion));
-    return jni;
+    return jvms[0];
 }
 
-static JNIEnv *GetJNI_(JSContextRef context) {
-    static JavaVM *jvm(NULL);
-    static JNIEnv *jni(NULL);
-
-    if (jni != NULL)
-        return jni;
-
+static JavaVM *CYGetJavaVM(JSContextRef context) {
     CYPool pool;
     void *handle(RTLD_DEFAULT);
     std::string library;
@@ -1336,8 +1334,8 @@ static JNIEnv *GetJNI_(JSContextRef context) {
     dlset($JNI_GetCreatedJavaVMs, "JNI_GetCreatedJavaVMs", handle);
 
     if ($JNI_GetCreatedJavaVMs != NULL) {
-        if (JNIEnv *jni = CYGetCreatedJava($JNI_GetCreatedJavaVMs))
-            return jni;
+        if (JavaVM *jvm = CYGetJavaVM($JNI_GetCreatedJavaVMs))
+            return jvm;
     } else {
         std::vector<const char *> guesses;
 
@@ -1347,6 +1345,10 @@ static JNIEnv *GetJNI_(JSContextRef context) {
             guesses.push_back(android);
 #endif
 
+        guesses.push_back("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/lib/jli/libjli.dylib");
+        //guesses.push_back("/System/Library/Frameworks/JavaVM.framework/JavaVM");
+        guesses.push_back("libjvm.dylib");
+
         guesses.push_back("libart.so");
         guesses.push_back("libdvm.so");
         guesses.push_back("libjvm.so");
@@ -1359,11 +1361,12 @@ static JNIEnv *GetJNI_(JSContextRef context) {
             }
         }
 
-        _assert(library.size() != 0);
+        if (library.size() == 0)
+            return NULL;
 
         dlset($JNI_GetCreatedJavaVMs, "JNI_GetCreatedJavaVMs", handle);
-        if (JNIEnv *jni = CYGetCreatedJava($JNI_GetCreatedJavaVMs))
-            return jni;
+        if (JavaVM *jvm = CYGetJavaVM($JNI_GetCreatedJavaVMs))
+            return jvm;
     }
 
     std::vector<JavaVMOption> options;
@@ -1391,29 +1394,34 @@ static JNIEnv *GetJNI_(JSContextRef context) {
         dlset(JniInvocation$Init, "_ZN13JniInvocation4InitEPKc", libnativehelper);
         dlset(JniInvocation$finalize, "_ZN13JniInvocationD1Ev", libnativehelper);
 
-        // XXX: we should attach a pool to the VM itself and deallocate this there
-        //auto invocation(pool.calloc<JniInvocation$>(1, 1024));
-        //_assert(JniInvocation$finalize != NULL);
-        //pool.atexit(reinterpret_cast<void (*)(void *)>(JniInvocation$finalize), invocation);
-
-        auto invocation(static_cast<JniInvocation$ *>(calloc(1, 1024)));
+        if (JniInvocation$$init$ == NULL)
+            dlclose(libnativehelper);
+        else {
+            // XXX: we should attach a pool to the VM itself and deallocate this there
+            //auto invocation(pool.calloc<JniInvocation$>(1, 1024));
+            //_assert(JniInvocation$finalize != NULL);
+            //pool.atexit(reinterpret_cast<void (*)(void *)>(JniInvocation$finalize), invocation);
 
-        _assert(JniInvocation$$init$ != NULL);
-        JniInvocation$$init$(invocation);
+            auto invocation(static_cast<JniInvocation$ *>(calloc(1, 1024)));
+            JniInvocation$$init$(invocation);
 
-        _assert(JniInvocation$Init != NULL);
-        JniInvocation$Init(invocation, NULL);
+            _assert(JniInvocation$Init != NULL);
+            JniInvocation$Init(invocation, NULL);
 
-        dlset($JNI_GetCreatedJavaVMs, "JNI_GetCreatedJavaVMs", libnativehelper);
-        if (JNIEnv *jni = CYGetCreatedJava($JNI_GetCreatedJavaVMs))
-            return jni;
+            dlset($JNI_GetCreatedJavaVMs, "JNI_GetCreatedJavaVMs", libnativehelper);
+            if (JavaVM *jvm = CYGetJavaVM($JNI_GetCreatedJavaVMs))
+                return jvm;
+        }
     }
 
+    JavaVM *jvm;
+    JNIEnv *env;
+
     if (void *libandroid_runtime = dlopen("libandroid_runtime.so", RTLD_LAZY | RTLD_GLOBAL)) {
         class AndroidRuntime$;
         AndroidRuntime$ *(*AndroidRuntime$$init$)(AndroidRuntime$ *self, char *args, unsigned int size)(NULL);
-        int (*AndroidRuntime$startVm)(AndroidRuntime$ *self, JavaVM **jvm, JNIEnv **jni)(NULL);
-        int (*AndroidRuntime$startReg)(JNIEnv *jni)(NULL);
+        int (*AndroidRuntime$startVm)(AndroidRuntime$ *self, JavaVM **jvm, JNIEnv **env)(NULL);
+        int (*AndroidRuntime$startReg)(JNIEnv *env)(NULL);
         int (*AndroidRuntime$addOption)(AndroidRuntime$ *self, const char *option, void *extra)(NULL);
         int (*AndroidRuntime$addVmArguments)(AndroidRuntime$ *self, int, const char *const argv[])(NULL);
         AndroidRuntime$ *(*AndroidRuntime$finalize)(AndroidRuntime$ *self)(NULL);
@@ -1443,14 +1451,14 @@ static JNIEnv *GetJNI_(JSContextRef context) {
         int failure;
 
         _assert(AndroidRuntime$startVm != NULL);
-        failure = AndroidRuntime$startVm(runtime, &jvm, &jni);
+        failure = AndroidRuntime$startVm(runtime, &jvm, &env);
         _assert(failure == 0);
 
         _assert(AndroidRuntime$startReg != NULL);
-        failure = AndroidRuntime$startReg(jni);
+        failure = AndroidRuntime$startReg(env);
         _assert(failure == 0);
 
-        return jni;
+        return jvm;
     }
 
     jint (*$JNI_CreateJavaVM)(JavaVM **jvm, void **, void *);
@@ -1461,15 +1469,27 @@ static JNIEnv *GetJNI_(JSContextRef context) {
     args.version = CYJavaVersion;
     args.nOptions = options.size();
     args.options = options.data();
-    _jnicall($JNI_CreateJavaVM(&jvm, reinterpret_cast<void **>(&jni), &args));
-    return jni;
+    _jnicall($JNI_CreateJavaVM(&jvm, reinterpret_cast<void **>(&env), &args));
+    return jvm;
 }
 
-static JNIEnv *GetJNI(JSContextRef context) {
-    CYJavaEnv jni(GetJNI_(context));
+static JNIEnv *GetJNI(JSContextRef context, JNIEnv *&env) {
+    auto jvm(CYGetJavaVM(context));
+    _assert(jvm != NULL);
+    _jnicall(jvm->GetEnv(reinterpret_cast<void **>(&env), CYJavaVersion));
+    CYJavaEnv jni(env);
+
+    // XXX: this happens once per stub :/
+
     auto Cycript$(jni.FindClass("Cycript"));
     jni.RegisterNatives(Cycript$, Cycript_, sizeof(Cycript_) / sizeof(Cycript_[0]));
-    return jni;
+
+    JSObjectRef java(CYGetCachedObject(context, CYJSString("Java")));
+    JSValueRef arguments[1];
+    arguments[0] = CYCastJSValue(context, CYJSString("setup"));
+    CYCallAsFunction(context, CYCastJSObject(context, CYGetProperty(context, java, CYJSString("emit"))), java, 1, arguments);
+
+    return env;
 }
 
 static JSStaticValue JavaClass_staticValues[3] = {
@@ -1580,20 +1600,21 @@ CYJavaForEachPrimitive
 
 void CYJava_SetupContext(JSContextRef context) {
     JSObjectRef global(CYGetGlobalObject(context));
-    //JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));
+    JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));
     JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));
     JSObjectRef all(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("all"))));
     //JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls"))));
 
     JSObjectRef Java(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, cycript, CYJSString("Java"), Java);
+    CYSetProperty(context, cy, CYJSString("Java"), Java);
 
-    JSObjectRef Packages(CYJavaPackage::Make(context, CYJavaPackage::Path()));
-    CYSetProperty(context, all, CYJSString("Packages"), Packages);
+    JSObjectRef Packages(CYJavaPackage::Make(context, nullptr, CYJavaPackage::Path()));
+    CYSetProperty(context, all, CYJSString("Packages"), Packages, kJSPropertyAttributeDontEnum);
 
     for (auto name : (const char *[]) {"java", "javax", "android", "com", "net", "org"}) {
         CYJSString js(name);
-        CYSetProperty(context, all, js, CYGetProperty(context, Packages, js));
+        CYSetProperty(context, all, js, CYJavaPackage::Make(context, nullptr, CYJavaPackage::Path(1, name)), kJSPropertyAttributeDontEnum);
     }
 }