X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/0b5f88f67491643e48cfb14b28a4e894296ae98f..88c31c1e00d8a528f46aabe2e4886a78c8eedd3b:/Java/Execute.cpp diff --git a/Java/Execute.cpp b/Java/Execute.cpp index f382bc9..d9eb1e6 100644 --- a/Java/Execute.cpp +++ b/Java/Execute.cpp @@ -25,7 +25,7 @@ #include -#ifdef __APPLE__ +#if defined(__APPLE__) && !defined(__arm__) #include #else #include @@ -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 { + JNIEnv *jni_; + typedef std::vector Path; Path package_; - _finline CYJavaPackage(const Path &package) : + _finline CYJavaPackage(JNIEnv *jni, const Path &package) : + jni_(jni), package_(package) { } @@ -942,6 +943,7 @@ 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 { auto internal(CYJavaMethod::Get(context, object)); CYJavaObject *self(CYGetJavaObject(context, _this)); + _assert(self != NULL); CYJavaEnv jni(self->value_); CYJavaSignature bound(count); @@ -1245,6 +1247,8 @@ 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 { auto internal(CYJavaPackage::Get(context, _this)); std::ostringstream name; @@ -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(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(&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 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 options; @@ -1406,16 +1409,19 @@ static JNIEnv *GetJNI_(JSContextRef context) { JniInvocation$Init(invocation, NULL); dlset($JNI_GetCreatedJavaVMs, "JNI_GetCreatedJavaVMs", libnativehelper); - if (JNIEnv *jni = CYGetCreatedJava($JNI_GetCreatedJavaVMs)) - return jni; + 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); @@ -1445,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 *); @@ -1463,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(&jni), &args)); - return jni; + _jnicall($JNI_CreateJavaVM(&jvm, reinterpret_cast(&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(&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] = { @@ -1582,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); } }