X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/6635fb6ce2e1d27090249a65d0f4f21900f629d9..79492f212da2fcaa4ce44d00fc08530e1630d05b:/ObjectiveC/Library.mm

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 7444159..cb95509 100644
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -1,28 +1,24 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2012  Jay Freeman (saurik)
+ * Copyright (C) 2009-2014  Jay Freeman (saurik)
 */
 
-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */
 /*
- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Cycript is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
 
-#ifdef __APPLE__
-#include "Struct.hpp"
-#endif
-
 #include <Foundation/Foundation.h>
 
 #include "ObjectiveC/Internal.hpp"
@@ -36,10 +32,15 @@
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
 #include <JavaScriptCore/JSStringRefCF.h>
-#include <WebKit/WebScriptObject.h>
 #include <objc/runtime.h>
 #endif
 
+#ifdef __APPLE__
+#include <malloc/malloc.h>
+#include <mach/mach.h>
+#endif
+
+#include "Code.hpp"
 #include "Error.hpp"
 #include "JavaScript.hpp"
 #include "String.hpp"
@@ -47,17 +48,18 @@
 
 #include <cmath>
 #include <map>
+#include <set>
 
 #include <dlfcn.h>
 
-#define CYObjectiveTry_(context) { \
-    JSContextRef context_(context); \
+#define CYObjectiveTry_ { \
     try
 #define CYObjectiveTry { \
+    JSContextRef context(context_); \
     try
 #define CYObjectiveCatch \
     catch (const CYException &error) { \
-        @throw CYCastNSObject(NULL, context_, error.CastJSValue(context_)); \
+        @throw CYCastNSObject(NULL, context, error.CastJSValue(context)); \
     } \
 }
 
@@ -85,6 +87,10 @@
     } return value; \
 }
 
+#define _oassert(test) \
+    if (!(test)) \
+        @throw [NSException exceptionWithName:NSInternalInconsistencyException reason:@"_assert(" #test ")" userInfo:nil];
+
 #ifndef __APPLE__
 #define class_getSuperclass GSObjCSuper
 #define class_getInstanceVariable GSCGetInstanceVariableDefinition
@@ -128,42 +134,74 @@ static void (*$objc_setAssociatedObject)(id object, void *key, id value, objc_As
 static id (*$objc_getAssociatedObject)(id object, void *key);
 static void (*$objc_removeAssociatedObjects)(id object);
 
-JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception);
+@class NSBlock;
+
+struct BlockLiteral {
+    Class isa;
+    int flags;
+    int reserved;
+    void (*invoke)(void *, ...);
+    void *descriptor;
+};
+
+struct BlockDescriptor1 {
+    unsigned long int reserved;
+    unsigned long int size;
+};
+
+struct BlockDescriptor2 {
+    void (*copy_helper)(BlockLiteral *dst, BlockLiteral *src);
+    void (*dispose_helper)(BlockLiteral *src);
+};
+
+struct BlockDescriptor3 {
+    const char *signature;
+    const char *layout;
+};
+
+enum {
+    BLOCK_DEALLOCATING = 0x0001,
+    BLOCK_REFCOUNT_MASK = 0xfffe,
+    BLOCK_NEEDS_FREE = 1 << 24,
+    BLOCK_HAS_COPY_DISPOSE = 1 << 25,
+    BLOCK_HAS_CTOR = 1 << 26,
+    BLOCK_IS_GC = 1 << 27,
+    BLOCK_IS_GLOBAL = 1 << 28,
+    BLOCK_HAS_STRET = 1 << 29,
+    BLOCK_HAS_SIGNATURE = 1 << 30,
+};
+
+JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize);
 
 /* Objective-C Pool Release {{{ */
-apr_status_t CYPoolRelease_(void *data) {
+void CYPoolRelease_(void *data) {
     id object(reinterpret_cast<id>(data));
     [object release];
-    return APR_SUCCESS;
 }
 
-id CYPoolRelease_(apr_pool_t *pool, id object) {
+id CYPoolRelease_(CYPool *pool, id object) {
     if (object == nil)
         return nil;
     else if (pool == NULL)
         return [object autorelease];
     else {
-        apr_pool_cleanup_register(pool, object, &CYPoolRelease_, &apr_pool_cleanup_null);
+        pool->atexit(CYPoolRelease_);
         return object;
     }
 }
 
 template <typename Type_>
-Type_ CYPoolRelease(apr_pool_t *pool, Type_ object) {
+Type_ CYPoolRelease(CYPool *pool, Type_ object) {
     return (Type_) CYPoolRelease_(pool, (id) object);
 }
 /* }}} */
 /* Objective-C Strings {{{ */
-const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, NSString *value) {
-    if (pool == NULL)
-        return [value UTF8String];
-    else {
-        size_t size([value maximumLengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1);
-        char *string(new(pool) char[size]);
-        if (![value getCString:string maxLength:size encoding:NSUTF8StringEncoding])
-            throw CYJSError(context, "[NSString getCString:maxLength:encoding:] == NO");
-        return string;
-    }
+const char *CYPoolCString(CYPool &pool, JSContextRef context, NSString *value) {
+    size_t size([value maximumLengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1);
+    char *string(new(pool) char[size]);
+    if (![value getCString:string maxLength:size encoding:NSUTF8StringEncoding])
+        throw CYJSError(context, "[NSString getCString:maxLength:encoding:] == NO");
+    return string;
 }
 
 JSStringRef CYCopyJSString(JSContextRef context, NSString *value) {
@@ -204,16 +242,16 @@ NSString *CYCopyNSString(JSContextRef context, JSValueRef value) {
     return CYCopyNSString(context, CYJSString(context, value));
 }
 
-NSString *CYCastNSString(apr_pool_t *pool, const CYUTF8String &value) {
+NSString *CYCastNSString(CYPool *pool, const CYUTF8String &value) {
     return CYPoolRelease(pool, CYCopyNSString(value));
 }
 
-NSString *CYCastNSString(apr_pool_t *pool, SEL sel) {
+NSString *CYCastNSString(CYPool *pool, SEL sel) {
     const char *name(sel_getName(sel));
     return CYPoolRelease(pool, CYCopyNSString(CYUTF8String(name, strlen(name))));
 }
 
-NSString *CYCastNSString(apr_pool_t *pool, JSContextRef context, JSStringRef value) {
+NSString *CYCastNSString(CYPool *pool, JSContextRef context, JSStringRef value) {
     return CYPoolRelease(pool, CYCopyNSString(context, value));
 }
 
@@ -235,18 +273,20 @@ size_t CYGetIndex(NSString *value) {
     return CYGetIndex(CYCastUTF8String(value));
 }
 
-bool CYGetOffset(apr_pool_t *pool, JSContextRef context, NSString *value, ssize_t &index) {
+bool CYGetOffset(CYPool &pool, JSContextRef context, NSString *value, ssize_t &index) {
     return CYGetOffset(CYPoolCString(pool, context, value), index);
 }
 
 static JSClassRef Instance_;
 
 static JSClassRef ArrayInstance_;
+static JSClassRef BooleanInstance_;
 static JSClassRef FunctionInstance_;
+static JSClassRef NumberInstance_;
 static JSClassRef ObjectInstance_;
 static JSClassRef StringInstance_;
-static JSClassRef TypeInstance_;
 
+static JSClassRef Class_;
 static JSClassRef Internal_;
 static JSClassRef Message_;
 static JSClassRef Messages_;
@@ -263,10 +303,10 @@ static JSClassRef ObjectiveC_Images_;
 #endif
 
 #ifdef __APPLE__
+static Class __NSMallocBlock__;
 static Class NSCFBoolean_;
 static Class NSCFType_;
 static Class NSGenericDeallocHandler_;
-static Class NSMessageBuilder_;
 static Class NSZombie_;
 #else
 static Class NSBoolNumber_;
@@ -275,6 +315,7 @@ static Class NSBoolNumber_;
 static Class NSArray_;
 static Class NSBlock_;
 static Class NSDictionary_;
+static Class NSNumber_;
 static Class NSString_;
 static Class Object_;
 
@@ -295,7 +336,7 @@ JSValueRef CYGetClassPrototype(JSContextRef context, Class self, bool meta) {
     if (self == nil)
         return CYGetCachedObject(context, CYJSString("Instance_prototype"));
     else if (meta && !class_isMetaClass(self))
-        return CYGetCachedObject(context, CYJSString("TypeInstance_prototype"));
+        return CYGetCachedObject(context, CYJSString("Class_prototype"));
 
     JSObjectRef global(CYGetGlobalObject(context));
     JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s)));
@@ -311,10 +352,18 @@ JSValueRef CYGetClassPrototype(JSContextRef context, Class self, bool meta) {
     JSClassRef _class(NULL);
     JSValueRef prototype;
 
-    if (self == NSArray_)
+#ifdef __APPLE__
+    if (self == NSCFBoolean_)
+#else
+    if (self == NSBoolNumber_)
+#endif
+        prototype = CYGetCachedObject(context, CYJSString("BooleanInstance_prototype"));
+    else if (self == NSArray_)
         prototype = CYGetCachedObject(context, CYJSString("ArrayInstance_prototype"));
     else if (self == NSBlock_)
         prototype = CYGetCachedObject(context, CYJSString("FunctionInstance_prototype"));
+    else if (self == NSNumber_)
+        prototype = CYGetCachedObject(context, CYJSString("NumberInstance_prototype"));
     else if (self == NSDictionary_)
         prototype = CYGetCachedObject(context, CYJSString("ObjectInstance_prototype"));
     else if (self == NSString_)
@@ -323,7 +372,7 @@ JSValueRef CYGetClassPrototype(JSContextRef context, Class self, bool meta) {
         prototype = CYGetClassPrototype(context, class_getSuperclass(self), meta);
 
     JSObjectRef object(JSObjectMake(context, _class, NULL));
-    JSObjectSetPrototype(context, object, prototype);
+    CYSetPrototype(context, object, prototype);
     CYSetProperty(context, cy, name, object);
 
     return object;
@@ -336,7 +385,7 @@ _finline JSValueRef CYGetClassPrototype(JSContextRef context, Class self) {
 JSObjectRef Messages::Make(JSContextRef context, Class _class) {
     JSObjectRef value(JSObjectMake(context, Messages_, new Messages(_class)));
     if (Class super = class_getSuperclass(_class))
-        JSObjectSetPrototype(context, value, Messages::Make(context, super));
+        CYSetPrototype(context, value, Messages::Make(context, super));
     return value;
 }
 
@@ -350,17 +399,22 @@ JSObjectRef Super::Make(JSContextRef context, id object, Class _class) {
     return value;
 } }
 
+bool CYIsKindOfClass(id object, Class _class) {
+    for (Class isa(object_getClass(object)); isa != NULL; isa = class_getSuperclass(isa))
+        if (isa == _class)
+            return true;
+    return false;
+}
+
 JSObjectRef Instance::Make(JSContextRef context, id object, Flags flags) {
-    JSObjectRef value(JSObjectMake(context, Instance_, new Instance(object, flags)));
-    JSObjectSetPrototype(context, value, CYGetClassPrototype(context, object_getClass(object)));
+    JSObjectRef value(JSObjectMake(context, CYIsKindOfClass(object, NSBlock_) ? FunctionInstance_ : Instance_, new Instance(object, flags)));
+    CYSetPrototype(context, value, CYGetClassPrototype(context, object_getClass(object)));
     return value;
 }
 
 Instance::~Instance() {
     if ((flags_ & Transient) == 0)
-        // XXX: does this handle background threads correctly?
-        // XXX: this simply does not work on the console because I'm stupid
-        [GetValue() performSelector:@selector(release) withObject:nil afterDelay:0];
+        [GetValue() release];
 }
 
 struct Message_privateData :
@@ -398,7 +452,7 @@ JSObjectRef CYMakeInstance(JSContextRef context, id object, bool transient) {
 - (JSType) cy$JSType;
 
 - (JSValueRef) cy$toJSON:(NSString *)key inContext:(JSContextRef)context;
-- (NSString *) cy$toCYON:(bool)objective;
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects;
 
 - (bool) cy$hasProperty:(NSString *)name;
 - (NSObject *) cy$getProperty:(NSString *)name;
@@ -416,31 +470,32 @@ JSObjectRef CYMakeInstance(JSContextRef context, id object, bool transient) {
 - (JSValueRef) cy$valueOfInContext:(JSContextRef)context;
 @end
 
-NSString *CYCastNSCYON(id value, bool objective) {
+NSString *CYCastNSCYON(id value, bool objective, std::set<void *> &objects) {
     NSString *string;
 
     if (value == nil)
         string = @"nil";
     else {
         Class _class(object_getClass(value));
-        SEL sel(@selector(cy$toCYON:));
+        SEL sel(@selector(cy$toCYON:inSet:));
 
-        if (objc_method *toCYON = class_getInstanceMethod(_class, sel))
-            string = reinterpret_cast<NSString *(*)(id, SEL, bool)>(method_getImplementation(toCYON))(value, sel, objective);
+        if (class_isMetaClass(_class)) {
+            const char *name(class_getName(value));
+            if (class_isMetaClass(value))
+                string = [NSString stringWithFormat:@"object_getClass(%s)", name];
+            else
+                string = [NSString stringWithUTF8String:name];
+        } else if (objc_method *toCYON = class_getInstanceMethod(_class, sel))
+            string = reinterpret_cast<NSString *(*)(id, SEL, bool, std::set<void *> &)>(method_getImplementation(toCYON))(value, sel, objective, objects);
         else if (objc_method *methodSignatureForSelector = class_getInstanceMethod(_class, @selector(methodSignatureForSelector:))) {
             if (reinterpret_cast<NSMethodSignature *(*)(id, SEL, SEL)>(method_getImplementation(methodSignatureForSelector))(value, @selector(methodSignatureForSelector:), sel) != nil)
-                string = [value cy$toCYON:objective];
+                string = [value cy$toCYON:objective inSet:objects];
             else goto fail;
         } else fail: {
             if (false);
 #ifdef __APPLE__
-            else if (value == NSZombie_)
-                string = @"_NSZombie_";
             else if (_class == NSZombie_)
                 string = [NSString stringWithFormat:@"<_NSZombie_: %p>", value];
-            // XXX: frowny /in/ the pants
-            else if (value == NSGenericDeallocHandler_ || value == NSMessageBuilder_ || value == Object_)
-                string = nil;
 #endif
             else
                 string = [NSString stringWithFormat:@"%@", value];
@@ -454,6 +509,15 @@ NSString *CYCastNSCYON(id value, bool objective) {
     return string;
 }
 
+NSString *CYCastNSCYON(id value, bool objective, std::set<void *> *objects) {
+    if (objects != NULL)
+        return CYCastNSCYON(value, objective, *objects);
+    else {
+        std::set<void *> objects;
+        return CYCastNSCYON(value, objective, objects);
+    }
+}
+
 #ifdef __APPLE__
 struct PropertyAttributes {
     CYPool pool_;
@@ -488,7 +552,9 @@ struct PropertyAttributes {
         name = property_getName(property);
         const char *attributes(property_getAttributes(property));
 
-        for (char *state, *token(apr_strtok(apr_pstrdup(pool_, attributes), ",", &state)); token != NULL; token = apr_strtok(NULL, ",", &state)) {
+        for (char *token(pool_.strdup(attributes)), *next; token != NULL; token = next) {
+            if ((next = strchr(token, ',')) != NULL)
+                *next++ = '\0';
             switch (*token) {
                 case 'R': readonly = true; break;
                 case 'C': copy = true; break;
@@ -513,7 +579,7 @@ struct PropertyAttributes {
 
     const char *Getter() {
         if (getter_ == NULL)
-            getter_ = apr_pstrdup(pool_, name);
+            getter_ = pool_.strdup(name);
         return getter_;
     }
 
@@ -542,7 +608,6 @@ struct PropertyAttributes {
 };
 #endif
 
-#ifndef __APPLE__
 @interface CYWebUndefined : NSObject {
 }
 
@@ -560,7 +625,6 @@ struct PropertyAttributes {
 @end
 
 #define WebUndefined CYWebUndefined
-#endif
 
 /* Bridge: CYJSObject {{{ */
 @interface CYJSObject : NSMutableDictionary {
@@ -599,18 +663,59 @@ struct PropertyAttributes {
 /* }}} */
 
 _finline bool CYJSValueIsNSObject(JSContextRef context, JSValueRef value) {
-    return JSValueIsObjectOfClass(context, value, Instance_);
+    return JSValueIsObjectOfClass(context, value, Instance_) || JSValueIsObjectOfClass(context, value, FunctionInstance_);
 }
 
 _finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSValueRef value, JSStringRef cache) {
-    JSValueRef exception(NULL);
-    JSObjectRef constructor(CYGetCachedObject(context, cache));
-    bool is(JSValueIsInstanceOfConstructor(context, value, constructor, &exception));
-    CYThrow(context, exception);
-    return is;
+    return _jsccall(JSValueIsInstanceOfConstructor, context, value, CYGetCachedObject(context, cache));
 }
 
-NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSObjectRef object) {
+struct CYBlockDescriptor {
+    struct {
+        BlockDescriptor1 one_;
+        BlockDescriptor2 two_;
+        BlockDescriptor3 three_;
+    } d_;
+
+    Closure_privateData *internal_;
+};
+
+void CYDisposeBlock(BlockLiteral *literal) {
+    delete reinterpret_cast<CYBlockDescriptor *>(literal->descriptor)->internal_;
+}
+
+static JSValueRef BlockAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) {
+    JSObjectRef _this(CYCastJSObject(context, values[0]));
+    return CYCallAsFunction(context, function, _this, count - 1, values + 1);
+}
+
+static void BlockClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
+    CYExecuteClosure(cif, result, arguments, arg, &BlockAdapter_);
+}
+
+NSBlock *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature &signature) {
+    _assert(__NSMallocBlock__ != Nil);
+    BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(malloc(sizeof(BlockLiteral))));
+
+    CYBlockDescriptor *descriptor(new CYBlockDescriptor);
+    memset(&descriptor->d_, 0, sizeof(descriptor->d_));
+
+    descriptor->internal_ = CYMakeFunctor_(context, function, signature, &BlockClosure_);
+    literal->invoke = reinterpret_cast<void (*)(void *, ...)>(descriptor->internal_->GetValue());
+
+    literal->isa = __NSMallocBlock__;
+    literal->flags = BLOCK_HAS_SIGNATURE | BLOCK_HAS_COPY_DISPOSE | BLOCK_IS_GLOBAL;
+    literal->reserved = 0;
+    literal->descriptor = descriptor;
+
+    descriptor->d_.one_.size = sizeof(descriptor->d_);
+    descriptor->d_.two_.dispose_helper = &CYDisposeBlock;
+    descriptor->d_.three_.signature = sig::Unparse(*descriptor->internal_->pool_, &signature);
+
+    return reinterpret_cast<NSBlock *>(literal);
+}
+
+NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSObjectRef object) {
     if (CYJSValueIsNSObject(context, object)) {
         Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
         return internal->GetValue();
@@ -631,7 +736,7 @@ NSNumber *CYCopyNSNumber(JSContextRef context, JSValueRef value) {
 @end
 #endif
 
-id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cast) {
+id CYNSObject(CYPool *pool, JSContextRef context, JSValueRef value, bool cast) {
     id object;
     bool copy;
 
@@ -684,12 +789,12 @@ id CYNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value, bool cas
         return [object retain];
 }
 
-NSObject *CYCastNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
+NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSValueRef value) {
     return CYNSObject(pool, context, value, true);
 }
 
-NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
-    return CYNSObject(pool, context, value, false);
+NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
+    return CYNSObject(&pool, context, value, false);
 }
 
 /* Bridge: NSArray {{{ */
@@ -699,7 +804,9 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return [[self mutableCopy] autorelease];
 }
 
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
+    _oassert(objects.insert(self).second);
+
     NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
     [json appendString:@"@["];
 
@@ -715,7 +822,7 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
         else
             comma = true;
         if (object == nil || [object cy$JSType] != kJSTypeUndefined)
-            [json appendString:CYCastNSCYON(object, true)];
+            [json appendString:CYCastNSCYON(object, true, objects)];
         else {
             [json appendString:@","];
             comma = false;
@@ -746,7 +853,7 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
 }
 
 - (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context {
-    CYObjectiveTry_(context) {
+    CYObjectiveTry_ {
         if ([name isEqualToString:@"length"])
             return CYCastJSValue(context, [self count]);
     } CYObjectiveCatch
@@ -788,12 +895,12 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return kJSTypeBoolean;
 }
 
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
     NSString *value([self boolValue] ? @"true" : @"false");
     return objective ? value : [NSString stringWithFormat:@"@%@", value];
 }
 
-- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ {
     return CYCastJSValue(context, (bool) [self boolValue]);
 } CYObjectiveCatch }
 
@@ -807,7 +914,9 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return [[self mutableCopy] autorelease];
 }
 
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
+    _oassert(objects.insert(self).second);
+
     NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
     [json appendString:@"@{"];
 
@@ -822,10 +931,10 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
             [json appendString:@","];
         else
             comma = true;
-        [json appendString:CYCastNSCYON(key, true)];
+        [json appendString:CYCastNSCYON(key, true, objects)];
         [json appendString:@":"];
         NSObject *object([self objectForKey:key]);
-        [json appendString:CYCastNSCYON(object, true)];
+        [json appendString:CYCastNSCYON(object, true, objects)];
     }
 
     [json appendString:@"}"];
@@ -945,12 +1054,12 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return kJSTypeNumber;
 }
 
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
     NSString *value([self cy$JSType] != kJSTypeBoolean ? [self stringValue] : [self boolValue] ? @"true" : @"false");
     return objective ? value : [NSString stringWithFormat:@"@%@", value];
 }
 
-- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ {
     return [self cy$JSType] != kJSTypeBoolean ? CYCastJSValue(context, [self doubleValue]) : CYCastJSValue(context, static_cast<bool>([self boolValue]));
 } CYObjectiveCatch }
 
@@ -963,12 +1072,12 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return kJSTypeNull;
 }
 
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
     NSString *value(@"null");
     return objective ? value : [NSString stringWithFormat:@"@%@", value];
 }
 
-- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ {
     return CYJSNull(context);
 } CYObjectiveCatch }
 
@@ -985,7 +1094,7 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return [self cy$valueOfInContext:context];
 }
 
-- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ {
     return NULL;
 } CYObjectiveCatch }
 
@@ -993,8 +1102,8 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return kJSTypeObject;
 }
 
-- (NSString *) cy$toCYON:(bool)objective {
-    return [[self description] cy$toCYON:objective];
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
+    return [@"#" stringByAppendingString:[[self description] cy$toCYON:true inSet:objects]];
 }
 
 - (bool) cy$hasProperty:(NSString *)name {
@@ -1005,7 +1114,7 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return nil;
 }
 
-- (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context { CYObjectiveTry_(context) {
+- (JSValueRef) cy$getProperty:(NSString *)name inContext:(JSContextRef)context { CYObjectiveTry_ {
     if (NSObject *value = [self cy$getProperty:name])
         return CYCastJSValue(context, value);
     return NULL;
@@ -1031,8 +1140,23 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
 /* Bridge: NSProxy {{{ */
 @implementation NSProxy (Cycript)
 
-- (NSString *) cy$toCYON:(bool)objective {
-    return [[self description] cy$toCYON:objective];
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
+    return [[self description] cy$toCYON:objective inSet:objects];
+}
+
+@end
+/* }}} */
+/* Bridge: NSSet {{{ */
+@implementation NSSet (Cycript)
+
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
+    _oassert(objects.insert(self).second);
+
+    NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
+    [json appendString:@"[NSSet setWithArray:"];
+    [json appendString:CYCastNSCYON([self allObjects], true, objects)];
+    [json appendString:@"]]"];
+    return json;
 }
 
 @end
@@ -1048,7 +1172,7 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return kJSTypeString;
 }
 
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
     std::ostringstream str;
     if (!objective)
         str << '@';
@@ -1084,7 +1208,7 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     }
 }
 
-- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ {
     return CYCastJSValue(context, CYJSString(context, self));
 } CYObjectiveCatch }
 
@@ -1097,13 +1221,13 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu
     return kJSTypeUndefined;
 }
 
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
     NSString *value(@"undefined");
     return value; // XXX: maybe use the below code, adding @undefined?
     //return objective ? value : [NSString stringWithFormat:@"@%@", value];
 }
 
-- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_(context) {
+- (JSValueRef) cy$valueOfInContext:(JSContextRef)context { CYObjectiveTry_ {
     return CYJSUndefined(context);
 } CYObjectiveCatch }
 
@@ -1118,8 +1242,8 @@ static bool CYIsClass(id self) {
 #endif
 }
 
-Class CYCastClass(apr_pool_t *pool, JSContextRef context, JSValueRef value) {
-    id self(CYCastNSObject(pool, context, value));
+Class CYCastClass(CYPool &pool, JSContextRef context, JSValueRef value) {
+    id self(CYCastNSObject(&pool, context, value));
     if (CYIsClass(self))
         return (Class) self;
     throw CYJSError(context, "got something that is not a Class");
@@ -1131,7 +1255,7 @@ NSArray *CYCastNSArray(JSContextRef context, JSPropertyNameArrayRef names) {
     size_t size(JSPropertyNameArrayGetCount(names));
     NSMutableArray *array([NSMutableArray arrayWithCapacity:size]);
     for (size_t index(0); index != size; ++index)
-        [array addObject:CYCastNSString(pool, context, JSPropertyNameArrayGetNameAtIndex(names, index))];
+        [array addObject:CYCastNSString(&pool, context, JSPropertyNameArrayGetNameAtIndex(names, index))];
     return array;
 }
 
@@ -1144,7 +1268,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 
 @implementation CYJSObject
 
-- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry {
+- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry_ {
     if ((self = [super init]) != nil) {
         object_ = object;
         context_ = CYGetJSContext(context);
@@ -1159,58 +1283,54 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
     [super dealloc];
 } CYObjectiveCatch }
 
-- (NSString *) cy$toCYON:(bool)objective { CYObjectiveTry {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects { CYObjectiveTry {
     CYPool pool;
-    JSValueRef exception(NULL);
-    const char *cyon(CYPoolCCYON(pool, context_, object_));
-    CYThrow(context_, exception);
+    const char *cyon(CYPoolCCYON(pool, context, object_, objects));
     if (cyon == NULL)
-        return [super cy$toCYON:objective];
+        return [super cy$toCYON:objective inSet:objects];
     else
         return [NSString stringWithUTF8String:cyon];
 } CYObjectiveCatch }
 
 - (NSUInteger) count { CYObjectiveTry {
-    JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context_, object_));
+    JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context, object_));
     size_t size(JSPropertyNameArrayGetCount(names));
     JSPropertyNameArrayRelease(names);
     return size;
 } CYObjectiveCatch }
 
 - (id) objectForKey:(id)key { CYObjectiveTry {
-    JSValueRef value(CYGetProperty(context_, object_, CYJSString(context_, (NSObject *) key)));
-    if (JSValueIsUndefined(context_, value))
+    JSValueRef value(CYGetProperty(context, object_, CYJSString(context, (NSObject *) key)));
+    if (JSValueIsUndefined(context, value))
         return nil;
-    return CYCastNSObject(NULL, context_, value) ?: [NSNull null];
+    return CYCastNSObject(NULL, context, value) ?: [NSNull null];
 } CYObjectiveCatch }
 
 - (NSEnumerator *) keyEnumerator { CYObjectiveTry {
-    JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context_, object_));
-    NSEnumerator *enumerator([CYCastNSArray(context_, names) objectEnumerator]);
+    JSPropertyNameArrayRef names(JSObjectCopyPropertyNames(context, object_));
+    NSEnumerator *enumerator([CYCastNSArray(context, names) objectEnumerator]);
     JSPropertyNameArrayRelease(names);
     return enumerator;
 } CYObjectiveCatch }
 
 - (void) setObject:(id)object forKey:(id)key { CYObjectiveTry {
-    CYSetProperty(context_, object_, CYJSString(context_, (NSObject *) key), CYCastJSValue(context_, (NSString *) object));
+    CYSetProperty(context, object_, CYJSString(context, (NSObject *) key), CYCastJSValue(context, (NSString *) object));
 } CYObjectiveCatch }
 
 - (void) removeObjectForKey:(id)key { CYObjectiveTry {
-    JSValueRef exception(NULL);
-    (void) JSObjectDeleteProperty(context_, object_, CYJSString(context_, (NSObject *) key), &exception);
-    CYThrow(context_, exception);
+    (void) _jsccall(JSObjectDeleteProperty, context, object_, CYJSString(context, (NSObject *) key));
 } CYObjectiveCatch }
 
 @end
 
 @implementation CYJSArray
 
-- (NSString *) cy$toCYON:(bool)objective {
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects { CYObjectiveTry {
     CYPool pool;
-    return [NSString stringWithUTF8String:CYPoolCCYON(pool, context_, object_)];
-}
+    return [NSString stringWithUTF8String:CYPoolCCYON(pool, context, object_, objects)];
+} CYObjectiveCatch }
 
-- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry {
+- (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry_ {
     if ((self = [super init]) != nil) {
         object_ = object;
         context_ = CYGetJSContext(context);
@@ -1226,62 +1346,54 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 } CYObjectiveCatch }
 
 - (NSUInteger) count { CYObjectiveTry {
-    return CYArrayLength(context_, object_);
+    return CYArrayLength(context, object_);
 } CYObjectiveCatch }
 
 - (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry {
     size_t bounds([self count]);
     if (index >= bounds)
-        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray objectAtIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];
-    JSValueRef exception(NULL);
-    JSValueRef value(JSObjectGetPropertyAtIndex(context_, object_, index, &exception));
-    CYThrow(context_, exception);
-    return CYCastNSObject(NULL, context_, value) ?: [NSNull null];
+        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray objectAtIndex:]: index (%zu) beyond bounds (%zu)", static_cast<size_t>(index), bounds] userInfo:nil];
+    JSValueRef value(_jsccall(JSObjectGetPropertyAtIndex, context, object_, index));
+    return CYCastNSObject(NULL, context, value) ?: [NSNull null];
 } CYObjectiveCatch }
 
 - (void) addObject:(id)object { CYObjectiveTry {
-    CYArrayPush(context_, object_, CYCastJSValue(context_, (NSObject *) object));
+    CYArrayPush(context, object_, CYCastJSValue(context, (NSObject *) object));
 } CYObjectiveCatch }
 
 - (void) insertObject:(id)object atIndex:(NSUInteger)index { CYObjectiveTry {
     size_t bounds([self count] + 1);
     if (index >= bounds)
-        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray insertObject:atIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];
-    JSValueRef exception(NULL);
+        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray insertObject:atIndex:]: index (%zu) beyond bounds (%zu)", static_cast<size_t>(index), bounds] userInfo:nil];
     JSValueRef arguments[3];
-    arguments[0] = CYCastJSValue(context_, index);
-    arguments[1] = CYCastJSValue(context_, 0);
-    arguments[2] = CYCastJSValue(context_, (NSObject *) object);
-    JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype")));
-    JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 3, arguments, &exception);
-    CYThrow(context_, exception);
+    arguments[0] = CYCastJSValue(context, index);
+    arguments[1] = CYCastJSValue(context, 0);
+    arguments[2] = CYCastJSValue(context, (NSObject *) object);
+    JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));
+    _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, splice_s)), object_, 3, arguments);
 } CYObjectiveCatch }
 
 - (void) removeLastObject { CYObjectiveTry {
-    JSValueRef exception(NULL);
-    JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype")));
-    JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, pop_s)), object_, 0, NULL, &exception);
-    CYThrow(context_, exception);
+    JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));
+    _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, pop_s)), object_, 0, NULL);
 } CYObjectiveCatch }
 
 - (void) removeObjectAtIndex:(NSUInteger)index { CYObjectiveTry {
     size_t bounds([self count]);
     if (index >= bounds)
-        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray removeObjectAtIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];
-    JSValueRef exception(NULL);
+        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray removeObjectAtIndex:]: index (%zu) beyond bounds (%zu)", static_cast<size_t>(index), bounds] userInfo:nil];
     JSValueRef arguments[2];
-    arguments[0] = CYCastJSValue(context_, index);
-    arguments[1] = CYCastJSValue(context_, 1);
-    JSObjectRef Array(CYGetCachedObject(context_, CYJSString("Array_prototype")));
-    JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 2, arguments, &exception);
-    CYThrow(context_, exception);
+    arguments[0] = CYCastJSValue(context, index);
+    arguments[1] = CYCastJSValue(context, 1);
+    JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));
+    _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, splice_s)), object_, 2, arguments);
 } CYObjectiveCatch }
 
 - (void) replaceObjectAtIndex:(NSUInteger)index withObject:(id)object { CYObjectiveTry {
     size_t bounds([self count]);
     if (index >= bounds)
-        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray replaceObjectAtIndex:withObject:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];
-    CYSetProperty(context_, object_, index, CYCastJSValue(context_, (NSObject *) object));
+        @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray replaceObjectAtIndex:withObject:]: index (%zu) beyond bounds (%zu)", static_cast<size_t>(index), bounds] userInfo:nil];
+    CYSetProperty(context, object_, index, CYCastJSValue(context, (NSObject *) object));
 } CYObjectiveCatch }
 
 @end
@@ -1296,18 +1408,18 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 
 @implementation CYInternal
 
-- (void) dealloc {
+- (void) dealloc { CYObjectiveTry {
     JSValueUnprotect(context_, object_);
     JSGlobalContextRelease(context_);
     [super dealloc];
-}
+} CYObjectiveCatch }
 
-- (id) initInContext:(JSContextRef)context {
+- (id) initInContext:(JSContextRef)context { CYObjectiveTry_ {
     if ((self = [super init]) != nil) {
         context_ = CYGetJSContext(context);
         JSGlobalContextRetain(context_);
     } return self;
-}
+} CYObjectiveCatch }
 
 - (bool) hasProperty:(JSStringRef)name inContext:(JSContextRef)context {
     if (object_ == NULL)
@@ -1376,8 +1488,10 @@ static SEL CYCastSEL(JSContextRef context, JSValueRef value) {
     if (JSValueIsObjectOfClass(context, value, Selector_)) {
         Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate((JSObjectRef) value)));
         return reinterpret_cast<SEL>(internal->value_);
-    } else
-        return CYCastPointer<SEL>(context, value);
+    } else {
+        CYPool pool;
+        return sel_registerName(CYPoolCString(pool, context, value));
+    }
 }
 
 void *CYObjectiveC_ExecuteStart(JSContextRef context) { CYSadTry {
@@ -1402,10 +1516,50 @@ static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (
     ffi_call(cif, function, value, values);
 } CYSadCatch() }
 
-static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry {
+static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef value, sig::Signature *signature) {
+    if (JSValueIsNull(context, value))
+        return nil;
+    JSObjectRef object(CYCastJSObject(context, value));
+
+    if (JSValueIsObjectOfClass(context, object, FunctionInstance_))
+        return reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->GetValue();
+
+    if (JSValueIsObjectOfClass(context, object, Instance_)) {
+        _assert(reinterpret_cast<Instance *>(JSObjectGetPrivate(object))->GetValue() == nil);
+        return nil;
+    }
+
+    _assert(JSObjectIsFunction(context, object));
+
+    _assert(signature != NULL);
+    _assert(signature->count != 0);
+
+    sig::Signature modified;
+    modified.count = signature->count + 1;
+    modified.elements = new(pool) sig::Element[modified.count];
+
+    modified.elements[0] = signature->elements[0];
+    memcpy(modified.elements + 2, signature->elements + 1, sizeof(sig::Element) * (signature->count - 1));
+
+    modified.elements[1].name = NULL;
+    modified.elements[1].type = new(pool) sig::Type();
+    modified.elements[1].offset = _not(size_t);
+
+    memset(modified.elements[1].type, 0, sizeof(sig::Type));
+    modified.elements[1].type->primitive = sig::object_P;
+
+    return CYMakeBlock(context, object, modified);
+}
+
+static bool CYObjectiveC_PoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry {
+    // XXX: assigning to an indirect id * works for return values, but not for properties and fields
+
     switch (type->primitive) {
-        // XXX: do something epic about blocks
         case sig::block_P:
+            // XXX: this function might not handle the idea of a null pool
+            *reinterpret_cast<id *>(data) = CYCastNSBlock(*pool, context, value, &type->data.signature);
+        break;
+
         case sig::object_P:
         case sig::typename_P:
             *reinterpret_cast<id *>(data) = CYCastNSObject(pool, context, value);
@@ -1467,39 +1621,13 @@ static bool CYImplements(id object, Class _class, SEL selector, bool devoid = fa
     return false;
 }
 
-static const char *CYPoolTypeEncoding(apr_pool_t *pool, JSContextRef context, SEL sel, objc_method *method) {
-    if (method != NULL)
-        return method_getTypeEncoding(method);
-
-    const char *name(sel_getName(sel));
-    size_t length(strlen(name));
-
-    char keyed[length + 2];
-    keyed[0] = '6';
-    keyed[length + 1] = '\0';
-    memcpy(keyed + 1, name, length);
-
-    if (CYBridgeEntry *entry = CYBridgeHash(keyed, length + 1))
-        return entry->value_;
-
-    return NULL;
+static JSValueRef MessageAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) {
+    JSObjectRef _this(CYCastJSObject(context, values[0]));
+    return CYCallAsFunction(context, function, _this, count - 2, values + 2);
 }
 
 static void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
-    Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg));
-
-    JSContextRef context(internal->context_);
-
-    size_t count(internal->cif_.nargs);
-    JSValueRef values[count];
-
-    for (size_t index(0); index != count; ++index)
-        values[index] = CYFromFFI(context, internal->signature_.elements[1 + index].type, internal->cif_.arg_types[index], arguments[index]);
-
-    JSObjectRef _this(CYCastJSObject(context, values[0]));
-
-    JSValueRef value(CYCallAsFunction(context, internal->function_, _this, count - 2, values + 2));
-    CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value);
+    CYExecuteClosure(cif, result, arguments, arg, &MessageAdapter_);
 }
 
 static JSObjectRef CYMakeMessage(JSContextRef context, SEL sel, IMP imp, const char *type) {
@@ -1507,9 +1635,12 @@ static JSObjectRef CYMakeMessage(JSContextRef context, SEL sel, IMP imp, const c
     return JSObjectMake(context, Message_, internal);
 }
 
-static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *type) {
+static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *encoding) {
     JSObjectRef function(CYCastJSObject(context, value));
-    Closure_privateData *internal(CYMakeFunctor_(context, function, type, &MessageClosure_));
+    CYPool pool;
+    sig::Signature signature;
+    sig::Parse(pool, &signature, encoding, &Structor_);
+    Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &MessageClosure_));
     // XXX: see notes in Library.cpp about needing to leak
     return reinterpret_cast<IMP>(internal->GetValue());
 }
@@ -1528,7 +1659,7 @@ static bool Messages_hasProperty(JSContextRef context, JSObjectRef object, JSStr
     return false;
 }
 
-static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
     Class _class(internal->GetValue());
 
@@ -1540,19 +1671,16 @@ static JSValueRef Messages_getProperty(JSContextRef context, JSObjectRef object,
             return CYMakeMessage(context, sel, method_getImplementation(method), method_getTypeEncoding(method));
 
     return NULL;
-}
+} CYCatch(NULL) }
 
-static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) {
+static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
     Class _class(internal->GetValue());
 
     CYPool pool;
     const char *name(CYPoolCString(pool, context, property));
-
     SEL sel(sel_registerName(name));
 
-    objc_method *method(class_getInstanceMethod(_class, sel));
-
     const char *type;
     IMP imp;
 
@@ -1560,10 +1688,29 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
         Message_privateData *message(reinterpret_cast<Message_privateData *>(JSObjectGetPrivate((JSObjectRef) value)));
         type = sig::Unparse(pool, &message->signature_);
         imp = reinterpret_cast<IMP>(message->GetValue());
-    } else {
-        type = CYPoolTypeEncoding(pool, context, sel, method);
+    } else if (objc_method *method = class_getInstanceMethod(_class, sel)) {
+        type = method_getTypeEncoding(method);
         imp = CYMakeMessage(context, value, type);
-    }
+    } else _assert(false);
+
+    objc_method *method(NULL);
+#if OBJC_API_VERSION >= 2
+    unsigned int size;
+    objc_method **methods(class_copyMethodList(_class, &size));
+    for (size_t i(0); i != size; ++i)
+        if (sel_isEqual(method_getName(methods[i]), sel)) {
+            method = methods[i];
+            break;
+        }
+    free(methods);
+#else
+    for (objc_method_list *methods(_class->methods); methods != NULL; methods = methods->method_next)
+        for (int i(0); i != methods->method_count; ++i)
+            if (sel_isEqual(method_getName(&methods->method_list[i]), sel)) {
+                method = &methods->method_list[i];
+                break;
+            }
+#endif
 
     if (method != NULL)
         method_setImplementation(method, imp);
@@ -1579,10 +1726,10 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
     }
 
     return true;
-}
+} CYCatch(false) }
 
 #if 0 && OBJC_API_VERSION < 2
-static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
     Class _class(internal->GetValue());
 
@@ -1597,7 +1744,7 @@ static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JS
         }
 
     return false;
-}
+} CYCatch(false) }
 #endif
 
 static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
@@ -1632,7 +1779,7 @@ static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStr
         return true;
 
     CYPool pool;
-    NSString *name(CYCastNSString(pool, context, property));
+    NSString *name(CYCastNSString(&pool, context, property));
 
     if (CYInternal *internal = [CYInternal get:self])
         if ([internal hasProperty:property inContext:context])
@@ -1670,7 +1817,7 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object,
         return Internal::Make(context, self, object);
 
     CYPool pool;
-    NSString *name(CYCastNSString(pool, context, property));
+    NSString *name(CYCastNSString(&pool, context, property));
 
     if (CYInternal *internal = [CYInternal get:self])
         if (JSValueRef value = [internal getProperty:property inContext:context])
@@ -1688,17 +1835,17 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object,
     if (objc_property_t property = class_getProperty(_class, string)) {
         PropertyAttributes attributes(property);
         SEL sel(sel_registerName(attributes.Getter()));
-        return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception);
+        return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false);
     }
 #endif
 
     if (CYHasImplicitProperties(_class))
         if (SEL sel = sel_getUid(string))
             if (CYImplements(self, _class, sel, true))
-                return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception);
+                return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false);
 
     return NULL;
-} CYCatch }
+} CYCatch(NULL) }
 
 static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
@@ -1706,13 +1853,13 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
 
     CYPool pool;
 
-    NSString *name(CYCastNSString(pool, context, property));
-    NSObject *data(CYCastNSObject(pool, context, value));
+    NSString *name(CYCastNSString(&pool, context, property));
+    NSObject *data(CYCastNSObject(&pool, context, value));
 
     CYPoolTry {
         if ([self cy$setProperty:name to:data])
             return true;
-    } CYPoolCatch(NULL)
+    } CYPoolCatch(false)
 
     const char *string(CYPoolCString(pool, context, name));
     Class _class(object_getClass(self));
@@ -1723,7 +1870,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
         if (const char *setter = attributes.Setter()) {
             SEL sel(sel_registerName(setter));
             JSValueRef arguments[1] = {value};
-            CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception);
+            CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false);
             return true;
         }
     }
@@ -1748,7 +1895,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
     if (SEL sel = sel_getUid(set))
         if (CYImplements(self, _class, sel)) {
             JSValueRef arguments[1] = {value};
-            CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false, exception);
+            CYSendMessage(pool, context, self, NULL, sel, 1, arguments, false);
             return true;
         }
 
@@ -1758,7 +1905,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
     }
 
     return false;
-} CYCatch }
+} CYCatch(false) }
 
 static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
@@ -1767,8 +1914,8 @@ static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JS
     CYPoolTry {
         NSString *name(CYCastNSString(NULL, context, property));
         return [self cy$deleteProperty:name];
-    } CYPoolCatch(NULL)
-} CYCatch return /*XXX*/ NULL; }
+    } CYPoolCatch(false)
+} CYCatch(false) return /*XXX*/ false; }
 
 static void Instance_getPropertyNames_message(JSPropertyNameAccumulatorRef names, objc_method *method) {
     const char *name(sel_getName(method_getName(method)));
@@ -1825,77 +1972,39 @@ static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     JSObjectRef value(Instance::Make(context, [internal->GetValue() alloc], Instance::Uninitialized));
     return value;
-} CYCatch }
+} CYCatch(NULL) }
 
-static JSValueRef Instance_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+static const char *CYBlockEncoding(NSBlock *self) {
+    BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(self));
+    if ((literal->flags & BLOCK_HAS_SIGNATURE) == 0)
+        return NULL;
+    uint8_t *descriptor(reinterpret_cast<uint8_t *>(literal->descriptor));
+    descriptor += sizeof(BlockDescriptor1);
+    if ((literal->flags & BLOCK_HAS_COPY_DISPOSE) != 0)
+        descriptor += sizeof(BlockDescriptor2);
+    BlockDescriptor3 *descriptor3(reinterpret_cast<BlockDescriptor3 *>(descriptor));
+    return descriptor3->signature;
+}
+
+static JSValueRef FunctionInstance_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->GetValue());
 
-    if (![self isKindOfClass:NSBlock_])
-        CYThrow("non-NSBlock object is not a function");
-    // XXX: replace above logic with the following assertion
-    //_assert([self isKindOfClass:NSBlock_]);
-    // to do this, make it so FunctionInstance_ is the class of blocks
-    // to do /that/, generalize the various "is exactly Instance_" checks
-    // then, move Instance_callAsFunction to only be on FunctionInstance
-
-    struct BlockDescriptor1 {
-        unsigned long int reserved;
-        unsigned long int size;
-    };
-
-    struct BlockDescriptor2 {
-        void (*copy_helper)(void *dst, void *src);
-        void (*dispose_helper)(void *src);
-    };
-
-    struct BlockDescriptor3 {
-        const char *signature;
-        const char *layout;
-    };
-
-    struct BlockLiteral {
-        Class isa;
-        int flags;
-        int reserved;
-        void (*invoke)(void *, ...);
-        void *descriptor;
-    } *literal = reinterpret_cast<BlockLiteral *>(self);
-
-    enum {
-        BLOCK_DEALLOCATING = 0x0001,
-        BLOCK_REFCOUNT_MASK = 0xfffe,
-        BLOCK_NEEDS_FREE = 1 << 24,
-        BLOCK_HAS_COPY_DISPOSE = 1 << 25,
-        BLOCK_HAS_CTOR = 1 << 26,
-        BLOCK_IS_GC = 1 << 27,
-        BLOCK_IS_GLOBAL = 1 << 28,
-        BLOCK_HAS_STRET = 1 << 29,
-        BLOCK_HAS_SIGNATURE = 1 << 30,
-    };
-
-    if ((literal->flags & BLOCK_HAS_SIGNATURE) != 0) {
-        uint8_t *descriptor(reinterpret_cast<uint8_t *>(literal->descriptor));
-        descriptor += sizeof(BlockDescriptor1);
-        if ((literal->flags & BLOCK_HAS_COPY_DISPOSE) != 0)
-            descriptor += sizeof(BlockDescriptor2);
-        BlockDescriptor3 *descriptor3(reinterpret_cast<BlockDescriptor3 *>(descriptor));
-
-        if (const char *type = descriptor3->signature) {
-            CYPool pool;
-
-            void *setup[1];
-            setup[0] = &self;
-
-            sig::Signature signature;
-            sig::Parse(pool, &signature, type, &Structor_);
-
-            ffi_cif cif;
-            sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
-
-            void (*function)() = reinterpret_cast<void (*)()>(literal->invoke);
-            return CYCallFunction(pool, context, 1, setup, count, arguments, false, exception, &signature, &cif, function);
-        }
+    if (const char *encoding = CYBlockEncoding(self)) {
+        CYPool pool;
+
+        void *setup[1];
+        setup[0] = &self;
+
+        sig::Signature signature;
+        sig::Parse(pool, &signature, encoding, &Structor_);
+
+        ffi_cif cif;
+        sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
+
+        BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(self));
+        void (*function)() = reinterpret_cast<void (*)()>(literal->invoke);
+        return CYCallFunction(pool, context, 1, setup, count, arguments, false, &signature, &cif, function);
     }
 
     if (count != 0)
@@ -1906,7 +2015,7 @@ static JSValueRef Instance_callAsFunction(JSContextRef context, JSObjectRef obje
     } CYPoolCatch(NULL);
 
     return NULL;
-} CYCatch }
+} CYCatch(NULL) }
 
 static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate((JSObjectRef) constructor)));
@@ -1921,17 +2030,17 @@ static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor,
     }
 
     return false;
-} CYCatch }
+} CYCatch(false) }
 
 static JSValueRef Instance_box_callAsFunction(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 Instance");
     CYPool pool;
-    id value(CYCastNSObject(pool, context, arguments[0]));
+    id value(CYCastNSObject(&pool, context, arguments[0]));
     if (value == nil)
         value = [NSNull null];
     return CYCastJSValue(context, [value cy$box]);
-} CYCatch }
+} CYCatch(NULL) }
 
 static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
@@ -1946,6 +2055,24 @@ static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStr
     return false;
 }
 
+static void CYBitField(unsigned &length, unsigned &shift, id self, Ivar ivar, const char *encoding, unsigned offset) {
+    length = CYCastDouble(encoding + 1);
+    shift = 0;
+
+    unsigned int size;
+    objc_ivar **ivars(class_copyIvarList(object_getClass(self), &size));
+    for (size_t i(0); i != size; ++i)
+        if (ivars[i] == ivar)
+            break;
+        else if (ivar_getOffset(ivars[i]) == offset) {
+            const char *encoding(ivar_getTypeEncoding(ivars[i]));
+            _assert(encoding != NULL);
+            _assert(encoding[0] == 'b');
+            shift += CYCastDouble(encoding + 1);
+        }
+    free(ivars);
+}
+
 static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
     CYPool pool;
@@ -1953,14 +2080,32 @@ static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object,
     id self(internal->GetValue());
     const char *name(CYPoolCString(pool, context, property));
 
+#ifdef __arm64__
+    if (strcmp(name, "isa") == 0)
+        return CYCastJSValue(context, object_getClass(self));
+#endif
+
     if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {
-        Type_privateData type(pool, ivar_getTypeEncoding(ivar));
-        // XXX: if this fails and throws an exception the person we are throwing it to gets the wrong exception
-        return CYFromFFI(context, type.type_, type.GetFFI(), reinterpret_cast<uint8_t *>(self) + ivar_getOffset(ivar));
+        ptrdiff_t offset(ivar_getOffset(ivar));
+        void *data(reinterpret_cast<uint8_t *>(self) + offset);
+
+        const char *encoding(ivar_getTypeEncoding(ivar));
+        _assert(encoding != NULL);
+        if (encoding[0] == 'b') {
+            unsigned length, shift;
+            CYBitField(length, shift, self, ivar, encoding, offset);
+            _assert(shift + length <= sizeof(uintptr_t) * 8);
+            uintptr_t &field(*reinterpret_cast<uintptr_t *>(data));
+            uintptr_t mask((1 << length) - 1);
+            return CYCastJSValue(context, (field >> shift) & mask);
+        } else {
+            auto type(new(pool) Type_privateData(ivar_getTypeEncoding(ivar)));
+            return CYFromFFI(context, type->type_, type->GetFFI(), data);
+        }
     }
 
     return NULL;
-} CYCatch }
+} CYCatch(NULL) }
 
 static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
@@ -1970,13 +2115,27 @@ static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStr
     const char *name(CYPoolCString(pool, context, property));
 
     if (objc_ivar *ivar = object_getInstanceVariable(self, name, NULL)) {
-        Type_privateData type(pool, ivar_getTypeEncoding(ivar));
-        CYPoolFFI(pool, context, type.type_, type.GetFFI(), reinterpret_cast<uint8_t *>(self) + ivar_getOffset(ivar), value);
-        return true;
+        ptrdiff_t offset(ivar_getOffset(ivar));
+        void *data(reinterpret_cast<uint8_t *>(self) + offset);
+
+        const char *encoding(ivar_getTypeEncoding(ivar));
+        _assert(encoding != NULL);
+        if (encoding[0] == 'b') {
+            unsigned length, shift;
+            CYBitField(length, shift, self, ivar, encoding, offset);
+            _assert(shift + length <= sizeof(uintptr_t) * 8);
+            uintptr_t &field(*reinterpret_cast<uintptr_t *>(data));
+            uintptr_t mask((1 << length) - 1);
+            field = field & ~(mask << shift) | (uintptr_t(CYCastDouble(context, value)) & mask) << shift;
+        } else {
+            auto type(new(pool) Type_privateData(ivar_getTypeEncoding(ivar)));
+            CYPoolFFI(&pool, context, type->type_, type->GetFFI(), reinterpret_cast<uint8_t *>(self) + ivar_getOffset(ivar), value);
+            return true;
+        }
     }
 
     return false;
-} CYCatch }
+} CYCatch(false) }
 
 static void Internal_getPropertyNames_(Class _class, JSPropertyNameAccumulatorRef names) {
     if (Class super = class_getSuperclass(_class))
@@ -2005,39 +2164,56 @@ static void Internal_getPropertyNames(JSContextRef context, JSObjectRef object,
     Internal_getPropertyNames_(_class, names);
 }
 
-static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     Internal *internal(reinterpret_cast<Internal *>(JSObjectGetPrivate(object)));
     return internal->GetOwner();
+} CYCatch(NULL) }
+
+static bool ObjectiveC_Classes_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
+    CYPool pool;
+    return objc_getClass(CYPoolCString(pool, context, property)) != Nil;
 }
 
 static JSValueRef ObjectiveC_Classes_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     CYPool pool;
-    NSString *name(CYCastNSString(pool, context, property));
+    NSString *name(CYCastNSString(&pool, context, property));
     if (Class _class = NSClassFromString(name))
         return CYMakeInstance(context, _class, true);
     return NULL;
-} CYCatch }
+} CYCatch(NULL) }
 
-static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
 #ifdef __APPLE__
-    size_t size(objc_getClassList(NULL, 0));
+static Class *CYCopyClassList(size_t &size) {
+    size = objc_getClassList(NULL, 0);
     Class *data(reinterpret_cast<Class *>(malloc(sizeof(Class) * size)));
 
-  get:
-    size_t writ(objc_getClassList(data, size));
-    if (size < writ) {
+    for (;;) {
+        size_t writ(objc_getClassList(data, size));
+        if (writ <= size) {
+            size = writ;
+            return data;
+        }
+
+        Class *copy(reinterpret_cast<Class *>(realloc(data, sizeof(Class) * writ)));
+        if (copy == NULL) {
+            free(data);
+            return NULL;
+        }
+
+        data = copy;
         size = writ;
-        if (Class *copy = reinterpret_cast<Class *>(realloc(data, sizeof(Class) * writ))) {
-            data = copy;
-            goto get;
-        } else goto done;
     }
+}
+#endif
 
-    for (size_t i(0); i != writ; ++i)
-        JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(data[i])));
-
-  done:
-    free(data);
+static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
+#ifdef __APPLE__
+    size_t size;
+    if (Class *data = CYCopyClassList(size)) {
+        for (size_t i(0); i != size; ++i)
+            JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(data[i])));
+        free(data);
+    }
 #else
     void *state(NULL);
     while (Class _class = objc_next_class(&state))
@@ -2066,7 +2242,7 @@ static JSValueRef ObjectiveC_Image_Classes_getProperty(JSContextRef context, JSO
   free:
     free(data);
     return value;
-} CYCatch }
+} CYCatch(NULL) }
 
 static void ObjectiveC_Image_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     const char *internal(reinterpret_cast<const char *>(JSObjectGetPrivate(object)));
@@ -2095,7 +2271,7 @@ static JSValueRef ObjectiveC_Images_getProperty(JSContextRef context, JSObjectRe
     JSObjectRef value(JSObjectMake(context, NULL, NULL));
     CYSetProperty(context, value, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Image_Classes_, const_cast<char *>(name)));
     return value;
-} CYCatch }
+} CYCatch(NULL) }
 
 static void ObjectiveC_Images_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     unsigned int size;
@@ -2112,7 +2288,7 @@ static JSValueRef ObjectiveC_Protocols_getProperty(JSContextRef context, JSObjec
     if (Protocol *protocol = objc_getProtocol(name))
         return CYMakeInstance(context, protocol, true);
     return NULL;
-} CYCatch }
+} CYCatch(NULL) }
 
 static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
 #if OBJC_API_VERSION >= 2
@@ -2132,13 +2308,126 @@ static JSValueRef ObjectiveC_Constants_getProperty(JSContextRef context, JSObjec
     if (name == "nil")
         return Instance::Make(context, nil);
     return NULL;
-} CYCatch }
+} CYCatch(NULL) }
 
 static void ObjectiveC_Constants_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     JSPropertyNameAccumulatorAddName(names, CYJSString("nil"));
 }
 
 #ifdef __APPLE__
+static kern_return_t CYReadMemory(task_t task, vm_address_t address, vm_size_t size, void **data) {
+    *data = reinterpret_cast<void *>(address);
+    return KERN_SUCCESS;
+}
+
+struct CYChoice {
+    std::set<Class> query_;
+    JSContextRef context_;
+    JSObjectRef results_;
+};
+
+struct CYObjectStruct {
+    Class isa_;
+};
+
+static void choose_(task_t task, void *baton, unsigned type, vm_range_t *ranges, unsigned count) {
+    CYChoice *choice(reinterpret_cast<CYChoice *>(baton));
+    JSContextRef context(choice->context_);
+
+    for (unsigned i(0); i != count; ++i) {
+        vm_range_t &range(ranges[i]);
+        void *data(reinterpret_cast<void *>(range.address));
+        size_t size(range.size);
+
+        if (size < sizeof(CYObjectStruct))
+            continue;
+
+        uintptr_t *pointers(reinterpret_cast<uintptr_t *>(data));
+#ifdef __arm64__
+        Class isa(reinterpret_cast<Class>(pointers[0] & 0x1fffffff8));
+#else
+        Class isa(reinterpret_cast<Class>(pointers[0]));
+#endif
+
+        std::set<Class>::const_iterator result(choice->query_.find(isa));
+        if (result == choice->query_.end())
+            continue;
+
+        size_t needed(class_getInstanceSize(*result));
+        // XXX: if (size < needed)
+
+        size_t boundary(496);
+#ifdef __LP64__
+        boundary *= 2;
+#endif
+        if (needed <= boundary && (needed + 15) / 16 * 16 != size || needed > boundary && (needed + 511) / 512 * 512 != size)
+            continue;
+        CYArrayPush(context, choice->results_, CYCastJSValue(context, reinterpret_cast<id>(data)));
+    }
+}
+
+static JSValueRef choose(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    if (count != 1)
+        throw CYJSError(context, "choose() takes a class argument");
+
+    CYGarbageCollect(context);
+
+    CYPool pool;
+    Class _class(CYCastNSObject(&pool, context, arguments[0]));
+
+    vm_address_t *zones(NULL);
+    unsigned size(0);
+    kern_return_t error(malloc_get_all_zones(0, &CYReadMemory, &zones, &size));
+    _assert(error == KERN_SUCCESS);
+
+    JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array")));
+    JSObjectRef results(_jsccall(JSObjectCallAsConstructor, context, Array, 0, NULL));
+
+    CYChoice choice;
+    choice.context_ = context;
+    choice.results_ = results;
+
+    size_t number;
+    Class *classes(CYCopyClassList(number));
+    _assert(classes != NULL);
+
+    for (size_t i(0); i != number; ++i)
+        for (Class current(classes[i]); current != Nil; current = class_getSuperclass(current))
+            if (current == _class) {
+                choice.query_.insert(classes[i]);
+                break;
+            }
+
+    free(classes);
+
+    for (unsigned i(0); i != size; ++i) {
+        const malloc_zone_t *zone(reinterpret_cast<const malloc_zone_t *>(zones[i]));
+        if (zone == NULL || zone->introspect == NULL)
+            continue;
+
+        zone->introspect->enumerator(mach_task_self(), &choice, MALLOC_PTR_IN_USE_RANGE_TYPE, zones[i], &CYReadMemory, &choose_);
+    }
+
+    return results;
+} CYCatch(NULL) }
+#endif
+
+#ifdef __APPLE__
+#if defined(__i386__) || defined(__x86_64__)
+#define OBJC_MAX_STRUCT_BY_VALUE 8
+static int struct_forward_array[] = {
+    0, 0, 0, 1, 0, 1, 1, 1, 0 };
+#elif defined(__arm__)
+#define OBJC_MAX_STRUCT_BY_VALUE 1
+static int struct_forward_array[] = {
+    0, 0 };
+#elif defined(__arm64__)
+#define CY_NO_STRET
+#else
+#error missing objc-runtime-info
+#endif
+
+#ifndef CY_NO_STRET
 static bool stret(ffi_type *ffi_type) {
     return ffi_type->type == FFI_TYPE_STRUCT && (
         ffi_type->size > OBJC_MAX_STRUCT_BY_VALUE ||
@@ -2146,8 +2435,9 @@ static bool stret(ffi_type *ffi_type) {
     );
 }
 #endif
+#endif
 
-JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class _class, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception) { CYTry {
+JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _class, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize) {
     const char *type;
 
     if (_class == NULL)
@@ -2201,9 +2491,11 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class
 
     if (imp == NULL) {
 #ifdef __APPLE__
+#ifndef CY_NO_STRET
         if (stret(cif.rtype))
             imp = class_getMethodImplementation_stret(_class, _cmd);
         else
+#endif
             imp = class_getMethodImplementation(_class, _cmd);
 #else
         objc_super super = {self, _class};
@@ -2212,10 +2504,10 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class
     }
 
     void (*function)() = reinterpret_cast<void (*)()>(imp);
-    return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, exception, &signature, &cif, function);
-} CYCatch }
+    return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, &signature, &cif, function);
+}
 
-static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[]) {
     if (count < 2)
         throw CYJSError(context, "too few arguments to objc_msgSend");
 
@@ -2240,7 +2532,7 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
         if (uninitialized)
             internal->value_ = nil;
     } else {
-        self = CYCastNSObject(pool, context, arguments[0]);
+        self = CYCastNSObject(&pool, context, arguments[0]);
         _class = nil;
         uninitialized = false;
     }
@@ -2250,39 +2542,43 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
 
     _cmd = CYCastSEL(context, arguments[1]);
 
-    return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized, exception);
-} CYCatch }
+    return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized);
+}
+
+static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    return $objc_msgSend(context, object, _this, count, arguments);
+} CYCatch(NULL) }
 
-static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     JSValueRef setup[count + 2];
     setup[0] = _this;
     setup[1] = object;
     memcpy(setup + 2, arguments, sizeof(JSValueRef) * count);
-    return $objc_msgSend(context, NULL, NULL, count + 2, setup, exception);
-}
+    return $objc_msgSend(context, NULL, NULL, count + 2, setup);
+} CYCatch(NULL) }
 
-static JSValueRef Message_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+static JSValueRef Message_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     CYPool pool;
     Message_privateData *internal(reinterpret_cast<Message_privateData *>(JSObjectGetPrivate(object)));
 
     // XXX: handle Instance::Uninitialized?
-    id self(CYCastNSObject(pool, context, _this));
+    id self(CYCastNSObject(&pool, context, _this));
 
     void *setup[2];
     setup[0] = &self;
     setup[1] = &internal->sel_;
 
-    return CYCallFunction(pool, context, 2, setup, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue());
-}
+    return CYCallFunction(pool, context, 2, setup, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue());
+} CYCatch(NULL) }
 
 static JSObjectRef Super_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 2)
-        throw CYJSError(context, "incorrect number of arguments to Super constructor");
+        throw CYJSError(context, "incorrect number of arguments to objc_super constructor");
     CYPool pool;
-    id self(CYCastNSObject(pool, context, arguments[0]));
+    id self(CYCastNSObject(&pool, context, arguments[0]));
     Class _class(CYCastClass(pool, context, arguments[1]));
     return cy::Super::Make(context, self, _class);
-} CYCatch }
+} CYCatch(NULL) }
 
 static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 1)
@@ -2290,21 +2586,21 @@ static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t
     CYPool pool;
     const char *name(CYPoolCString(pool, context, arguments[0]));
     return CYMakeSelector(context, sel_registerName(name));
-} CYCatch }
+} CYCatch(NULL) }
 
 static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count > 1)
         throw CYJSError(context, "incorrect number of arguments to Instance constructor");
     id self(count == 0 ? nil : CYCastPointer<id>(context, arguments[0]));
     return CYMakeInstance(context, self, false);
-} CYCatch }
+} CYCatch(NULL) }
 
-static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(object)));
     return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->value_));
-}
+} CYCatch(NULL) }
 
-static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
+static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(_this)));
     Type_privateData *typical(internal->GetType());
 
@@ -2320,12 +2616,24 @@ static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef
     }
 
     return CYMakePointer(context, &internal->value_, _not(size_t), type, ffi, object);
-}
+} CYCatch(NULL) }
+
+static JSValueRef FunctionInstance_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+    Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
+    const char *encoding(CYBlockEncoding(internal->GetValue()));
+    if (encoding == NULL)
+        return CYJSNull(context);
+    // XXX: this should be stored on a FunctionInstance private value subclass
+    CYPool pool;
+    sig::Signature signature;
+    sig::Parse(pool, &signature, encoding, &Structor_);
+    return CYMakeType(context, &signature);
+} CYCatch(NULL) }
 
-static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     return Instance::Make(context, (id) object_getClass(internal->GetValue()));
-}
+} CYCatch(NULL) }
 
 static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
@@ -2333,23 +2641,25 @@ static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectR
     if (!CYIsClass(self))
         return CYJSUndefined(context);
     return CYGetClassPrototype(context, self);
-} CYCatch }
+} CYCatch(NULL) }
 
-static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
+static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
     id self(internal->GetValue());
     if (!CYIsClass(self))
         return CYJSUndefined(context);
     return Messages::Make(context, (Class) self);
-}
+} CYCatch(NULL) }
 
 static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    std::set<void *> *objects(CYCastObjects(context, _this, count, arguments));
+
     if (!CYJSValueIsNSObject(context, _this))
         return NULL;
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
-    return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue(), false)));
-} CYCatch }
+    return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue(), false, objects)));
+} CYCatch(NULL) }
 
 static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (!CYJSValueIsNSObject(context, _this))
@@ -2372,7 +2682,7 @@ static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectR
         else
             return CYCastJSValue(context, CYJSString(context, [value description]));
     } CYPoolCatch(NULL)
-} CYCatch return /*XXX*/ NULL; }
+} CYCatch(NULL) return /*XXX*/ NULL; }
 
 static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (!CYJSValueIsNSObject(context, _this))
@@ -2388,7 +2698,7 @@ static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObject
         return result;
 
     return _this;
-} CYCatch return /*XXX*/ NULL; }
+} CYCatch(NULL) return /*XXX*/ NULL; }
 
 static JSValueRef Instance_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (!CYJSValueIsNSObject(context, _this))
@@ -2397,7 +2707,7 @@ static JSValueRef Instance_callAsFunction_toPointer(JSContextRef context, JSObje
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
     // XXX: but... but... THIS ISN'T A POINTER! :(
     return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->GetValue()));
-} CYCatch return /*XXX*/ NULL; }
+} CYCatch(NULL) return /*XXX*/ NULL; }
 
 static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (!CYJSValueIsNSObject(context, _this))
@@ -2410,12 +2720,29 @@ static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjec
         // XXX: this seems like a stupid implementation; what if it crashes? why not use the CYONifier backend?
         return CYCastJSValue(context, CYJSString(context, [value description]));
     } CYPoolCatch(NULL)
-} CYCatch return /*XXX*/ NULL; }
+} CYCatch(NULL) return /*XXX*/ NULL; }
+
+static JSValueRef Class_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+    if (!CYJSValueIsNSObject(context, _this))
+        return NULL;
+
+    Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
+    id value(internal->GetValue());
+
+    if (!CYIsClass(value))
+        CYThrow("non-Class object cannot be used as Type");
+
+    sig::Type type;
+    memset(&type, 0, sizeof(type));
+    type.primitive = sig::object_P;
+    type.name = class_getName(value);
+    return CYMakeType(context, &type);
+} CYCatch(NULL) return /*XXX*/ NULL; }
 
 static JSValueRef Selector_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate(_this)));
     return CYCastJSValue(context, sel_getName(internal->GetValue()));
-} CYCatch }
+} CYCatch(NULL) }
 
 static JSValueRef Selector_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
     return Selector_callAsFunction_toString(context, object, _this, count, arguments, exception);
@@ -2429,7 +2756,7 @@ static JSValueRef Selector_callAsFunction_toCYON(JSContextRef context, JSObjectR
         NSString *string([NSString stringWithFormat:@"@selector(%s)", name]);
         return CYCastJSValue(context, CYJSString(context, string));
     } CYPoolCatch(NULL)
-} CYCatch return /*XXX*/ NULL; }
+} CYCatch(NULL) return /*XXX*/ NULL; }
 
 static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     if (count != 1)
@@ -2439,23 +2766,21 @@ static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef
     Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate(_this)));
     SEL sel(internal->GetValue());
 
-    objc_method *method;
-    if (Class _class = CYCastClass(pool, context, arguments[0]))
-        method = class_getInstanceMethod(_class, sel);
-    else
-        method = NULL;
-
-    if (const char *type = CYPoolTypeEncoding(pool, context, sel, method))
-        return CYCastJSValue(context, CYJSString(type));
+    Class _class(_require(CYCastClass(pool, context, arguments[0])));
+    objc_method *method(_require(class_getInstanceMethod(_class, sel)));
+    const char *encoding(method_getTypeEncoding(method));
 
-    return CYJSNull(context);
-} CYCatch }
+    sig::Signature signature;
+    sig::Parse(pool, &signature, encoding, &Structor_);
+    return CYMakeType(context, &signature);
+} CYCatch(NULL) }
 
 static JSStaticValue Selector_staticValues[2] = {
     {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete},
     {NULL, NULL, NULL, 0}
 };
 
+// XXX: this is sadly duplicated in FunctionInstance_staticValues
 static JSStaticValue Instance_staticValues[5] = {
     {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"messages", &Instance_getProperty_messages, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
@@ -2464,6 +2789,16 @@ static JSStaticValue Instance_staticValues[5] = {
     {NULL, NULL, NULL, 0}
 };
 
+static JSStaticValue FunctionInstance_staticValues[6] = {
+    {"type", &FunctionInstance_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    // XXX: this is sadly a duplicate of Instance_staticValues
+    {"constructor", &Instance_getProperty_constructor, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"messages", &Instance_getProperty_messages, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"prototype", &Instance_getProperty_prototype, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {NULL, NULL, NULL, 0}
+};
+
 static JSStaticFunction Instance_staticFunctions[7] = {
     {"$cya", &CYValue_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {"toCYON", &Instance_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
@@ -2474,6 +2809,11 @@ static JSStaticFunction Instance_staticFunctions[7] = {
     {NULL, NULL, 0}
 };
 
+static JSStaticFunction Class_staticFunctions[2] = {
+    {"pointerTo", &Class_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+    {NULL, NULL, 0}
+};
+
 static JSStaticFunction Internal_staticFunctions[2] = {
     {"$cya", &Internal_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
     {NULL, NULL, 0}
@@ -2488,7 +2828,7 @@ static JSStaticFunction Selector_staticFunctions[5] = {
 };
 
 #ifdef __APPLE__
-JSValueRef NSCFType$cy$toJSON$inContext$(id self, SEL sel, JSValueRef key, JSContextRef context) { CYObjectiveTry_(context) {
+JSValueRef NSCFType$cy$toJSON$inContext$(id self, SEL sel, JSValueRef key, JSContextRef context) { CYObjectiveTry_ {
     return CYCastJSValue(context, [(NSString *) CFCopyDescription((CFTypeRef) self) autorelease]);
 } CYObjectiveCatch }
 #endif
@@ -2498,31 +2838,33 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     $objc_getAssociatedObject = reinterpret_cast<id (*)(id, void *)>(dlsym(RTLD_DEFAULT, "objc_getAssociatedObject"));
     $objc_removeAssociatedObjects = reinterpret_cast<void (*)(id)>(dlsym(RTLD_DEFAULT, "objc_removeAssociatedObjects"));
 
-    apr_pool_t *pool(CYGetGlobalPool());
+    CYPool &pool(CYGetGlobalPool());
 
-    Object_type = new(pool) Type_privateData("@");
-    Selector_type = new(pool) Type_privateData(":");
+    Object_type = new(pool) Type_privateData(sig::object_P);
+    Selector_type = new(pool) Type_privateData(sig::selector_P);
+
+    NSArray_ = objc_getClass("NSArray");
+    NSBlock_ = objc_getClass("NSBlock");
+    NSDictionary_ = objc_getClass("NSDictionary");
+    NSNumber_ = objc_getClass("NSNumber");
+    NSString_ = objc_getClass("NSString");
+    Object_ = objc_getClass("Object");
 
 #ifdef __APPLE__
+    __NSMallocBlock__ = objc_getClass("__NSMallocBlock__");
+
     // XXX: apparently, iOS now has both of these
     NSCFBoolean_ = objc_getClass("__NSCFBoolean");
     if (NSCFBoolean_ == nil)
         NSCFBoolean_ = objc_getClass("NSCFBoolean");
 
     NSCFType_ = objc_getClass("NSCFType");
-    NSGenericDeallocHandler_ = objc_getClass("__NSGenericDeallocHandler");
-    NSMessageBuilder_ = objc_getClass("NSMessageBuilder");
+
     NSZombie_ = objc_getClass("_NSZombie_");
 #else
     NSBoolNumber_ = objc_getClass("NSBoolNumber");
 #endif
 
-    NSArray_ = objc_getClass("NSArray");
-    NSBlock_ = objc_getClass("NSBlock");
-    NSDictionary_ = objc_getClass("NSDictionary");
-    NSString_ = objc_getClass("NSString");
-    Object_ = objc_getClass("Object");
-
     JSClassDefinition definition;
 
     definition = kJSClassDefinitionEmpty;
@@ -2535,7 +2877,6 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     definition.deleteProperty = &Instance_deleteProperty;
     definition.getPropertyNames = &Instance_getPropertyNames;
     definition.callAsConstructor = &Instance_callAsConstructor;
-    definition.callAsFunction = &Instance_callAsFunction;
     definition.hasInstance = &Instance_hasInstance;
     definition.finalize = &CYFinalize;
     Instance_ = JSClassCreate(&definition);
@@ -2543,18 +2884,28 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     definition.className = "ArrayInstance";
     ArrayInstance_ = JSClassCreate(&definition);
 
+    definition.className = "BooleanInstance";
+    BooleanInstance_ = JSClassCreate(&definition);
+
+    definition.className = "NumberInstance";
+    NumberInstance_ = JSClassCreate(&definition);
+
     definition.className = "ObjectInstance";
     ObjectInstance_ = JSClassCreate(&definition);
 
     definition.className = "StringInstance";
     StringInstance_ = JSClassCreate(&definition);
 
-    definition.className = "TypeInstance";
-    TypeInstance_ = JSClassCreate(&definition);
-
     definition.className = "FunctionInstance";
+    definition.staticValues = FunctionInstance_staticValues;
+    definition.callAsFunction = &FunctionInstance_callAsFunction;
     FunctionInstance_ = JSClassCreate(&definition);
 
+    definition = kJSClassDefinitionEmpty;
+    definition.className = "Class";
+    definition.staticFunctions = Class_staticFunctions;
+    Class_ = JSClassCreate(&definition);
+
     definition = kJSClassDefinitionEmpty;
     definition.className = "Internal";
     definition.staticFunctions = Internal_staticFunctions;
@@ -2568,6 +2919,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     definition = kJSClassDefinitionEmpty;
     definition.className = "Message";
     definition.staticFunctions = cy::Functor::StaticFunctions;
+    definition.staticValues = cy::Functor::StaticValues;
     definition.callAsFunction = &Message_callAsFunction;
     definition.finalize = &CYFinalize;
     Message_ = JSClassCreate(&definition);
@@ -2600,6 +2952,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
 
     definition = kJSClassDefinitionEmpty;
     definition.className = "ObjectiveC::Classes";
+    definition.hasProperty = &ObjectiveC_Classes_hasProperty;
     definition.getProperty = &ObjectiveC_Classes_getProperty;
     definition.getPropertyNames = &ObjectiveC_Classes_getPropertyNames;
     ObjectiveC_Classes_ = JSClassCreate(&definition);
@@ -2631,7 +2984,14 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     ObjectiveC_Protocols_ = JSClassCreate(&definition);
 
 #ifdef __APPLE__
-    class_addMethod(NSCFType_, @selector(cy$toJSON:inContext:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON$inContext$), "^{OpaqueJSValue=}16@0:4@8^{OpaqueJSContext=}12");
+    class_addMethod(NSCFType_, @selector(cy$toJSON:inContext:), reinterpret_cast<IMP>(&NSCFType$cy$toJSON$inContext$),
+        // XXX: this is horrible; there has to be a better way to do this
+    #ifdef __LP64__
+        "^{OpaqueJSValue=}32@0:8@16^{OpaqueJSContext=}24"
+    #else
+        "^{OpaqueJSValue=}16@0:4@8^{OpaqueJSContext=}12"
+    #endif
+    );
 #endif
 } CYPoolCatch() }
 
@@ -2661,6 +3021,7 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
     CYSetProperty(context, ObjectiveC, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL));
 #endif
 
+    JSObjectRef Class(JSObjectMakeConstructor(context, Class_, NULL));
     JSObjectRef Instance(JSObjectMakeConstructor(context, Instance_, &Instance_new));
     JSObjectRef Message(JSObjectMakeConstructor(context, Message_, NULL));
     JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new));
@@ -2673,50 +3034,60 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
     JSObjectRef ArrayInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ArrayInstance, prototype_s)));
     CYSetProperty(context, cy, CYJSString("ArrayInstance_prototype"), ArrayInstance_prototype);
     JSObjectRef Array_prototype(CYGetCachedObject(context, CYJSString("Array_prototype")));
-    JSObjectSetPrototype(context, ArrayInstance_prototype, Array_prototype);
+    CYSetPrototype(context, ArrayInstance_prototype, Array_prototype);
+
+    JSObjectRef BooleanInstance(JSObjectMakeConstructor(context, BooleanInstance_, NULL));
+    JSObjectRef BooleanInstance_prototype(CYCastJSObject(context, CYGetProperty(context, BooleanInstance, prototype_s)));
+    CYSetProperty(context, cy, CYJSString("BooleanInstance_prototype"), BooleanInstance_prototype);
+    JSObjectRef Boolean_prototype(CYGetCachedObject(context, CYJSString("Boolean_prototype")));
+    CYSetPrototype(context, BooleanInstance_prototype, Boolean_prototype);
 
     JSObjectRef FunctionInstance(JSObjectMakeConstructor(context, FunctionInstance_, NULL));
     JSObjectRef FunctionInstance_prototype(CYCastJSObject(context, CYGetProperty(context, FunctionInstance, prototype_s)));
     CYSetProperty(context, cy, CYJSString("FunctionInstance_prototype"), FunctionInstance_prototype);
     JSObjectRef Function_prototype(CYGetCachedObject(context, CYJSString("Function_prototype")));
-    JSObjectSetPrototype(context, FunctionInstance_prototype, Function_prototype);
+    CYSetPrototype(context, FunctionInstance_prototype, Function_prototype);
+
+    JSObjectRef NumberInstance(JSObjectMakeConstructor(context, NumberInstance_, NULL));
+    JSObjectRef NumberInstance_prototype(CYCastJSObject(context, CYGetProperty(context, NumberInstance, prototype_s)));
+    CYSetProperty(context, cy, CYJSString("NumberInstance_prototype"), NumberInstance_prototype);
+    JSObjectRef Number_prototype(CYGetCachedObject(context, CYJSString("Number_prototype")));
+    CYSetPrototype(context, NumberInstance_prototype, Number_prototype);
 
     JSObjectRef ObjectInstance(JSObjectMakeConstructor(context, ObjectInstance_, NULL));
     JSObjectRef ObjectInstance_prototype(CYCastJSObject(context, CYGetProperty(context, ObjectInstance, prototype_s)));
     CYSetProperty(context, cy, CYJSString("ObjectInstance_prototype"), ObjectInstance_prototype);
     JSObjectRef Object_prototype(CYGetCachedObject(context, CYJSString("Object_prototype")));
-    JSObjectSetPrototype(context, ObjectInstance_prototype, Object_prototype);
+    CYSetPrototype(context, ObjectInstance_prototype, Object_prototype);
 
     JSObjectRef StringInstance(JSObjectMakeConstructor(context, StringInstance_, NULL));
     JSObjectRef StringInstance_prototype(CYCastJSObject(context, CYGetProperty(context, StringInstance, prototype_s)));
     CYSetProperty(context, cy, CYJSString("StringInstance_prototype"), StringInstance_prototype);
     JSObjectRef String_prototype(CYGetCachedObject(context, CYJSString("String_prototype")));
-    JSObjectSetPrototype(context, StringInstance_prototype, String_prototype);
+    CYSetPrototype(context, StringInstance_prototype, String_prototype);
 
-    JSObjectRef TypeInstance(JSObjectMakeConstructor(context, TypeInstance_, NULL));
-    JSObjectRef TypeInstance_prototype(CYCastJSObject(context, CYGetProperty(context, TypeInstance, prototype_s)));
-    CYSetProperty(context, cy, CYJSString("TypeInstance_prototype"), TypeInstance_prototype);
-    JSObjectRef Type_prototype(CYGetCachedObject(context, CYJSString("Type_prototype")));
-    JSObjectSetPrototype(context, TypeInstance_prototype, Type_prototype);
+    JSObjectRef Class_prototype(CYCastJSObject(context, CYGetProperty(context, Class, prototype_s)));
+    CYSetProperty(context, cy, CYJSString("Class_prototype"), Class_prototype);
+    CYSetPrototype(context, Class_prototype, Instance_prototype);
 
     CYSetProperty(context, cycript, CYJSString("Instance"), Instance);
     CYSetProperty(context, cycript, CYJSString("Selector"), Selector);
-    CYSetProperty(context, cycript, CYJSString("Super"), Super);
+    CYSetProperty(context, cycript, CYJSString("objc_super"), Super);
 
     JSObjectRef box(JSObjectMakeFunctionWithCallback(context, CYJSString("box"), &Instance_box_callAsFunction));
-    CYSetProperty(context, Instance, CYJSString("box"), box);
+    CYSetProperty(context, Instance, CYJSString("box"), box, kJSPropertyAttributeDontEnum);
 
-#if defined(__APPLE__) && defined(__arm__) && 0
-    CYSetProperty(context, all, CYJSString("objc_registerClassPair"), &objc_registerClassPair_, kJSPropertyAttributeDontEnum);
+#ifdef __APPLE__
+    CYSetProperty(context, all, CYJSString("choose"), &choose, kJSPropertyAttributeDontEnum);
 #endif
 
     CYSetProperty(context, all, CYJSString("objc_msgSend"), &$objc_msgSend, kJSPropertyAttributeDontEnum);
 
-    JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Message, prototype_s)), Function_prototype);
-    JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Selector, prototype_s)), Function_prototype);
+    CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Message, prototype_s)), Function_prototype);
+    CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Selector, prototype_s)), Function_prototype);
 } CYPoolCatch() }
 
-static CYHooks CYObjectiveCHooks = {
+static CYHook CYObjectiveCHook = {
     &CYObjectiveC_ExecuteStart,
     &CYObjectiveC_ExecuteEnd,
     &CYObjectiveC_CallFunction,
@@ -2726,10 +3097,27 @@ static CYHooks CYObjectiveCHooks = {
     &CYObjectiveC_FromFFI,
 };
 
-struct CYObjectiveC {
-    CYObjectiveC() {
-        hooks_ = &CYObjectiveCHooks;
-        // XXX: evil magic juju to make this actually take effect on a Mac when compiled with autoconf/libtool doom!
-        _assert(hooks_ != NULL);
-    }
-} CYObjectiveC;
+CYRegisterHook CYObjectiveC(&CYObjectiveCHook);
+
+extern "C" void CydgetSetupContext(JSGlobalContextRef context) { CYObjectiveTry_ {
+    CYSetupContext(context);
+} CYObjectiveCatch }
+
+extern "C" void CydgetMemoryParse(const uint16_t **data, size_t *size) { try {
+    CYPool pool;
+
+    CYUTF8String utf8(CYPoolUTF8String(pool, CYUTF16String(*data, *size)));
+    CYStream stream(utf8.data, utf8.data + utf8.size);
+    utf8 = CYPoolCode(pool, stream);
+
+    CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(utf8.data, utf8.size)));
+    size_t bytes(utf16.size * sizeof(uint16_t));
+    uint16_t *copy(reinterpret_cast<uint16_t *>(malloc(bytes)));
+    memcpy(copy, utf16.data, bytes);
+
+    *data = copy;
+    *size = utf16.size;
+} catch (const CYException &exception) {
+    CYPool pool;
+    @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"%s", exception.PoolCString(pool)] userInfo:nil];
+} }