X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/95be164556de14834c2040ac7bea1632b63e5764..97bec96b43b66ab78af95d2b6c6c24f0d0a8006a:/Java/Execute.cpp

diff --git a/Java/Execute.cpp b/Java/Execute.cpp
index f450a5d..618be7c 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) \
@@ -192,6 +190,13 @@ struct CYJavaGlobal :
     {
         value.value_ = NULL;
     }
+
+    template <typename Other_>
+    CYJavaGlobal &operator =(const CYJavaRef<Other_> &other) {
+        this->~CYJavaGlobal();
+        new (this) CYJavaGlobal(other);
+        return *this;
+    }
 };
 
 template <typename Value_>
@@ -245,11 +250,11 @@ class CYJavaUTF8String :
     public CYUTF8String
 {
   private:
-    const CYJavaRef<jstring> *value_;
+    const CYJavaRef<jstring> &value_;
 
   public:
     CYJavaUTF8String(const CYJavaRef<jstring> &value) :
-        value_(&value)
+        value_(value)
     {
         _assert(value);
         JNIEnv *jni(value.jni());
@@ -257,29 +262,18 @@ class CYJavaUTF8String :
         data = jni->GetStringUTFChars(value, NULL);
     }
 
-    CYJavaUTF8String(const CYJavaRef<jobject> &value) :
-        CYJavaUTF8String(CYCastJavaString(value))
-    {
-    }
+    CYJavaUTF8String(CYJavaRef<jstring> &&) = delete;
 
     ~CYJavaUTF8String() {
-        if (value_ != NULL) {
-            JNIEnv *jni(value_->jni());
-            jni->ReleaseStringUTFChars(*value_, data);
-        }
+        JNIEnv *jni(value_.jni());
+        jni->ReleaseStringUTFChars(value_, data);
     }
 
     CYJavaUTF8String(const CYJavaUTF8String &) = delete;
-
-    CYJavaUTF8String(CYJavaUTF8String &&rhs) :
-        value_(rhs.value_)
-    {
-        rhs.value_ = NULL;
-    }
 };
 
 CYJavaUTF8String CYCastUTF8String(const CYJavaRef<jstring> &value) {
-    return CYJavaUTF8String(value);
+    return {value};
 }
 
 JSStringRef CYCopyJSString(const CYJavaRef<jstring> &value) {
@@ -298,7 +292,8 @@ struct CYJavaError :
     }
 
     virtual const char *PoolCString(CYPool &pool) const {
-        return CYPoolCString(pool, CYJavaUTF8String(value_.cast<jobject>()));
+        auto string(CYCastJavaString(value_.cast<jobject>()));
+        return CYPoolCString(pool, CYJavaUTF8String(string));
     }
 
     virtual JSValueRef CastJSValue(JSContextRef context, const char *name) const;
@@ -357,6 +352,12 @@ struct CYJavaEnv {
         return {jni, _envcall(jni, FindClass(name))};
     }
 
+    CYJavaLocal<jclass> FindClass$(const char *name) const {
+        jclass value(jni->FindClass(name));
+        jni->ExceptionClear();
+        return {jni, value};
+    }
+
     CYJavaLocal<jclass> GetObjectClass(jobject object) const {
         return {jni, _envcall(jni, GetObjectClass(object))};
     }
@@ -377,6 +378,10 @@ struct CYJavaEnv {
         return {jni, _envcall(jni, NewObjectA(_class, method, args))};
     }
 
+    CYJavaLocal<jobjectArray> NewObjectArray(jsize length, jclass _class, jobject initial) const {
+        return {jni, _envcall(jni, NewObjectArray(length, _class, initial))};
+    }
+
     CYJavaLocal<jstring> NewString(const jchar *data, jsize size) const {
         return {jni, _envcall(jni, NewString(data, size))};
     }
@@ -451,19 +456,23 @@ static CYJavaLocal<jstring> CYCastJavaString(const CYJavaRef<jobject> &value) {
     return jni.CallObjectMethod<jstring>(value, Object$toString);
 }
 
-template <typename Internal_, typename Value_>
-struct CYJavaValue :
-    CYPrivate<Internal_>
-{
-    CYJavaGlobal<Value_> value_;
+static CYJavaLocal<jstring> CYCastJavaString(const CYJavaEnv &jni, CYUTF16String value) {
+    return jni.NewString(value.data, value.size);
+}
 
-    CYJavaValue(const CYJavaRef<Value_> &value) :
-        value_(value)
-    {
-    }
+static CYJavaLocal<jstring> CYCastJavaString(const CYJavaEnv &jni, CYUTF8String value) {
+    // XXX: if there are no nulls then you can do this faster
+    CYPool pool;
+    return CYCastJavaString(jni, CYPoolUTF16String(pool, value));
+}
 
-    CYJavaValue(const CYJavaValue &) = delete;
-};
+static CYJavaLocal<jstring> CYCastJavaString(const CYJavaEnv &jni, const char *value) {
+    return CYCastJavaString(jni, CYUTF8String(value));
+}
+
+static CYJavaLocal<jstring> CYCastJavaString(const CYJavaEnv &jni, JSContextRef context, JSStringRef value) {
+    return CYCastJavaString(jni, CYCastUTF16String(value));
+}
 
 static JSValueRef CYCastJSValue(JSContextRef context, const CYJavaRef<jobject> &value);
 
@@ -485,6 +494,57 @@ JSValueRef CYJavaError::CastJSValue(JSContextRef context, const char *name) cons
     return CYCastJSValue(context, value_);
 }
 
+struct CYJava :
+    CYRoot
+{
+    CYJavaGlobal<jobject> loader_;
+    jmethodID ClassLoader$loadClass;
+
+    CYJava() {
+    }
+
+    bool Setup(JNIEnv *env) {
+        if (loader_)
+            return false;
+
+        CYJavaEnv jni(env);
+        CYPool pool;
+
+        auto ClassLoader$(jni.FindClass("java/lang/ClassLoader"));
+        ClassLoader$loadClass = jni.GetMethodID(ClassLoader$, "loadClass", "(Ljava/lang/String;)Ljava/lang/Class;");
+
+        auto ClassLoader$getSystemClassLoader(jni.GetStaticMethodID(ClassLoader$, "getSystemClassLoader", "()Ljava/lang/ClassLoader;"));
+        auto parent(jni.CallStaticObjectMethod<jobject>(ClassLoader$, ClassLoader$getSystemClassLoader));
+
+        auto path(CYCastJavaString(jni, pool.strcat("file://", CYPoolLibraryPath(pool), "/libcycript.jar", NULL)));
+
+        auto PathClassLoader$(jni.FindClass$("dalvik/system/PathClassLoader"));
+        if (PathClassLoader$) {
+            auto PathClassLoader$$init$(jni.GetMethodID(PathClassLoader$, "<init>", "(Ljava/lang/String;Ljava/lang/ClassLoader;)V"));
+            loader_ = jni.NewObject(PathClassLoader$, PathClassLoader$$init$, path.get(), parent.get());
+        } else {
+            auto URL$(jni.FindClass("java/net/URL"));
+            auto URL$$init$(jni.GetMethodID(URL$, "<init>", "(Ljava/lang/String;)V"));
+
+            auto URLClassLoader$(jni.FindClass("java/net/URLClassLoader"));
+            auto URLClassLoader$$init$(jni.GetMethodID(URLClassLoader$, "<init>", "([Ljava/net/URL;Ljava/lang/ClassLoader;)V"));
+
+            auto url(jni.NewObject(URL$, URL$$init$, path.get()));
+            auto urls(jni.NewObjectArray(1, URL$, url));
+            // XXX: .cast().get() <- this is required :/
+            loader_ = jni.NewObject(URLClassLoader$, URLClassLoader$$init$, urls.cast<jobject>().get(), parent.get());
+        }
+
+        return true;
+    }
+
+    CYJavaLocal<jclass> LoadClass(const char *name) {
+        _assert(loader_);
+        CYJavaEnv jni(loader_);
+        return jni.CallObjectMethod<jclass>(loader_, ClassLoader$loadClass, CYCastJavaString(jni, name).get());
+    }
+};
+
 static std::map<std::string, CYJavaPrimitive> Primitives_;
 
 static CYJavaPrimitive CYJavaGetPrimitive(JSContextRef context, const CYJavaRef<jclass> &type, jmethodID Class$get$$Name) {
@@ -529,51 +589,54 @@ struct CYJavaSignature {
     {
     }
 
-    CYJavaSignature(unsigned count) :
-        shorty_(count)
-    {
-    }
-
+    // XXX: the shorty doesn't store enough information
     bool operator <(const CYJavaSignature &rhs) const {
-        return shorty_.size() < rhs.shorty_.size();
+        return shorty_ < rhs.shorty_;
     }
 };
 
-typedef std::multiset<CYJavaSignature> CYJavaOverload;
+typedef std::set<CYJavaSignature> CYJavaOverload;
+typedef std::map<unsigned, CYJavaOverload> CYJavaOverloads;
 
 struct CYJavaMethod :
-    CYPrivate<CYJavaMethod>
+    CYRoot
 {
-    CYJavaOverload overload_;
-
-    CYJavaMethod(const CYJavaOverload &overload) :
-        overload_(overload)
+    CYUTF8String type_;
+    CYUTF8String name_;
+    CYJavaOverloads overloads_;
+
+    CYJavaMethod(CYUTF8String type, CYUTF8String name, const CYJavaOverloads &overloads) :
+        type_(CYPoolUTF8String(*pool_, type)),
+        name_(CYPoolUTF8String(*pool_, name)),
+        overloads_(overloads)
     {
     }
 };
 
-struct CYJavaStaticMethod :
-    CYPrivate<CYJavaStaticMethod>
+struct CYJavaInstanceMethod :
+    CYJavaMethod
 {
-    CYJavaOverload overload_;
+    using CYJavaMethod::CYJavaMethod;
+};
 
-    CYJavaStaticMethod(const CYJavaOverload &overload) :
-        overload_(overload)
-    {
-    }
+struct CYJavaStaticMethod :
+    CYJavaMethod
+{
+    using CYJavaMethod::CYJavaMethod;
 };
 
 struct CYJavaClass :
-    CYJavaValue<CYJavaClass, jclass>
+    CYRoot
 {
+    CYJavaGlobal<jclass> value_;
     bool interface_;
 
     CYJavaFieldMap static_;
     CYJavaFieldMap instance_;
-    CYJavaOverload overload_;
+    CYJavaOverloads overloads_;
 
     CYJavaClass(const CYJavaRef<jclass> &value, bool interface) :
-        CYJavaValue(value),
+        value_(value),
         interface_(interface)
     {
     }
@@ -582,12 +645,13 @@ struct CYJavaClass :
 static JSObjectRef CYGetJavaClass(JSContextRef context, const CYJavaRef<jclass> &_class);
 
 struct CYJavaObject :
-    CYJavaValue<CYJavaObject, jobject>
+    CYRoot
 {
+    CYJavaGlobal<jobject> value_;
     CYJavaClass *table_;
 
     CYJavaObject(const CYJavaRef<jobject> &value, CYJavaClass *table) :
-        CYJavaValue(value),
+        value_(value),
         table_(table)
     {
     }
@@ -596,36 +660,39 @@ struct CYJavaObject :
 };
 
 struct CYJavaInterior :
-    CYJavaValue<CYJavaInterior, jobject>
+    CYRoot
 {
+    CYJavaGlobal<jobject> value_;
     CYJavaClass *table_;
 
     CYJavaInterior(const CYJavaRef<jobject> &value, CYJavaClass *table) :
-        CYJavaValue(value),
+        value_(value),
         table_(table)
     {
     }
 };
 
 struct CYJavaStaticInterior :
-    CYJavaValue<CYJavaStaticInterior, jclass>
+    CYRoot
 {
+    CYJavaGlobal<jclass> value_;
     CYJavaClass *table_;
 
     CYJavaStaticInterior(const CYJavaRef<jclass> &value, CYJavaClass *table) :
-        CYJavaValue(value),
+        value_(value),
         table_(table)
     {
     }
 };
 
 struct CYJavaArray :
-    CYJavaValue<CYJavaArray, jarray>
+    CYRoot
 {
+    CYJavaGlobal<jarray> value_;
     CYJavaPrimitive primitive_;
 
     CYJavaArray(const CYJavaRef<jarray> &value, CYJavaPrimitive primitive) :
-        CYJavaValue(value),
+        value_(value),
         primitive_(primitive)
     {
     }
@@ -634,12 +701,15 @@ struct CYJavaArray :
 };
 
 struct CYJavaPackage :
-    CYPrivate<CYJavaPackage>
+    CYRoot
 {
+    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)
     {
     }
@@ -669,10 +739,12 @@ static JSValueRef CYCastJSValue(JSContextRef context, const CYJavaRef<jobject> &
         auto Class$getComponentType(jni.GetMethodID(Class$, "getComponentType", "()Ljava/lang/Class;"));
         auto component(jni.CallObjectMethod<jclass>(_class, Class$getComponentType));
         auto Class$getName(jni.GetMethodID(Class$, "getName", "()Ljava/lang/String;"));
-        return CYJavaArray::Make(context, value.cast<jarray>(), CYJavaGetPrimitive(context, component, Class$getName));
+        return CYPrivate<CYJavaArray>::Make(context, value.cast<jarray>(), CYJavaGetPrimitive(context, component, Class$getName));
     }
 
-    auto Wrapper$(jni.FindClass("Cycript$Wrapper"));
+    auto java(reinterpret_cast<CYJava *>(JSObjectGetPrivate(CYGetCachedObject(context, CYJSString("Java")))));
+    auto Wrapper$(java->LoadClass("Cycript$Wrapper"));
+
     if (jni.IsSameObject(_class, Wrapper$)) {
         auto Wrapper$getProtect(jni.GetMethodID(Wrapper$, "getProtect", "()J"));
         auto &protect(*reinterpret_cast<CYProtect *>(jni.CallLongMethod(value, Wrapper$getProtect)));
@@ -680,21 +752,13 @@ static JSValueRef CYCastJSValue(JSContextRef context, const CYJavaRef<jobject> &
     }
 
     CYJavaClass *table(reinterpret_cast<CYJavaClass *>(JSObjectGetPrivate(CYGetJavaClass(context, _class))));
-    return CYJavaObject::Make(context, value, table);
+    return CYPrivate<CYJavaObject>::Make(context, value, table);
 }
 
 static _finline JSObjectRef CYCastJSObject(JSContextRef context, const CYJavaRef<jobject> &value) {
     return CYCastJSObject(context, CYCastJSValue(context, value));
 }
 
-static CYJavaLocal<jstring> CYCastJavaString(const CYJavaEnv &jni, JSContextRef context, CYUTF16String value) {
-    return jni.NewString(value.data, value.size);
-}
-
-static CYJavaLocal<jstring> CYCastJavaString(const CYJavaEnv &jni, JSContextRef context, JSStringRef value) {
-    return CYCastJavaString(jni, context, CYCastUTF16String(value));
-}
-
 #define CYCastJava$(T, Type, jtype, Cast) \
 _disused static CYJavaLocal<jobject> CYCastJava ## Type(const CYJavaEnv &jni, JSContextRef context, JSValueRef value) { \
     auto Type$(jni.FindClass("java/lang/" #Type)); \
@@ -712,13 +776,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<CYJavaClass>::Class_))
         return NULL;
     return reinterpret_cast<CYJavaClass *>(JSObjectGetPrivate(object));
 }
 
 static CYJavaObject *CYGetJavaObject(JSContextRef context, JSObjectRef object) {
-    if (!JSValueIsObjectOfClass(context, object, CYJavaObject::Class_))
+    if (!JSValueIsObjectOfClass(context, object, CYPrivate<CYJavaObject>::Class_))
         return NULL;
     return reinterpret_cast<CYJavaObject *>(JSObjectGetPrivate(object));
 }
@@ -727,7 +791,9 @@ static CYJavaLocal<jobject> CYCastJavaObject(const CYJavaEnv &jni, JSContextRef
     if (CYJavaObject *internal = CYGetJavaObject(context, value))
         return internal->value_;
 
-    auto Wrapper$(jni.FindClass("Cycript$Wrapper"));
+    auto java(reinterpret_cast<CYJava *>(JSObjectGetPrivate(CYGetCachedObject(context, CYJSString("Java")))));
+    auto Wrapper$(java->LoadClass("Cycript$Wrapper"));
+
     auto Wrapper$$init$(jni.GetMethodID(Wrapper$, "<init>", "(J)V"));
     CYProtect *protect(new CYProtect(context, value));
     return jni.NewObject(Wrapper$, Wrapper$$init$, reinterpret_cast<jlong>(protect));
@@ -764,7 +830,10 @@ static JSObjectRef CYGetJavaClass(JSContextRef context, const CYJavaRef<jclass>
     auto Class$(jni.FindClass("java/lang/Class"));
     auto Class$getName(jni.GetMethodID(Class$, "getName", "()Ljava/lang/String;"));
 
-    CYJSString name(jni.CallObjectMethod<jstring>(value, Class$getName));
+    auto string(jni.CallObjectMethod<jstring>(value, Class$getName));
+    CYJavaUTF8String utf8(string);
+    CYJSString name(utf8);
+
     JSValueRef cached(CYGetProperty(context, cy, name));
     if (!JSValueIsUndefined(context, cached))
         return CYCastJSObject(context, cached);
@@ -809,14 +878,15 @@ static JSObjectRef CYGetJavaClass(JSContextRef context, const CYJavaRef<jclass>
             auto modifiers(jni.CallIntMethod(field, Field$getModifiers));
             auto instance(!jni.CallStaticBooleanMethod(Modifier$, Modifier$isStatic, modifiers));
             auto &map(instance ? table->instance_ : table->static_);
-            CYJavaUTF8String name(jni.CallObjectMethod<jstring>(field, Field$getName));
+            auto string(jni.CallObjectMethod<jstring>(field, Field$getName));
+            CYJavaUTF8String name(string);
             auto id(jni.FromReflectedField(field));
             auto type(jni.CallObjectMethod<jclass>(field, Field$getType));
             map.insert(std::make_pair(std::string(name), CYJavaField{id, CYJavaGetPrimitive(context, type, Class$getName)}));
         }
     }
 
-    constructor = JSObjectMake(context, CYJavaClass::Class_, table);
+    constructor = JSObjectMake(context, CYPrivate<CYJavaClass>::Class_, table);
 
     prototype = JSObjectMake(context, NULL, NULL);
     CYSetProperty(context, constructor, prototype_s, prototype, kJSPropertyAttributeDontEnum);
@@ -828,34 +898,52 @@ static JSObjectRef CYGetJavaClass(JSContextRef context, const CYJavaRef<jclass>
         auto parameters(jni.CallObjectMethod<jobjectArray>(constructor, Constructor$getParameterTypes));
         CYJavaShorty shorty(CYJavaGetShorty(context, parameters, Class$getName));
         auto id(jni.FromReflectedMethod(constructor));
-        table->overload_.insert(CYJavaSignature(constructor, id, CYJavaPrimitiveObject, shorty));
+        table->overloads_[shorty.size()].insert(CYJavaSignature(constructor, id, CYJavaPrimitiveObject, shorty));
     }
 
-    auto methods(jni.CallObjectMethod<jobjectArray>(value, Class$getDeclaredMethods));
+    std::map<std::pair<bool, std::string>, CYJavaOverloads> entries;
 
-    std::map<std::pair<bool, std::string>, CYJavaOverload> entries;
+    bool base(false);
+    for (CYJavaLocal<jclass> prototype(value); prototype; prototype = jni.GetSuperclass(prototype)) {
+        auto methods(jni.CallObjectMethod<jobjectArray>(prototype, Class$getDeclaredMethods));
 
-    for (jsize i(0), e(jni.GetArrayLength(methods)); i != e; ++i) {
-        auto method(jni.GetObjectArrayElement<jobject>(methods, i));
-        auto modifiers(jni.CallIntMethod(method, Method$getModifiers));
-        auto instance(!jni.CallStaticBooleanMethod(Modifier$, Modifier$isStatic, modifiers));
-        CYJavaUTF8String name(jni.CallObjectMethod<jstring>(method, Method$getName));
-        auto parameters(jni.CallObjectMethod<jobjectArray>(method, Method$getParameterTypes));
-        CYJavaShorty shorty(CYJavaGetShorty(context, parameters, Class$getName));
-        auto type(jni.CallObjectMethod<jclass>(method, Method$getReturnType));
-        auto primitive(CYJavaGetPrimitive(context, type, Class$getName));
-        auto id(jni.FromReflectedMethod(method));
-        entries[std::make_pair(instance, std::string(name))].insert(CYJavaSignature(method, id, primitive, shorty));
+        for (jsize i(0), e(jni.GetArrayLength(methods)); i != e; ++i) {
+            auto method(jni.GetObjectArrayElement<jobject>(methods, i));
+            auto modifiers(jni.CallIntMethod(method, Method$getModifiers));
+            auto instance(!jni.CallStaticBooleanMethod(Modifier$, Modifier$isStatic, modifiers));
+            auto string(jni.CallObjectMethod<jstring>(method, Method$getName));
+            CYJavaUTF8String name(string);
+
+            auto parameters(jni.CallObjectMethod<jobjectArray>(method, Method$getParameterTypes));
+            CYJavaShorty shorty(CYJavaGetShorty(context, parameters, Class$getName));
+
+            CYJavaOverload *overload;
+            if (!base)
+                overload = &entries[std::make_pair(instance, std::string(name))][shorty.size()];
+            else {
+                auto entry(entries.find(std::make_pair(instance, std::string(name))));
+                if (entry == entries.end())
+                    continue;
+                overload = &entry->second[shorty.size()];
+            }
+
+            auto type(jni.CallObjectMethod<jclass>(method, Method$getReturnType));
+            auto primitive(CYJavaGetPrimitive(context, type, Class$getName));
+            auto id(jni.FromReflectedMethod(method));
+            overload->insert(CYJavaSignature(method, id, primitive, shorty));
+        }
+
+        base = true;
     }
 
     for (const auto &entry : entries) {
         bool instance(entry.first.first);
-        CYJSString name(entry.first.second);
+        CYJSString method(entry.first.second);
         auto &overload(entry.second);
         if (instance)
-            CYSetProperty(context, prototype, name, CYJavaMethod::Make(context, overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete);
+            CYSetProperty(context, prototype, method, CYPrivate<CYJavaInstanceMethod>::Make(context, utf8, entry.first.second.c_str(), overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete);
         else
-            CYSetProperty(context, constructor, name, CYJavaStaticMethod::Make(context, overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete);
+            CYSetProperty(context, constructor, method, CYPrivate<CYJavaStaticMethod>::Make(context, utf8, entry.first.second.c_str(), overload), kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete);
     }
 
     }
@@ -939,27 +1027,29 @@ static bool CYCastJavaArguments(const CYJavaFrame &frame, const CYJavaShorty &sh
     return true;
 }
 
-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)));
+static JSValueRef JavaInstanceMethod_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    auto internal(CYPrivate<CYJavaInstanceMethod>::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) {
+    auto overload(internal->overloads_.find(count));
+    if (overload != internal->overloads_.end())
+    for (auto signature(overload->second.begin()); signature != overload->second.end(); ++signature) {
         CYJavaFrame frame(jni, count + 16);
         jvalue array[count];
-        if (!CYCastJavaArguments(frame, overload->shorty_, context, arguments, array))
+        if (!CYCastJavaArguments(frame, signature->shorty_, context, arguments, array))
             continue;
         jvalue *values(array);
-        switch (overload->primitive_) {
+        switch (signature->primitive_) {
             case CYJavaPrimitiveObject:
-                return CYCastJSValue(context, jni.CallObjectMethodA<jobject>(self->value_, overload->method_, values));
+                return CYCastJSValue(context, jni.CallObjectMethodA<jobject>(self->value_, signature->method_, values));
             case CYJavaPrimitiveVoid:
-                jni.CallVoidMethodA(self->value_, overload->method_, values);
+                jni.CallVoidMethodA(self->value_, signature->method_, values);
                 return CYJSUndefined(context);
 #define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \
             case CYJavaPrimitive ## Type: \
-                return CYJavaCastJSValue(context, jni.Call ## Typ ## MethodA(self->value_, overload->method_, values));
+                return CYJavaCastJSValue(context, jni.Call ## Typ ## MethodA(self->value_, signature->method_, values));
 CYJavaForEachPrimitive
 #undef CYJavaForEachPrimitive_
             default: _assert(false);
@@ -970,26 +1060,27 @@ 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(CYPrivate<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) {
+    auto overload(internal->overloads_.find(count));
+    if (overload != internal->overloads_.end())
+    for (auto signature(overload->second.begin()); signature != overload->second.end(); ++signature) {
         CYJavaFrame frame(jni, count + 16);
         jvalue array[count];
-        if (!CYCastJavaArguments(frame, overload->shorty_, context, arguments, array))
+        if (!CYCastJavaArguments(frame, signature->shorty_, context, arguments, array))
             continue;
         jvalue *values(array);
-        switch (overload->primitive_) {
+        switch (signature->primitive_) {
             case CYJavaPrimitiveObject:
-                return CYCastJSValue(context, jni.CallStaticObjectMethodA<jobject>(table->value_, overload->method_, values));
+                return CYCastJSValue(context, jni.CallStaticObjectMethodA<jobject>(table->value_, signature->method_, values));
             case CYJavaPrimitiveVoid:
-                jni.CallStaticVoidMethodA(table->value_, overload->method_, values);
+                jni.CallStaticVoidMethodA(table->value_, signature->method_, values);
                 return CYJSUndefined(context);
 #define CYJavaForEachPrimitive_(T, t, Typ, Type, type) \
             case CYJavaPrimitive ## Type: \
-                return CYJavaCastJSValue(context, jni.CallStatic ## Typ ## MethodA(table->value_, overload->method_, values));
+                return CYJavaCastJSValue(context, jni.CallStatic ## Typ ## MethodA(table->value_, signature->method_, values));
 CYJavaForEachPrimitive
 #undef CYJavaForEachPrimitive_
             default: _assert(false);
@@ -1000,32 +1091,34 @@ 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(CYPrivate<CYJavaClass>::Get(context, object));
     CYJavaEnv jni(table->value_);
     jclass _class(table->value_);
 
     if (table->interface_ && count == 1) {
-        auto Cycript$(jni.FindClass("Cycript"));
+        auto java(reinterpret_cast<CYJava *>(JSObjectGetPrivate(CYGetCachedObject(context, CYJSString("Java")))));
+        auto Cycript$(java->LoadClass("Cycript"));
         auto Cycript$Make(jni.GetStaticMethodID(Cycript$, "proxy", "(Ljava/lang/Class;LCycript$Wrapper;)Ljava/lang/Object;"));
         return CYCastJSObject(context, jni.CallObjectMethod<jobject>(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) {
+    auto overload(table->overloads_.find(count));
+    if (overload != table->overloads_.end())
+    for (auto signature(overload->second.begin()); signature != overload->second.end(); ++signature) {
         CYJavaFrame frame(jni, count + 16);
         jvalue array[count];
-        if (!CYCastJavaArguments(frame, overload->shorty_, context, arguments, array))
+        if (!CYCastJavaArguments(frame, signature->shorty_, context, arguments, array))
             continue;
         jvalue *values(array);
-        auto object(jni.NewObjectA(_class, overload->method_, values));
+        auto object(jni.NewObjectA(_class, signature->method_, values));
         return CYCastJSObject(context, object);
     }
 
     CYThrow("invalid constructor call");
-} CYCatch(NULL) }
+} CYCatchObject() }
 
 static bool JavaStaticInterior_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
-    CYJavaStaticInterior *internal(reinterpret_cast<CYJavaStaticInterior *>(JSObjectGetPrivate(object)));
+    auto internal(CYPrivate<CYJavaStaticInterior>::Get(context, object));
     CYJavaClass *table(internal->table_);
     CYPool pool;
     auto name(CYPoolUTF8String(pool, context, property));
@@ -1036,7 +1129,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(CYPrivate<CYJavaStaticInterior>::Get(context, object));
     CYJavaClass *table(internal->table_);
     CYJavaEnv jni(table->value_);
     CYPool pool;
@@ -1058,7 +1151,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(CYPrivate<CYJavaStaticInterior>::Get(context, object));
     CYJavaClass *table(internal->table_);
     CYJavaEnv jni(table->value_);
     CYPool pool;
@@ -1083,19 +1176,19 @@ CYJavaForEachPrimitive
 } CYCatch(false) }
 
 static void JavaStaticInterior_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
-    CYJavaStaticInterior *internal(reinterpret_cast<CYJavaStaticInterior *>(JSObjectGetPrivate(object)));
+    auto internal(CYPrivate<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(CYPrivate<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(CYPrivate<CYJavaInterior>::Get(context, object));
     CYJavaClass *table(internal->table_);
     CYPool pool;
     auto name(CYPoolUTF8String(pool, context, property));
@@ -1106,7 +1199,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(CYPrivate<CYJavaInterior>::Get(context, object));
     CYJavaEnv jni(internal->value_);
     CYJavaClass *table(internal->table_);
     CYPool pool;
@@ -1128,7 +1221,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(CYPrivate<CYJavaInterior>::Get(context, object));
     CYJavaEnv jni(internal->value_);
     CYJavaClass *table(internal->table_);
     CYPool pool;
@@ -1153,30 +1246,30 @@ CYJavaForEachPrimitive
 } CYCatch(false) }
 
 static void JavaInterior_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
-    CYJavaInterior *internal(reinterpret_cast<CYJavaInterior *>(JSObjectGetPrivate(object)));
+    auto internal(CYPrivate<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(CYPrivate<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)));
-    return CYJavaStaticInterior::Make(context, internal->value_, internal);
+    auto internal(CYPrivate<CYJavaClass>::Get(context, object));
+    return CYPrivate<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)));
-    return CYJavaInterior::Make(context, internal->value_, internal->table_);
+    auto internal(CYPrivate<CYJavaObject>::Get(context, object));
+    return CYPrivate<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(CYPrivate<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;"));
@@ -1184,17 +1277,27 @@ static JSValueRef JavaClass_callAsFunction_toCYON(JSContextRef context, JSObject
 } CYCatch(NULL) }
 
 static JSValueRef JavaMethod_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    auto internal(CYPrivate<CYJavaMethod>::Get(context, _this));
     std::ostringstream cyon;
-    return CYCastJSValue(context, CYJSString(cyon.str()));
-} CYCatch(NULL) }
-
-static JSValueRef JavaStaticMethod_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    std::ostringstream cyon;
+    if (false)
+        cyon << internal->type_ << "." << internal->name_;
+    else {
+        bool comma(false);
+        for (auto overload(internal->overloads_.begin()); overload != internal->overloads_.end(); ++overload)
+            for (auto signature(overload->second.begin()); signature != overload->second.end(); ++signature) {
+                if (comma)
+                    cyon << std::endl;
+                else
+                    comma = true;
+                auto string(CYCastJavaString(signature->reflected_));
+                cyon << CYJavaUTF8String(string);
+            }
+    }
     return CYCastJSValue(context, CYJSString(cyon.str()));
 } CYCatch(NULL) }
 
 static JSValueRef JavaArray_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    CYJavaArray *internal(reinterpret_cast<CYJavaArray *>(JSObjectGetPrivate(object)));
+    auto internal(CYPrivate<CYJavaArray>::Get(context, object));
     CYJavaEnv jni(internal->value_);
     if (JSStringIsEqual(property, length_s))
         return CYCastJSValue(context, jni.GetArrayLength(internal->value_));
@@ -1220,7 +1323,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(CYPrivate<CYJavaArray>::Get(context, object));
     CYJavaEnv jni(internal->value_);
 
     CYPool pool;
@@ -1245,8 +1348,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(CYPrivate<CYJavaPackage>::Get(context, _this));
     std::ostringstream name;
     for (auto &package : internal->package_)
         name << package << '.';
@@ -1259,7 +1364,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(CYPrivate<CYJavaPackage>::Get(context, object));
     CYJavaPackage::Path package(internal->package_);
 
     CYPool pool;
@@ -1270,13 +1375,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 CYPrivate<CYJavaPackage>::Make(context, jni, package);
 } CYCatch(NULL) }
 
 static void Cycript_delete(JNIEnv *env, jclass api, jlong jprotect) { CYJavaTry {
@@ -1308,26 +1416,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 +1435,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 +1446,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,23 +1462,18 @@ 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;
 
-    {
-        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});
-    }
+    if (const char *classpath = getenv("CLASSPATH"))
+        options.push_back(JavaVMOption{pool.strcat("-Djava.class.path=", classpath, NULL), 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.
@@ -1406,16 +1504,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 +1546,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 +1564,42 @@ 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));
-    auto Cycript$(jni.FindClass("Cycript"));
-    jni.RegisterNatives(Cycript$, Cycript_, sizeof(Cycript_) / sizeof(Cycript_[0]));
-    return jni;
+static JNIEnv *GetJNI(JSContextRef context, JNIEnv *&env) {
+    auto jvm(CYGetJavaVM(context));
+    _assert(jvm != NULL);
+
+    switch (jvm->GetEnv(reinterpret_cast<void **>(&env), CYJavaVersion)) {
+        case JNI_EDETACHED:
+            _jnicall(jvm->AttachCurrentThreadAsDaemon(
+#ifndef __ANDROID__
+                reinterpret_cast<void **>
+#endif
+            (&env), NULL));
+            break;
+        case JNI_OK:
+            break;
+        default:
+            _assert(false);
+    }
+
+    CYJavaEnv jni(env);
+
+    auto java(reinterpret_cast<CYJava *>(JSObjectGetPrivate(CYGetCachedObject(context, CYJSString("Java")))));
+    if (java->Setup(jni)) {
+        auto Cycript$(java->LoadClass("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] = {
@@ -1491,13 +1619,13 @@ static JSStaticValue JavaObject_staticValues[3] = {
     {NULL, NULL, NULL, 0}
 };
 
-static JSStaticFunction JavaMethod_staticFunctions[2] = {
+static JSStaticFunction JavaInstanceMethod_staticFunctions[2] = {
     {"toCYON", &JavaMethod_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
 };
 
 static JSStaticFunction JavaStaticMethod_staticFunctions[2] = {
-    {"toCYON", &JavaStaticMethod_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"toCYON", &JavaMethod_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
 };
 
@@ -1515,13 +1643,19 @@ CYJavaForEachPrimitive
 
     JSClassDefinition definition;
 
+    definition = kJSClassDefinitionEmpty;
+    definition.attributes = kJSClassAttributeNoAutomaticPrototype;
+    definition.className = "Java";
+    definition.finalize = &CYFinalize;
+    CYPrivate<CYJava>::Class_ = JSClassCreate(&definition);
+
     definition = kJSClassDefinitionEmpty;
     definition.className = "JavaClass";
     definition.staticValues = JavaClass_staticValues;
     definition.staticFunctions = JavaClass_staticFunctions;
     definition.callAsConstructor = &JavaClass_callAsConstructor;
     definition.finalize = &CYFinalize;
-    CYJavaClass::Class_ = JSClassCreate(&definition);
+    CYPrivate<CYJavaClass>::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     definition.attributes = kJSClassAttributeNoAutomaticPrototype;
@@ -1531,35 +1665,40 @@ CYJavaForEachPrimitive
     definition.setProperty = &JavaInterior_setProperty;
     definition.getPropertyNames = &JavaInterior_getPropertyNames;
     definition.finalize = &CYFinalize;
-    CYJavaInterior::Class_ = JSClassCreate(&definition);
+    CYPrivate<CYJavaInterior>::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "JavaMethod";
-    definition.staticFunctions = JavaMethod_staticFunctions;
-    definition.callAsFunction = &JavaMethod_callAsFunction;
     definition.finalize = &CYFinalize;
-    CYJavaMethod::Class_ = JSClassCreate(&definition);
+    CYPrivate<CYJavaMethod>::Class_ = JSClassCreate(&definition);
+
+    definition = kJSClassDefinitionEmpty;
+    definition.className = "JavaInstanceMethod";
+    definition.parentClass = CYPrivate<CYJavaMethod>::Class_;
+    definition.staticFunctions = JavaInstanceMethod_staticFunctions;
+    definition.callAsFunction = &JavaInstanceMethod_callAsFunction;
+    CYPrivate<CYJavaInstanceMethod>::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "JavaStaticMethod";
+    definition.parentClass = CYPrivate<CYJavaMethod>::Class_;
     definition.staticFunctions = JavaStaticMethod_staticFunctions;
     definition.callAsFunction = &JavaStaticMethod_callAsFunction;
-    definition.finalize = &CYFinalize;
-    CYJavaStaticMethod::Class_ = JSClassCreate(&definition);
+    CYPrivate<CYJavaStaticMethod>::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     definition.attributes = kJSClassAttributeNoAutomaticPrototype;
     definition.className = "JavaObject";
     definition.staticValues = JavaObject_staticValues;
     definition.finalize = &CYFinalize;
-    CYJavaObject::Class_ = JSClassCreate(&definition);
+    CYPrivate<CYJavaObject>::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "JavaArray";
     definition.getProperty = &JavaArray_getProperty;
     definition.setProperty = &JavaArray_setProperty;
     definition.finalize = &CYFinalize;
-    CYJavaArray::Class_ = JSClassCreate(&definition);
+    CYPrivate<CYJavaArray>::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "JavaPackage";
@@ -1567,7 +1706,7 @@ CYJavaForEachPrimitive
     definition.hasProperty = &CYJavaPackage_hasProperty;
     definition.getProperty = &CYJavaPackage_getProperty;
     definition.finalize = &CYFinalize;
-    CYJavaPackage::Class_ = JSClassCreate(&definition);
+    CYPrivate<CYJavaPackage>::Class_ = JSClassCreate(&definition);
 
     definition = kJSClassDefinitionEmpty;
     definition.attributes = kJSClassAttributeNoAutomaticPrototype;
@@ -1577,25 +1716,26 @@ CYJavaForEachPrimitive
     definition.setProperty = &JavaStaticInterior_setProperty;
     definition.getPropertyNames = &JavaStaticInterior_getPropertyNames;
     definition.finalize = &CYFinalize;
-    CYJavaStaticInterior::Class_ = JSClassCreate(&definition);
+    CYPrivate<CYJavaStaticInterior>::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));
+    JSObjectRef Java(CYPrivate<CYJava>::Make(context));
     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<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, CYPrivate<CYJavaPackage>::Make(context, nullptr, CYJavaPackage::Path(1, name)), kJSPropertyAttributeDontEnum);
     }
 }