X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/477549f502f5350425ab6547564852bcfd6940ae..88c31c1e00d8a528f46aabe2e4886a78c8eedd3b:/Java/Execute.cpp diff --git a/Java/Execute.cpp b/Java/Execute.cpp index bca2e98..d9eb1e6 100644 --- a/Java/Execute.cpp +++ b/Java/Execute.cpp @@ -23,12 +23,19 @@ #include #include -#ifdef __APPLE__ +#include + +#if defined(__APPLE__) && !defined(__arm__) #include #else #include #endif +#ifdef __ANDROID__ +// XXX: this is deprecated?!?!?!?!?!?! +#include +#endif + #include "cycript.hpp" #include "Error.hpp" #include "Execute.hpp" @@ -70,14 +77,6 @@ _value; }) return value; \ } -extern "C" { - // Android's jni.h seriously doesn't declare these :/ - jint JNI_CreateJavaVM(JavaVM **, void **, void *); - jint JNI_GetCreatedJavaVMs(JavaVM **, jsize, jsize *); -} - -JNIEnv *GetJNI(JSContextRef context); - #define CYJavaForEachPrimitive \ CYJavaForEachPrimitive_(Z, z, Boolean, Boolean, boolean) \ CYJavaForEachPrimitive_(B, b, Byte, Byte, byte) \ @@ -97,6 +96,15 @@ CYJavaForEachPrimitive #undef CYJavaForEachPrimitive_ }; +template +struct IsJavaPrimitive { static const bool value = false; }; + +#define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \ + template <> \ + struct IsJavaPrimitive { static const bool value = true; }; +CYJavaForEachPrimitive +#undef CYJavaForEachPrimitive_ + // Java References {{{ template struct CYJavaRef { @@ -117,6 +125,7 @@ struct CYJavaRef { return jni_; } + // XXX: this is only needed to support CYJavaEnv relying on C variadics _finline Value_ get() const { return value_; } @@ -126,6 +135,7 @@ struct CYJavaRef { return {jni_, static_cast(value_)}; } + // XXX: this should be tied into CYJavaFrame Value_ leak() { Value_ value(value_); value_ = NULL; @@ -142,9 +152,14 @@ struct CYJavaDelete : { } - ~CYJavaDelete() { + void clear() { if (this->value_ != NULL) (this->jni_->*Delete_)(this->value_); + this->value_ = NULL; + } + + ~CYJavaDelete() { + clear(); } }; @@ -199,15 +214,24 @@ struct CYJavaLocal : { } - CYJavaLocal(CYJavaLocal &&value) : - CYJavaLocal(value.jni_, value.value_) + template + CYJavaLocal(CYJavaRef &&other) : + CYJavaLocal(other.jni_, other.value_) { - value.value_ = NULL; + other.value_ = NULL; } - CYJavaLocal &operator =(CYJavaLocal &&other) { - std::swap(this->jni_, other.jni_); - std::swap(this->value_, other.value_); + CYJavaLocal(CYJavaLocal &&other) : + CYJavaLocal(static_cast &&>(other)) + { + } + + template + CYJavaLocal &operator =(CYJavaLocal &&other) { + this->clear(); + this->jni_ = other.jni_; + this->value_ = other.value_; + other.value_ = NULL; return *this; } }; @@ -292,6 +316,10 @@ struct CYJavaFrame { operator ()(NULL); } + operator JNIEnv *() const { + return jni_; + } + jobject operator ()(jobject object) { JNIEnv *jni(jni_); jni_ = NULL; @@ -375,7 +403,7 @@ CYJavaForEachPrimitive #define CYJavaEnv_(Code) \ template \ - auto Code(Args_ &&... args) const -> decltype(jni->Code(args...)) { \ + auto Code(Args_ &&... args) const -> decltype(jni->Code(cy::Forward(args)...)) { \ return _envcall(jni, Code(cy::Forward(args)...)); \ } @@ -395,6 +423,7 @@ CYJavaForEachPrimitive CYJavaEnv_(GetMethodID) CYJavaEnv_(GetStaticMethodID) CYJavaEnv_(IsSameObject) + CYJavaEnv_(RegisterNatives) #undef CYJavaEnv_ #define CYJavaEnv_(Code) \ @@ -605,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) { } @@ -855,7 +887,9 @@ CYJavaForEachPrimitive } } -static bool CYCastJavaArguments(const CYJavaEnv &jni, const CYJavaShorty &shorty, JSContextRef context, const JSValueRef arguments[], jvalue *array) { +static bool CYCastJavaArguments(const CYJavaFrame &frame, const CYJavaShorty &shorty, JSContextRef context, const JSValueRef arguments[], jvalue *array) { + CYJavaEnv jni(frame); + for (size_t index(0); index != shorty.size(); ++index) { JSValueRef argument(arguments[index]); JSType type(JSValueGetType(context, argument)); @@ -863,6 +897,7 @@ static bool CYCastJavaArguments(const CYJavaEnv &jni, const CYJavaShorty &shorty switch (CYJavaPrimitive primitive = shorty[index]) { case CYJavaPrimitiveObject: + // XXX: figure out a way to tie this in to the CYJavaFrame value.l = CYCastJavaObject(jni, context, argument).leak(); break; @@ -906,15 +941,16 @@ static bool CYCastJavaArguments(const CYJavaEnv &jni, const CYJavaShorty &shorty } static JSValueRef JavaMethod_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - CYJavaMethod *internal(reinterpret_cast(JSObjectGetPrivate(object))); + auto internal(CYJavaMethod::Get(context, object)); CYJavaObject *self(CYGetJavaObject(context, _this)); + _assert(self != NULL); CYJavaEnv jni(self->value_); CYJavaSignature bound(count); for (auto overload(internal->overload_.lower_bound(bound)), e(internal->overload_.upper_bound(bound)); overload != e; ++overload) { - CYJavaFrame(jni, count + 16); + CYJavaFrame frame(jni, count + 16); jvalue array[count]; - if (!CYCastJavaArguments(jni, overload->shorty_, context, arguments, array)) + if (!CYCastJavaArguments(frame, overload->shorty_, context, arguments, array)) continue; jvalue *values(array); switch (overload->primitive_) { @@ -936,15 +972,15 @@ 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(JSObjectGetPrivate(object))); + auto internal(CYJavaStaticMethod::Get(context, object)); CYJavaClass *table(CYGetJavaTable(context, _this)); CYJavaEnv jni(table->value_); CYJavaSignature bound(count); for (auto overload(internal->overload_.lower_bound(bound)), e(internal->overload_.upper_bound(bound)); overload != e; ++overload) { - CYJavaFrame(jni, count + 16); + CYJavaFrame frame(jni, count + 16); jvalue array[count]; - if (!CYCastJavaArguments(jni, overload->shorty_, context, arguments, array)) + if (!CYCastJavaArguments(frame, overload->shorty_, context, arguments, array)) continue; jvalue *values(array); switch (overload->primitive_) { @@ -966,23 +1002,21 @@ CYJavaForEachPrimitive } CYCatch(NULL) } static JSObjectRef JavaClass_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - CYJavaClass *table(reinterpret_cast(JSObjectGetPrivate(object))); + auto table(CYJavaClass::Get(context, object)); CYJavaEnv jni(table->value_); jclass _class(table->value_); if (table->interface_ && count == 1) { - JSObjectRef target(CYCastJSObject(context, arguments[0])); auto Cycript$(jni.FindClass("Cycript")); - auto Cycript$Make(jni.GetStaticMethodID(Cycript$, "proxy", "(Ljava/lang/Class;J)Ljava/lang/Object;")); - auto protect(new CYProtect(context, target)); - return CYCastJSObject(context, jni.CallObjectMethod(Cycript$, Cycript$Make, _class, reinterpret_cast(protect))); + auto Cycript$Make(jni.GetStaticMethodID(Cycript$, "proxy", "(Ljava/lang/Class;LCycript$Wrapper;)Ljava/lang/Object;")); + return CYCastJSObject(context, jni.CallObjectMethod(Cycript$, Cycript$Make, _class, CYCastJavaObject(jni, context, CYCastJSObject(context, arguments[0])).get())); } CYJavaSignature bound(count); for (auto overload(table->overload_.lower_bound(bound)), e(table->overload_.upper_bound(bound)); overload != e; ++overload) { - CYJavaFrame(jni, count + 16); + CYJavaFrame frame(jni, count + 16); jvalue array[count]; - if (!CYCastJavaArguments(jni, overload->shorty_, context, arguments, array)) + if (!CYCastJavaArguments(frame, overload->shorty_, context, arguments, array)) continue; jvalue *values(array); auto object(jni.NewObjectA(_class, overload->method_, values)); @@ -993,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(JSObjectGetPrivate(object))); + auto internal(CYJavaStaticInterior::Get(context, object)); CYJavaClass *table(internal->table_); CYPool pool; auto name(CYPoolUTF8String(pool, context, property)); @@ -1004,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(JSObjectGetPrivate(object))); + auto internal(CYJavaStaticInterior::Get(context, object)); CYJavaClass *table(internal->table_); CYJavaEnv jni(table->value_); CYPool pool; @@ -1026,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(JSObjectGetPrivate(object))); + auto internal(CYJavaStaticInterior::Get(context, object)); CYJavaClass *table(internal->table_); CYJavaEnv jni(table->value_); CYPool pool; @@ -1051,19 +1085,19 @@ CYJavaForEachPrimitive } CYCatch(false) } static void JavaStaticInterior_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { - CYJavaStaticInterior *internal(reinterpret_cast(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(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(JSObjectGetPrivate(object))); + auto internal(CYJavaInterior::Get(context, object)); CYJavaClass *table(internal->table_); CYPool pool; auto name(CYPoolUTF8String(pool, context, property)); @@ -1074,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(JSObjectGetPrivate(object))); + auto internal(CYJavaInterior::Get(context, object)); CYJavaEnv jni(internal->value_); CYJavaClass *table(internal->table_); CYPool pool; @@ -1096,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(JSObjectGetPrivate(object))); + auto internal(CYJavaInterior::Get(context, object)); CYJavaEnv jni(internal->value_); CYJavaClass *table(internal->table_); CYPool pool; @@ -1121,30 +1155,30 @@ CYJavaForEachPrimitive } CYCatch(false) } static void JavaInterior_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { - CYJavaInterior *internal(reinterpret_cast(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(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(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(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(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;")); @@ -1162,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(JSObjectGetPrivate(object))); + auto internal(CYJavaArray::Get(context, object)); CYJavaEnv jni(internal->value_); if (JSStringIsEqual(property, length_s)) return CYCastJSValue(context, jni.GetArrayLength(internal->value_)); @@ -1188,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(JSObjectGetPrivate(object))); + auto internal(CYJavaArray::Get(context, object)); CYJavaEnv jni(internal->value_); CYPool pool; @@ -1213,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(JSObjectGetPrivate(_this))); + auto internal(CYJavaPackage::Get(context, _this)); std::ostringstream name; for (auto &package : internal->package_) name << package << '.'; @@ -1227,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(JSObjectGetPrivate(object))); + auto internal(CYJavaPackage::Get(context, object)); CYJavaPackage::Path package(internal->package_); CYPool pool; @@ -1238,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 { @@ -1258,11 +1297,10 @@ static jobject Cycript_handle(JNIEnv *env, jclass api, jlong jprotect, jstring p size_t count(jarguments == NULL ? 0 : jni.GetArrayLength(jarguments)); JSValueRef arguments[count]; - for (size_t index(0); index != count; ++index) { + for (size_t index(0); index != count; ++index) arguments[index] = CYCastJSValue(context, jni.GetObjectArrayElement(jarguments, index)); - } - return CYCastJavaObject(jni, context, CYCallAsFunction(context, CYCastJSObject(context, function), object, count, arguments)); + return CYCastJavaObject(jni, context, CYCallAsFunction(context, CYCastJSObject(context, function), object, count, arguments)).leak(); } CYJavaCatch(NULL) } static JNINativeMethod Cycript_[] = { @@ -1270,47 +1308,188 @@ static JNINativeMethod Cycript_[] = { {(char *) "handle", (char *) "(JLjava/lang/String;[Ljava/lang/Object;)Ljava/lang/Object;", (void *) &Cycript_handle}, }; -JNIEnv *GetJNI(JSContextRef context) { - static JavaVM *jvm(NULL); - static JNIEnv *jni(NULL); +template +static _finline void dlset(Type_ &function, const char *name, void *handle) { + function = reinterpret_cast(dlsym(handle, name)); +} - if (jni != NULL) - return jni; - jint version(JNI_VERSION_1_4); +jint CYJavaVersion(JNI_VERSION_1_4); +static JavaVM *CYGetJavaVM(jint (*$JNI_GetCreatedJavaVMs)(JavaVM **, jsize, jsize *)) { jsize capacity(16); JavaVM *jvms[capacity]; jsize size; - _jnicall(JNI_GetCreatedJavaVMs(jvms, capacity, &size)); + _jnicall($JNI_GetCreatedJavaVMs(jvms, capacity, &size)); + if (size == 0) + return NULL; + return jvms[0]; +} + +static JavaVM *CYGetJavaVM(JSContextRef context) { + CYPool pool; + void *handle(RTLD_DEFAULT); + std::string library; - if (size != 0) { - jvm = jvms[0]; - _jnicall(jvm->GetEnv(reinterpret_cast(&jni), version)); + jint (*$JNI_GetCreatedJavaVMs)(JavaVM **jvms, jsize capacity, jsize *size); + dlset($JNI_GetCreatedJavaVMs, "JNI_GetCreatedJavaVMs", handle); + + if ($JNI_GetCreatedJavaVMs != NULL) { + if (JavaVM *jvm = CYGetJavaVM($JNI_GetCreatedJavaVMs)) + return jvm; } else { - CYPool pool; - std::vector options; - - { - std::ostringstream option; - option << "-Djava.class.path="; - option << CYPoolLibraryPath(pool) << "/libcycript.jar"; - if (const char *classpath = getenv("CLASSPATH")) - option << ':' << classpath; - options.push_back(JavaVMOption{pool.strdup(option.str().c_str()), NULL}); + std::vector guesses; + +#ifdef __ANDROID__ + char android[PROP_VALUE_MAX]; + if (__system_property_get("persist.sys.dalvik.vm.lib", android) != 0) + 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"); + + for (const char *guess : guesses) { + handle = dlopen(guess, RTLD_LAZY | RTLD_GLOBAL); + if (handle != NULL) { + library = guess; + break; + } } - JavaVMInitArgs args; - memset(&args, 0, sizeof(args)); - args.version = version; - args.nOptions = options.size(); - args.options = options.data(); - _jnicall(JNI_CreateJavaVM(&jvm, reinterpret_cast(&jni), &args)); + if (library.size() == 0) + return NULL; + + dlset($JNI_GetCreatedJavaVMs, "JNI_GetCreatedJavaVMs", handle); + if (JavaVM *jvm = CYGetJavaVM($JNI_GetCreatedJavaVMs)) + return jvm; } - auto Cycript$(CYJavaEnv(jni).FindClass("Cycript")); - _envcall(jni, RegisterNatives(Cycript$, Cycript_, sizeof(Cycript_) / sizeof(Cycript_[0]))); + std::vector options; + + { + std::ostringstream option; + option << "-Djava.class.path="; + option << CYPoolLibraryPath(pool) << "/libcycript.jar"; + if (const char *classpath = getenv("CLASSPATH")) + option << ':' << classpath; + options.push_back(JavaVMOption{pool.strdup(option.str().c_str()), NULL}); + } + + // To use libnativehelper to access JNI_GetCreatedJavaVMs, you need JniInvocation. + // ...but there can only be one JniInvocation, and assuradely the other VM has it. + // Essentially, this API makes no sense. We need it for AndroidRuntime, though :/. + + if (void *libnativehelper = dlopen("libnativehelper.so", RTLD_LAZY | RTLD_GLOBAL)) { + class JniInvocation$; + JniInvocation$ *(*JniInvocation$$init$)(JniInvocation$ *self)(NULL); + bool (*JniInvocation$Init)(JniInvocation$ *self, const char *library)(NULL); + JniInvocation$ *(*JniInvocation$finalize)(JniInvocation$ *self)(NULL); + + dlset(JniInvocation$$init$, "_ZN13JniInvocationC1Ev", libnativehelper); + dlset(JniInvocation$Init, "_ZN13JniInvocation4InitEPKc", libnativehelper); + dlset(JniInvocation$finalize, "_ZN13JniInvocationD1Ev", libnativehelper); + + 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(1, 1024)); + //_assert(JniInvocation$finalize != NULL); + //pool.atexit(reinterpret_cast(JniInvocation$finalize), invocation); + + auto invocation(static_cast(calloc(1, 1024))); + JniInvocation$$init$(invocation); + + _assert(JniInvocation$Init != NULL); + JniInvocation$Init(invocation, NULL); + + 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 **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); - return jni; + dlset(AndroidRuntime$$init$, "_ZN7android14AndroidRuntimeC1EPcj", libandroid_runtime); + dlset(AndroidRuntime$startVm, "_ZN7android14AndroidRuntime7startVmEPP7_JavaVMPP7_JNIEnv", libandroid_runtime); + dlset(AndroidRuntime$startReg, "_ZN7android14AndroidRuntime8startRegEP7_JNIEnv", libandroid_runtime); + dlset(AndroidRuntime$addOption, "_ZN7android14AndroidRuntime9addOptionEPKcPv", libandroid_runtime); + dlset(AndroidRuntime$addVmArguments, "_ZN7android14AndroidRuntime14addVmArgumentsEiPKPKc", libandroid_runtime); + dlset(AndroidRuntime$finalize, "_ZN7android14AndroidRuntimeD1Ev", libandroid_runtime); + + // XXX: it would also be interesting to attach this to a global pool + AndroidRuntime$ *runtime(pool.calloc(1, 1024)); + + _assert(AndroidRuntime$$init$ != NULL); + AndroidRuntime$$init$(runtime, NULL, 0); + + if (AndroidRuntime$addOption == NULL) { + _assert(AndroidRuntime$addVmArguments != NULL); + std::vector arguments; + for (const auto &option : options) + arguments.push_back(option.optionString); + AndroidRuntime$addVmArguments(runtime, arguments.size(), arguments.data()); + } else for (const auto &option : options) + AndroidRuntime$addOption(runtime, option.optionString, option.extraInfo); + + int failure; + + _assert(AndroidRuntime$startVm != NULL); + failure = AndroidRuntime$startVm(runtime, &jvm, &env); + _assert(failure == 0); + + _assert(AndroidRuntime$startReg != NULL); + failure = AndroidRuntime$startReg(env); + _assert(failure == 0); + + return jvm; + } + + jint (*$JNI_CreateJavaVM)(JavaVM **jvm, void **, void *); + dlset($JNI_CreateJavaVM, "JNI_CreateJavaVM", handle); + + JavaVMInitArgs args; + memset(&args, 0, sizeof(args)); + args.version = CYJavaVersion; + args.nOptions = options.size(); + args.options = options.data(); + _jnicall($JNI_CreateJavaVM(&jvm, reinterpret_cast(&env), &args)); + return jvm; +} + +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])); + + 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] = { @@ -1421,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); } }