X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/4e2cc9d31bca82d99377b34371535f2ec9ee5c33..17764b01280ac7cd2e14c82581fd8d185a437fef:/Java/Execute.cpp?ds=inline diff --git a/Java/Execute.cpp b/Java/Execute.cpp index 688de68..c7ecbb1 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_; } @@ -394,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)...)); \ } @@ -414,6 +423,7 @@ CYJavaForEachPrimitive CYJavaEnv_(GetMethodID) CYJavaEnv_(GetStaticMethodID) CYJavaEnv_(IsSameObject) + CYJavaEnv_(RegisterNatives) #undef CYJavaEnv_ #define CYJavaEnv_(Code) \ @@ -439,20 +449,6 @@ static CYJavaLocal CYCastJavaString(const CYJavaRef &value) { return jni.CallObjectMethod(value, Object$toString); } -template -struct CYJavaValue : - CYPrivate -{ - CYJavaGlobal value_; - - CYJavaValue(const CYJavaRef &value) : - value_(value) - { - } - - CYJavaValue(const CYJavaValue &) = delete; -}; - static JSValueRef CYCastJSValue(JSContextRef context, const CYJavaRef &value); template @@ -530,7 +526,7 @@ struct CYJavaSignature { typedef std::multiset CYJavaOverload; struct CYJavaMethod : - CYPrivate + CYRoot { CYJavaOverload overload_; @@ -541,7 +537,7 @@ struct CYJavaMethod : }; struct CYJavaStaticMethod : - CYPrivate + CYRoot { CYJavaOverload overload_; @@ -552,8 +548,9 @@ struct CYJavaStaticMethod : }; struct CYJavaClass : - CYJavaValue + CYRoot { + CYJavaGlobal value_; bool interface_; CYJavaFieldMap static_; @@ -561,7 +558,7 @@ struct CYJavaClass : CYJavaOverload overload_; CYJavaClass(const CYJavaRef &value, bool interface) : - CYJavaValue(value), + value_(value), interface_(interface) { } @@ -570,12 +567,13 @@ struct CYJavaClass : static JSObjectRef CYGetJavaClass(JSContextRef context, const CYJavaRef &_class); struct CYJavaObject : - CYJavaValue + CYRoot { + CYJavaGlobal value_; CYJavaClass *table_; CYJavaObject(const CYJavaRef &value, CYJavaClass *table) : - CYJavaValue(value), + value_(value), table_(table) { } @@ -584,36 +582,39 @@ struct CYJavaObject : }; struct CYJavaInterior : - CYJavaValue + CYRoot { + CYJavaGlobal value_; CYJavaClass *table_; CYJavaInterior(const CYJavaRef &value, CYJavaClass *table) : - CYJavaValue(value), + value_(value), table_(table) { } }; struct CYJavaStaticInterior : - CYJavaValue + CYRoot { + CYJavaGlobal value_; CYJavaClass *table_; CYJavaStaticInterior(const CYJavaRef &value, CYJavaClass *table) : - CYJavaValue(value), + value_(value), table_(table) { } }; struct CYJavaArray : - CYJavaValue + CYRoot { + CYJavaGlobal value_; CYJavaPrimitive primitive_; CYJavaArray(const CYJavaRef &value, CYJavaPrimitive primitive) : - CYJavaValue(value), + value_(value), primitive_(primitive) { } @@ -622,12 +623,15 @@ struct CYJavaArray : }; struct CYJavaPackage : - CYPrivate + CYRoot { + JNIEnv *jni_; + typedef std::vector Path; Path package_; - _finline CYJavaPackage(const Path &package) : + _finline CYJavaPackage(JNIEnv *jni, const Path &package) : + jni_(jni), package_(package) { } @@ -657,7 +661,7 @@ static JSValueRef CYCastJSValue(JSContextRef context, const CYJavaRef & auto Class$getComponentType(jni.GetMethodID(Class$, "getComponentType", "()Ljava/lang/Class;")); auto component(jni.CallObjectMethod(_class, Class$getComponentType)); auto Class$getName(jni.GetMethodID(Class$, "getName", "()Ljava/lang/String;")); - return CYJavaArray::Make(context, value.cast(), CYJavaGetPrimitive(context, component, Class$getName)); + return CYPrivate::Make(context, value.cast(), CYJavaGetPrimitive(context, component, Class$getName)); } auto Wrapper$(jni.FindClass("Cycript$Wrapper")); @@ -668,7 +672,7 @@ static JSValueRef CYCastJSValue(JSContextRef context, const CYJavaRef & } CYJavaClass *table(reinterpret_cast(JSObjectGetPrivate(CYGetJavaClass(context, _class)))); - return CYJavaObject::Make(context, value, table); + return CYPrivate::Make(context, value, table); } static _finline JSObjectRef CYCastJSObject(JSContextRef context, const CYJavaRef &value) { @@ -700,13 +704,13 @@ CYCastJava$(F, Float, jfloat, CYCastDouble) CYCastJava$(D, Double, jdouble, CYCastDouble) static CYJavaClass *CYGetJavaTable(JSContextRef context, JSObjectRef object) { - if (!JSValueIsObjectOfClass(context, object, CYJavaClass::Class_)) + if (!JSValueIsObjectOfClass(context, object, CYPrivate::Class_)) return NULL; return reinterpret_cast(JSObjectGetPrivate(object)); } static CYJavaObject *CYGetJavaObject(JSContextRef context, JSObjectRef object) { - if (!JSValueIsObjectOfClass(context, object, CYJavaObject::Class_)) + if (!JSValueIsObjectOfClass(context, object, CYPrivate::Class_)) return NULL; return reinterpret_cast(JSObjectGetPrivate(object)); } @@ -804,7 +808,7 @@ static JSObjectRef CYGetJavaClass(JSContextRef context, const CYJavaRef } } - constructor = JSObjectMake(context, CYJavaClass::Class_, table); + constructor = JSObjectMake(context, CYPrivate::Class_, table); prototype = JSObjectMake(context, NULL, NULL); CYSetProperty(context, constructor, prototype_s, prototype, kJSPropertyAttributeDontEnum); @@ -841,9 +845,9 @@ static JSObjectRef CYGetJavaClass(JSContextRef context, const CYJavaRef CYJSString name(entry.first.second); auto &overload(entry.second); if (instance) - CYSetProperty(context, prototype, name, CYJavaMethod::Make(context, overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete); + CYSetProperty(context, prototype, name, CYPrivate::Make(context, overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete); else - CYSetProperty(context, constructor, name, CYJavaStaticMethod::Make(context, overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete); + CYSetProperty(context, constructor, name, CYPrivate::Make(context, overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete); } } @@ -928,8 +932,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(JSObjectGetPrivate(object))); + auto internal(CYPrivate::Get(context, object)); CYJavaObject *self(CYGetJavaObject(context, _this)); + _assert(self != NULL); CYJavaEnv jni(self->value_); CYJavaSignature bound(count); @@ -958,7 +963,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(JSObjectGetPrivate(object))); + auto internal(CYPrivate::Get(context, object)); CYJavaClass *table(CYGetJavaTable(context, _this)); CYJavaEnv jni(table->value_); @@ -988,16 +993,14 @@ 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(CYPrivate::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); @@ -1015,7 +1018,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(CYPrivate::Get(context, object)); CYJavaClass *table(internal->table_); CYPool pool; auto name(CYPoolUTF8String(pool, context, property)); @@ -1026,7 +1029,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(CYPrivate::Get(context, object)); CYJavaClass *table(internal->table_); CYJavaEnv jni(table->value_); CYPool pool; @@ -1048,7 +1051,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(CYPrivate::Get(context, object)); CYJavaClass *table(internal->table_); CYJavaEnv jni(table->value_); CYPool pool; @@ -1073,19 +1076,19 @@ CYJavaForEachPrimitive } CYCatch(false) } static void JavaStaticInterior_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { - CYJavaStaticInterior *internal(reinterpret_cast(JSObjectGetPrivate(object))); + auto internal(CYPrivate::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(CYPrivate::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(CYPrivate::Get(context, object)); CYJavaClass *table(internal->table_); CYPool pool; auto name(CYPoolUTF8String(pool, context, property)); @@ -1096,7 +1099,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(CYPrivate::Get(context, object)); CYJavaEnv jni(internal->value_); CYJavaClass *table(internal->table_); CYPool pool; @@ -1118,7 +1121,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(CYPrivate::Get(context, object)); CYJavaEnv jni(internal->value_); CYJavaClass *table(internal->table_); CYPool pool; @@ -1143,30 +1146,30 @@ CYJavaForEachPrimitive } CYCatch(false) } static void JavaInterior_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { - CYJavaInterior *internal(reinterpret_cast(JSObjectGetPrivate(object))); + auto internal(CYPrivate::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(CYPrivate::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))); - return CYJavaStaticInterior::Make(context, internal->value_, internal); + auto internal(CYPrivate::Get(context, object)); + return CYPrivate::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))); - return CYJavaInterior::Make(context, internal->value_, internal->table_); + auto internal(CYPrivate::Get(context, object)); + return CYPrivate::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(CYPrivate::Get(context, _this)); CYJavaEnv jni(internal->value_); auto Class$(jni.FindClass("java/lang/Class")); auto Class$getCanonicalName(jni.GetMethodID(Class$, "getCanonicalName", "()Ljava/lang/String;")); @@ -1184,7 +1187,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(CYPrivate::Get(context, object)); CYJavaEnv jni(internal->value_); if (JSStringIsEqual(property, length_s)) return CYCastJSValue(context, jni.GetArrayLength(internal->value_)); @@ -1210,7 +1213,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(CYPrivate::Get(context, object)); CYJavaEnv jni(internal->value_); CYPool pool; @@ -1235,8 +1238,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(CYPrivate::Get(context, _this)); std::ostringstream name; for (auto &package : internal->package_) name << package << '.'; @@ -1249,7 +1254,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(CYPrivate::Get(context, object)); CYJavaPackage::Path package(internal->package_); CYPool pool; @@ -1260,13 +1265,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 CYPrivate::Make(context, jni, package); } CYCatch(NULL) } static void Cycript_delete(JNIEnv *env, jclass api, jlong jprotect) { CYJavaTry { @@ -1291,47 +1299,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; + + jint (*$JNI_GetCreatedJavaVMs)(JavaVM **jvms, jsize capacity, jsize *size); + dlset($JNI_GetCreatedJavaVMs, "JNI_GetCreatedJavaVMs", handle); - if (size != 0) { - jvm = jvms[0]; - _jnicall(jvm->GetEnv(reinterpret_cast(&jni), version)); + 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); + + 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)); - return jni; + _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] = { @@ -1381,7 +1530,7 @@ CYJavaForEachPrimitive definition.staticFunctions = JavaClass_staticFunctions; definition.callAsConstructor = &JavaClass_callAsConstructor; definition.finalize = &CYFinalize; - CYJavaClass::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.attributes = kJSClassAttributeNoAutomaticPrototype; @@ -1391,35 +1540,35 @@ CYJavaForEachPrimitive definition.setProperty = &JavaInterior_setProperty; definition.getPropertyNames = &JavaInterior_getPropertyNames; definition.finalize = &CYFinalize; - CYJavaInterior::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "JavaMethod"; definition.staticFunctions = JavaMethod_staticFunctions; definition.callAsFunction = &JavaMethod_callAsFunction; definition.finalize = &CYFinalize; - CYJavaMethod::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "JavaStaticMethod"; definition.staticFunctions = JavaStaticMethod_staticFunctions; definition.callAsFunction = &JavaStaticMethod_callAsFunction; definition.finalize = &CYFinalize; - CYJavaStaticMethod::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.attributes = kJSClassAttributeNoAutomaticPrototype; definition.className = "JavaObject"; definition.staticValues = JavaObject_staticValues; definition.finalize = &CYFinalize; - CYJavaObject::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "JavaArray"; definition.getProperty = &JavaArray_getProperty; definition.setProperty = &JavaArray_setProperty; definition.finalize = &CYFinalize; - CYJavaArray::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "JavaPackage"; @@ -1427,7 +1576,7 @@ CYJavaForEachPrimitive definition.hasProperty = &CYJavaPackage_hasProperty; definition.getProperty = &CYJavaPackage_getProperty; definition.finalize = &CYFinalize; - CYJavaPackage::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.attributes = kJSClassAttributeNoAutomaticPrototype; @@ -1437,25 +1586,26 @@ CYJavaForEachPrimitive definition.setProperty = &JavaStaticInterior_setProperty; definition.getPropertyNames = &JavaStaticInterior_getPropertyNames; definition.finalize = &CYFinalize; - CYJavaStaticInterior::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); } 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(CYPrivate::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, CYPrivate::Make(context, nullptr, CYJavaPackage::Path(1, name)), kJSPropertyAttributeDontEnum); } }