X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/dc5d7cf41a141ba83d66f97957bd7742a8adbc4f..0d64cb32c6d51eac037c39bdb21a68ebdd69ee5e:/Execute.cpp?ds=sidebyside

diff --git a/Execute.cpp b/Execute.cpp
index ca678ae..61acaf2 100644
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -22,6 +22,9 @@
 #include "Internal.hpp"
 
 #include <dlfcn.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <unistd.h>
 
 #include "cycript.hpp"
 
@@ -32,6 +35,7 @@
 #include "Execute.hpp"
 
 #include <sys/mman.h>
+#include <sys/stat.h>
 
 #include <iostream>
 #include <set>
@@ -42,6 +46,7 @@
 
 #include "Parser.hpp"
 
+#include "Decode.hpp"
 #include "Error.hpp"
 #include "JavaScript.hpp"
 #include "String.hpp"
@@ -50,29 +55,19 @@ struct CYHooks *hooks_;
 
 /* JavaScript Properties {{{ */
 JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, size_t index) {
-    JSValueRef exception(NULL);
-    JSValueRef value(JSObjectGetPropertyAtIndex(context, object, index, &exception));
-    CYThrow(context, exception);
-    return value;
+    return _jsccall(JSObjectGetPropertyAtIndex, context, object, index);
 }
 
 JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, JSStringRef name) {
-    JSValueRef exception(NULL);
-    JSValueRef value(JSObjectGetProperty(context, object, name, &exception));
-    CYThrow(context, exception);
-    return value;
+    return _jsccall(JSObjectGetProperty, context, object, name);
 }
 
 void CYSetProperty(JSContextRef context, JSObjectRef object, size_t index, JSValueRef value) {
-    JSValueRef exception(NULL);
-    JSObjectSetPropertyAtIndex(context, object, index, value, &exception);
-    CYThrow(context, exception);
+    _jsccall(JSObjectSetPropertyAtIndex, context, object, index, value);
 }
 
 void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef value, JSPropertyAttributes attributes) {
-    JSValueRef exception(NULL);
-    JSObjectSetProperty(context, object, name, value, attributes, &exception);
-    CYThrow(context, exception);
+    _jsccall(JSObjectSetProperty, context, object, name, value, attributes);
 }
 
 void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef (*callback)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef *), JSPropertyAttributes attributes) {
@@ -96,10 +91,7 @@ JSStringRef CYCopyJSString(CYUTF8String value) {
 JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value) {
     if (JSValueIsNull(context, value))
         return NULL;
-    JSValueRef exception(NULL);
-    JSStringRef string(JSValueToStringCopy(context, value, &exception));
-    CYThrow(context, exception);
-    return string;
+    return _jsccall(JSValueToStringCopy, context, value);
 }
 
 static CYUTF16String CYCastUTF16String(JSStringRef value) {
@@ -135,6 +127,7 @@ static JSClassRef Struct_;
 
 JSStringRef Array_s;
 JSStringRef cy_s;
+JSStringRef cyi_s;
 JSStringRef length_s;
 JSStringRef message_s;
 JSStringRef name_s;
@@ -284,10 +277,7 @@ JSValueRef CYJSUndefined(JSContextRef context) {
 }
 
 double CYCastDouble(JSContextRef context, JSValueRef value) {
-    JSValueRef exception(NULL);
-    double number(JSValueToNumber(context, value, &exception));
-    CYThrow(context, exception);
-    return number;
+    return _jsccall(JSValueToNumber, context, value);
 }
 
 bool CYCastBool(JSContextRef context, JSValueRef value) {
@@ -307,17 +297,11 @@ JSValueRef CYCastJSValue(JSContextRef context, const char *value) {
 }
 
 JSObjectRef CYCastJSObject(JSContextRef context, JSValueRef value) {
-    JSValueRef exception(NULL);
-    JSObjectRef object(JSValueToObject(context, value, &exception));
-    CYThrow(context, exception);
-    return object;
+    return _jsccall(JSValueToObject, context, value);
 }
 
 JSValueRef CYCallAsFunction(JSContextRef context, JSObjectRef function, JSObjectRef _this, size_t count, const JSValueRef arguments[]) {
-    JSValueRef exception(NULL);
-    JSValueRef value(JSObjectCallAsFunction(context, function, _this, count, arguments, &exception));
-    CYThrow(context, exception);
-    return value;
+    return _jsccall(JSObjectCallAsFunction, context, function, _this, count, arguments);
 }
 
 bool CYIsCallable(JSContextRef context, JSValueRef value) {
@@ -329,19 +313,14 @@ size_t CYArrayLength(JSContextRef context, JSObjectRef array) {
 }
 
 JSValueRef CYArrayGet(JSContextRef context, JSObjectRef array, size_t index) {
-    JSValueRef exception(NULL);
-    JSValueRef value(JSObjectGetPropertyAtIndex(context, array, index, &exception));
-    CYThrow(context, exception);
-    return value;
+    return _jsccall(JSObjectGetPropertyAtIndex, context, array, index);
 }
 
 void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) {
-    JSValueRef exception(NULL);
     JSValueRef arguments[1];
     arguments[0] = value;
     JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));
-    JSObjectCallAsFunction(context, CYCastJSObject(context, CYGetProperty(context, Array, push_s)), array, 1, arguments, &exception);
-    CYThrow(context, exception);
+    _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, push_s)), array, 1, arguments);
 }
 
 static JSValueRef System_print(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
@@ -400,10 +379,7 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSValueRef value, JS
 } CYCatch(NULL) }
 
 const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSValueRef value) {
-    JSValueRef exception(NULL);
-    const char *cyon(CYPoolCCYON(pool, context, value, &exception));
-    CYThrow(context, exception);
-    return cyon;
+    return _jsccall(CYPoolCCYON, pool, context, value);
 }
 
 const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object) {
@@ -417,10 +393,7 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object)
     JSValueRef toJSON(CYGetProperty(context, object, toJSON_s));
     if (CYIsCallable(context, toJSON)) {
         JSValueRef arguments[1] = {CYCastJSValue(context, CYJSString(""))};
-        JSValueRef exception(NULL);
-        const char *cyon(CYPoolCCYON(pool, context, CYCallAsFunction(context, (JSObjectRef) toJSON, object, 1, arguments), &exception));
-        CYThrow(context, exception);
-        return cyon;
+        return _jsccall(CYPoolCCYON, pool, context, CYCallAsFunction(context, (JSObjectRef) toJSON, object, 1, arguments));
     }
 
     if (JSObjectIsFunction(context, object)) {
@@ -484,18 +457,21 @@ static JSValueRef Array_callAsFunction_toCYON(JSContextRef context, JSObjectRef
     bool comma(false);
 
     for (size_t index(0), count(CYCastDouble(context, length)); index != count; ++index) {
-        JSValueRef value(CYGetProperty(context, _this, index));
-
         if (comma)
             str << ',';
         else
             comma = true;
 
-        if (!JSValueIsUndefined(context, value))
-            str << CYPoolCCYON(pool, context, value);
-        else {
-            str << ',';
-            comma = false;
+        try {
+            JSValueRef value(CYGetProperty(context, _this, index));
+            if (!JSValueIsUndefined(context, value))
+                str << CYPoolCCYON(pool, context, value);
+            else {
+                str << ',';
+                comma = false;
+            }
+        } catch (const CYException &error) {
+            str << "@error";
         }
     }
 
@@ -521,11 +497,11 @@ JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, si
     return JSObjectMake(context, Pointer_, internal);
 }
 
-static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const char *type) {
-    return JSObjectMake(context, Functor_, new cy::Functor(type, function));
+static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const sig::Signature &signature) {
+    return JSObjectMake(context, Functor_, new cy::Functor(signature, function));
 }
 
-static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *type, void **cache) {
+static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *encoding, void **cache) {
     cy::Functor *internal;
     if (*cache != NULL)
         internal = reinterpret_cast<cy::Functor *>(*cache);
@@ -534,7 +510,7 @@ static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const
         if (function == NULL)
             return NULL;
 
-        internal = new cy::Functor(type, function);
+        internal = new cy::Functor(encoding, function);
         *cache = internal;
     }
 
@@ -740,12 +716,12 @@ static void FunctionClosure_(ffi_cif *cif, void *result, void **arguments, void
     CYExecuteClosure(cif, result, arguments, arg, &FunctionAdapter_);
 }
 
-Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const char *type, void (*callback)(ffi_cif *, void *, void **, void *)) {
+Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const sig::Signature &signature, void (*callback)(ffi_cif *, void *, void **, void *)) {
     // XXX: in case of exceptions this will leak
     // XXX: in point of fact, this may /need/ to leak :(
-    Closure_privateData *internal(new Closure_privateData(context, function, type));
+    Closure_privateData *internal(new Closure_privateData(context, function, signature));
 
-#if defined(__APPLE__) && defined(__arm__)
+#if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__))
     void *executable;
     ffi_closure *writable(reinterpret_cast<ffi_closure *>(ffi_closure_alloc(sizeof(ffi_closure), &executable)));
 
@@ -771,8 +747,8 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function,
     return internal;
 }
 
-static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const char *type) {
-    Closure_privateData *internal(CYMakeFunctor_(context, function, type, &FunctionClosure_));
+static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const sig::Signature &signature) {
+    Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &FunctionClosure_));
     JSObjectRef object(JSObjectMake(context, Functor_, internal));
     // XXX: see above notes about needing to leak
     JSValueProtect(CYGetJSContext(context), object);
@@ -783,19 +759,16 @@ JSObjectRef CYGetCachedObject(JSContextRef context, JSStringRef name) {
     return CYCastJSObject(context, CYGetProperty(context, CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s)), name));
 }
 
-static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const char *type) {
+static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const sig::Signature &signature) {
     JSObjectRef Function(CYGetCachedObject(context, CYJSString("Function")));
 
-    JSValueRef exception(NULL);
-    bool function(JSValueIsInstanceOfConstructor(context, value, Function, &exception));
-    CYThrow(context, exception);
-
+    bool function(_jsccall(JSValueIsInstanceOfConstructor, context, value, Function));
     if (function) {
         JSObjectRef function(CYCastJSObject(context, value));
-        return CYMakeFunctor(context, function, type);
+        return CYMakeFunctor(context, function, signature);
     } else {
         void (*function)()(CYCastPointer<void (*)()>(context, value));
-        return CYMakeFunctor(context, function, type);
+        return CYMakeFunctor(context, function, signature);
     }
 }
 
@@ -850,9 +823,9 @@ static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object,
         return internal->length_ == _not(size_t) ? CYJSUndefined(context) : CYCastJSValue(context, internal->length_);
 
     Type_privateData *typical(internal->type_);
-
     if (typical->type_ == NULL)
         return NULL;
+    sig::Type &type(*typical->type_);
 
     ssize_t offset;
     if (JSStringIsEqualToUTF8CString(property, "$cyi"))
@@ -860,13 +833,16 @@ static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object,
     else if (!CYGetOffset(pool, context, property, offset))
         return NULL;
 
+    if (type.primitive == sig::function_P)
+        return CYMakeFunctor(context, reinterpret_cast<void (*)()>(internal->value_), type.data.signature);
+
     ffi_type *ffi(typical->GetFFI());
 
     uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
     base += ffi->size * offset;
 
     JSObjectRef owner(internal->GetOwner() ?: object);
-    return CYFromFFI(context, typical->type_, ffi, base, false, owner);
+    return CYFromFFI(context, &type, ffi, base, false, owner);
 } CYCatch(NULL) }
 
 static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
@@ -955,7 +931,7 @@ static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JS
     }
 }
 
-JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception, sig::Signature *signature, ffi_cif *cif, void (*function)()) { CYTry {
+JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, sig::Signature *signature, ffi_cif *cif, void (*function)()) {
     if (setups + count != signature->count - 1)
         throw CYJSError(context, "incorrect number of arguments to ffi function");
 
@@ -979,16 +955,16 @@ JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, voi
         ffi_call(cif, function, value, values);
 
     return CYFromFFI(context, signature->elements[0].type, cif->rtype, value, initialize);
-} CYCatch(NULL) }
+}
 
 static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     CYPool pool;
     cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(object)));
-    return CYCallFunction(pool, context, 0, NULL, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue());
+    return CYCallFunction(pool, context, 0, NULL, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue());
 } CYCatch(NULL) }
 
-JSObjectRef CYMakeType(JSContextRef context, const char *type) {
-    Type_privateData *internal(new Type_privateData(type));
+JSObjectRef CYMakeType(JSContextRef context, const char *encoding) {
+    Type_privateData *internal(new Type_privateData(encoding));
     return JSObjectMake(context, Type_privateData::Class_, internal);
 }
 
@@ -997,6 +973,19 @@ JSObjectRef CYMakeType(JSContextRef context, sig::Type *type) {
     return JSObjectMake(context, Type_privateData::Class_, internal);
 }
 
+JSObjectRef CYMakeType(JSContextRef context, sig::Signature *signature) {
+    CYPool pool;
+
+    sig::Type type;
+    type.name = NULL;
+    type.flags = 0;
+
+    type.primitive = sig::function_P;
+    sig::Copy(pool, type.data.signature, *signature);
+
+    return CYMakeType(context, &type);
+}
+
 static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     JSObjectRef global(CYGetGlobalObject(context));
     JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript"))));
@@ -1084,6 +1073,38 @@ static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t cou
     return CYMakeType(context, type);
 } CYCatch(NULL) }
 
+static JSValueRef Type_callAsFunction_$With(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], sig::Primitive primitive, JSValueRef *exception) { CYTry {
+    Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
+
+    CYPool pool;
+
+    sig::Type type;
+    type.name = NULL;
+    type.flags = 0;
+
+    type.primitive = primitive;
+    type.data.signature.elements = new(pool) sig::Element[1 + count];
+    type.data.signature.count = 1 + count;
+
+    type.data.signature.elements[0].name = NULL;
+    type.data.signature.elements[0].type = internal->type_;
+    type.data.signature.elements[0].offset = _not(size_t);
+
+    for (size_t i(0); i != count; ++i) {
+        sig::Element &element(type.data.signature.elements[i + 1]);
+        element.name = NULL;
+        element.offset = _not(size_t);
+
+        JSObjectRef object(CYCastJSObject(context, arguments[i]));
+        _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_));
+        Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
+
+        element.type = internal->type_;
+    }
+
+    return CYMakeType(context, &type);
+} CYCatch(NULL) }
+
 static JSValueRef Type_callAsFunction_arrayOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 1)
         throw CYJSError(context, "incorrect number of arguments to Type.arrayOf");
@@ -1105,6 +1126,10 @@ static JSValueRef Type_callAsFunction_arrayOf(JSContextRef context, JSObjectRef
     return CYMakeType(context, &type);
 } CYCatch(NULL) }
 
+static JSValueRef Type_callAsFunction_blockWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+    return Type_callAsFunction_$With(context, object, _this, count, arguments, sig::block_P, exception);
+}
+
 static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 0)
         throw CYJSError(context, "incorrect number of arguments to Type.constant");
@@ -1115,6 +1140,10 @@ static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef
     return CYMakeType(context, &type);
 } CYCatch(NULL) }
 
+static JSValueRef Type_callAsFunction_functionWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+    return Type_callAsFunction_$With(context, object, _this, count, arguments, sig::function_P, exception);
+}
+
 static JSValueRef Type_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 0)
         throw CYJSError(context, "incorrect number of arguments to Type.pointerTo");
@@ -1122,11 +1151,18 @@ static JSValueRef Type_callAsFunction_pointerTo(JSContextRef context, JSObjectRe
 
     sig::Type type;
     type.name = NULL;
-    type.flags = 0;
 
-    type.primitive = sig::pointer_P;
-    type.data.data.type = internal->type_;
-    type.data.data.size = 0;
+    if (internal->type_->primitive == sig::char_P) {
+        type.flags = internal->type_->flags;
+        type.primitive = sig::string_P;
+        type.data.data.type = NULL;
+        type.data.data.size = 0;
+    } else {
+        type.flags = 0;
+        type.primitive = sig::pointer_P;
+        type.data.data.type = internal->type_;
+        type.data.data.size = 0;
+    }
 
     return CYMakeType(context, &type);
 } CYCatch(NULL) }
@@ -1149,6 +1185,9 @@ static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object,
         throw CYJSError(context, "incorrect number of arguments to type cast function");
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
 
+    if (internal->type_->primitive == sig::function_P)
+        return CYMakeFunctor(context, arguments[0], internal->type_->data.signature);
+
     sig::Type *type(internal->type_);
     ffi_type *ffi(internal->GetFFI());
     // XXX: alignment?
@@ -1173,7 +1212,7 @@ static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef obje
         type = type->data.data.type;
     }
 
-    void *value(malloc(internal->GetFFI()->size));
+    void *value(calloc(1, internal->GetFFI()->size));
     return CYMakePointer(context, value, length, type, NULL, NULL);
 } CYCatch(NULL) }
 
@@ -1181,8 +1220,10 @@ static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t
     if (count != 2)
         throw CYJSError(context, "incorrect number of arguments to Functor constructor");
     CYPool pool;
-    const char *type(CYPoolCString(pool, context, arguments[1]));
-    return CYMakeFunctor(context, arguments[0], type);
+    const char *encoding(CYPoolCString(pool, context, arguments[1]));
+    sig::Signature signature;
+    sig::Parse(pool, &signature, encoding, &Structor_);
+    return CYMakeFunctor(context, arguments[0], signature);
 } CYCatch(NULL) }
 
 static JSValueRef CYValue_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
@@ -1207,17 +1248,29 @@ static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRe
         JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));
         JSObjectRef toCYON(CYCastJSObject(context, CYGetProperty(context, Array, toCYON_s)));
         return CYCallAsFunction(context, toCYON, _this, count, arguments);
-    } else {
+    } else if (internal->type_->type_ == NULL) pointer: {
         char string[32];
         sprintf(string, "%p", internal->value_);
         return CYCastJSValue(context, string);
+    } try {
+        JSValueRef value(CYGetProperty(context, _this, cyi_s));
+        if (JSValueIsUndefined(context, value))
+            goto pointer;
+        CYPool pool;
+        return CYCastJSValue(context, pool.strcat("&", CYPoolCCYON(pool, context, value), NULL));
+    } catch (const CYException &e) {
+        goto pointer;
     }
 } CYCatch(NULL) }
 
+static JSValueRef Pointer_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+    Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
+    return CYMakeType(context, internal->type_->type_);
+} CYCatch(NULL) }
+
 static JSValueRef Functor_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(object)));
-    CYPool pool;
-    return CYCastJSValue(context, Unparse(pool, &internal->signature_));
+    return CYMakeType(context, &internal->signature_);
 } CYCatch(NULL) }
 
 static JSValueRef Type_getProperty_alignment(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
@@ -1244,12 +1297,12 @@ static JSValueRef Type_callAsFunction_toString(JSContextRef context, JSObjectRef
 
 static JSValueRef Type_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this)));
-    CYPool pool;
-    const char *type(sig::Unparse(pool, internal->type_));
-    std::ostringstream str;
-    CYStringify(str, type, strlen(type));
-    char *cyon(pool.strcat("new Type(", str.str().c_str(), ")", NULL));
-    return CYCastJSValue(context, CYJSString(cyon));
+    CYLocalPool pool;
+    std::ostringstream out;
+    CYOptions options;
+    CYOutput output(out, options);
+    (new(pool) CYEncodedType(Decode(pool, internal->type_)))->Output(output, CYNoFlags);
+    return CYCastJSValue(context, CYJSString(out.str().c_str()));
 } CYCatch(NULL) }
 
 static JSValueRef Type_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
@@ -1263,6 +1316,11 @@ static JSStaticFunction Pointer_staticFunctions[4] = {
     {NULL, NULL, 0}
 };
 
+static JSStaticValue Pointer_staticValues[2] = {
+    {"type", &Pointer_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {NULL, NULL, NULL, 0}
+};
+
 static JSStaticFunction Struct_staticFunctions[2] = {
     {"$cya", &Struct_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
@@ -1291,9 +1349,11 @@ static JSStaticValue Type_staticValues[4] = {
     {NULL, NULL, NULL, 0}
 };
 
-static JSStaticFunction Type_staticFunctions[8] = {
+static JSStaticFunction Type_staticFunctions[10] = {
     {"arrayOf", &Type_callAsFunction_arrayOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"blockWith", &Type_callAsFunction_blockWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"constant", &Type_callAsFunction_constant, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"functionWith", &Type_callAsFunction_functionWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"pointerTo", &Type_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"withName", &Type_callAsFunction_withName, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toCYON", &Type_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
@@ -1311,11 +1371,9 @@ void CYSetArgs(int argc, const char *argv[]) {
         args[i] = CYCastJSValue(context, argv[i]);
 
     JSObjectRef array;
-    if (JSObjectMakeArray$ != NULL) {
-        JSValueRef exception(NULL);
-        array = (*JSObjectMakeArray$)(context, argc, args, &exception);
-        CYThrow(context, exception);
-    } else {
+    if (JSObjectMakeArray$ != NULL)
+        array = _jsccall(*JSObjectMakeArray$, context, argc, args);
+    else {
         JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array")));
         JSValueRef value(CYCallAsFunction(context, Array, NULL, argc, args));
         array = CYCastJSObject(context, value);
@@ -1329,9 +1387,8 @@ JSObjectRef CYGetGlobalObject(JSContextRef context) {
     return JSContextGetGlobalObject(context);
 }
 
-const char *CYExecute(CYPool &pool, CYUTF8String code) {
-    JSContextRef context(CYGetJSContext());
-    JSValueRef exception(NULL), result;
+const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code) {
+    JSValueRef exception(NULL);
 
     void *handle;
     if (hooks_ != NULL && hooks_->ExecuteStart != NULL)
@@ -1339,8 +1396,9 @@ const char *CYExecute(CYPool &pool, CYUTF8String code) {
     else
         handle = NULL;
 
-    const char *json;
+    try {
 
+    JSValueRef result;
     try {
         result = JSEvaluateScript(context, CYJSString(code), NULL, NULL, 0, &exception);
     } catch (const char *error) {
@@ -1353,6 +1411,7 @@ const char *CYExecute(CYPool &pool, CYUTF8String code) {
     if (JSValueIsUndefined(context, result))
         return NULL;
 
+    const char *json;
     try {
         json = CYPoolCCYON(pool, context, result, &exception);
     } catch (const char *error) {
@@ -1364,13 +1423,13 @@ const char *CYExecute(CYPool &pool, CYUTF8String code) {
 
     CYSetProperty(context, CYGetGlobalObject(context), Result_, result);
 
-    if (hooks_ != NULL && hooks_->ExecuteEnd != NULL)
-        (*hooks_->ExecuteEnd)(context, handle);
     return json;
-}
 
-extern "C" void CydgetSetupContext(JSGlobalContextRef context) {
-    CYSetupContext(context);
+    } catch (...) {
+        if (hooks_ != NULL && hooks_->ExecuteEnd != NULL)
+            (*hooks_->ExecuteEnd)(context, handle);
+        throw;
+    }
 }
 
 static bool initialized_ = false;
@@ -1406,6 +1465,7 @@ void CYInitializeDynamic() {
     definition = kJSClassDefinitionEmpty;
     definition.className = "Pointer";
     definition.staticFunctions = Pointer_staticFunctions;
+    definition.staticValues = Pointer_staticValues;
     definition.getProperty = &Pointer_getProperty;
     definition.setProperty = &Pointer_setProperty;
     definition.finalize = &CYFinalize;
@@ -1436,6 +1496,7 @@ void CYInitializeDynamic() {
 
     Array_s = JSStringCreateWithUTF8CString("Array");
     cy_s = JSStringCreateWithUTF8CString("$cy");
+    cyi_s = JSStringCreateWithUTF8CString("$cyi");
     length_s = JSStringCreateWithUTF8CString("length");
     message_s = JSStringCreateWithUTF8CString("message");
     name_s = JSStringCreateWithUTF8CString("name");
@@ -1471,14 +1532,8 @@ JSValueRef CYJSError::CastJSValue(JSContextRef context) const {
 
 JSValueRef CYCastJSError(JSContextRef context, const char *message) {
     JSObjectRef Error(CYGetCachedObject(context, CYJSString("Error")));
-
     JSValueRef arguments[1] = {CYCastJSValue(context, message)};
-
-    JSValueRef exception(NULL);
-    JSValueRef value(JSObjectCallAsConstructor(context, Error, 1, arguments, &exception));
-    CYThrow(context, exception);
-
-    return value;
+    return _jsccall(JSObjectCallAsConstructor, context, Error, 1, arguments);
 }
 
 JSValueRef CYPoolError::CastJSValue(JSContextRef context) const {
@@ -1503,9 +1558,114 @@ JSGlobalContextRef CYGetJSContext(JSContextRef context) {
     return reinterpret_cast<Context *>(JSObjectGetPrivate(CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s))))->context_;
 }
 
-extern "C" void CYSetupContext(JSGlobalContextRef context) {
-    JSValueRef exception(NULL);
+extern "C" bool CydgetMemoryParse(const uint16_t **data, size_t *size);
+
+void *CYMapFile(const char *path, size_t *psize) {
+    int fd;
+    _syscall(fd = open(path, O_RDONLY));
+
+    struct stat stat;
+    _syscall(fstat(fd, &stat));
+    size_t size(stat.st_size);
+
+    *psize = size;
+
+    void *base;
+    _syscall(base = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0));
+
+    _syscall(close(fd));
+    return base;
+}
+
+static void CYRunSetups(JSContextRef context) {
+    std::string folder("/etc/cycript/setup.d");
+    DIR *setups(opendir(folder.c_str()));
+    if (setups == NULL)
+        return;
 
+    for (;;) {
+        dirent setup;
+        dirent *result;
+        _syscall(readdir_r(setups, &setup, &result));
+
+        if (result == NULL)
+            break;
+        _assert(result == &setup);
+
+        const char *name(setup.d_name);
+        size_t length(strlen(name));
+        if (length < 4)
+            continue;
+
+        if (name[0] == '.')
+            continue;
+        if (memcmp(name + length - 3, ".cy", 3) != 0)
+            continue;
+
+        std::string script(folder + "/" + name);
+        CYUTF8String utf8;
+        utf8.data = reinterpret_cast<char *>(CYMapFile(script.c_str(), &utf8.size));
+
+        CYPool pool;
+        CYUTF16String utf16(CYPoolUTF16String(pool, utf8));
+        munmap(const_cast<char *>(utf8.data), utf8.size);
+
+        // XXX: this should not be used
+        CydgetMemoryParse(&utf16.data, &utf16.size);
+
+        CYExecute(context, pool, CYPoolUTF8String(pool, utf16));
+        free(const_cast<uint16_t *>(utf16.data));
+    }
+
+    _syscall(closedir(setups));
+}
+
+static JSValueRef require(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    _assert(count == 1);
+    CYPool pool;
+
+    Dl_info addr;
+    _assert(dladdr(reinterpret_cast<void *>(&require), &addr) != 0);
+    char *lib(pool.strdup(addr.dli_fname));
+
+    char *slash(strrchr(lib, '/'));
+    _assert(slash != NULL);
+    *slash = '\0';
+
+    CYJSString property("exports");
+    JSObjectRef module;
+
+    const char *path(pool.strcat(lib, "/cycript/", CYPoolCString(pool, context, arguments[0]), ".cy", NULL));
+    CYJSString key(path);
+    JSObjectRef modules(CYGetCachedObject(context, CYJSString("modules")));
+    JSValueRef cache(CYGetProperty(context, modules, key));
+
+    if (!JSValueIsUndefined(context, cache))
+        module = CYCastJSObject(context, cache);
+    else {
+        CYUTF8String code;
+        code.data = reinterpret_cast<char *>(CYMapFile(path, &code.size));
+
+        std::stringstream wrap;
+        wrap << "(function (exports, require, module) { " << code << "\n});";
+        code = CYPoolCode(pool, wrap.str().c_str());
+
+        JSValueRef value(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0));
+        JSObjectRef function(CYCastJSObject(context, value));
+
+        module = JSObjectMake(context, NULL, NULL);
+        JSObjectRef exports(JSObjectMake(context, NULL, NULL));
+        CYSetProperty(context, module, property, exports);
+
+        JSValueRef arguments[3] = { exports, JSObjectMakeFunctionWithCallback(context, CYJSString("require"), &require), module };
+        CYCallAsFunction(context, function, NULL, 3, arguments);
+        CYSetProperty(context, modules, key, module);
+    }
+
+    return CYGetProperty(context, module, property);
+} CYCatch(NULL) }
+
+extern "C" void CYSetupContext(JSGlobalContextRef context) {
     CYInitializeDynamic();
 
     JSObjectRef global(CYGetGlobalObject(context));
@@ -1556,11 +1716,13 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     CYSetProperty(context, cycript, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer_, &Pointer_new));
     CYSetProperty(context, cycript, CYJSString("Type"), JSObjectMakeConstructor(context, Type_privateData::Class_, &Type_new));
 
+    JSObjectRef modules(JSObjectMake(context, NULL, NULL));
+    CYSetProperty(context, cy, CYJSString("modules"), modules);
+
     JSObjectRef all(JSObjectMake(context, All_, NULL));
     CYSetProperty(context, cycript, CYJSString("all"), all);
 
-    JSObjectRef alls(JSObjectCallAsConstructor(context, Array, 0, NULL, &exception));
-    CYThrow(context, exception);
+    JSObjectRef alls(_jsccall(JSObjectCallAsConstructor, context, Array, 0, NULL));
     CYSetProperty(context, cycript, CYJSString("alls"), alls);
 
     if (true) {
@@ -1583,6 +1745,8 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
     JSObjectRef System(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, cy, CYJSString("System"), System);
 
+    CYSetProperty(context, all, CYJSString("require"), &require, kJSPropertyAttributeDontEnum);
+
     CYSetProperty(context, global, CYJSString("system"), System);
     CYSetProperty(context, System, CYJSString("args"), CYJSNull(context));
     //CYSetProperty(context, System, CYJSString("global"), global);
@@ -1595,6 +1759,8 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
         (*hooks_->SetupContext)(context);
 
     CYArrayPush(context, alls, cycript);
+
+    CYRunSetups(context);
 }
 
 JSGlobalContextRef CYGetJSContext() {