X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/079cab1b73aea2d0a569e9880596e27b21144e73..a0a889ede9c85b8d7b6155a0ce19bcee45c4c654:/ObjectiveC/Library.mm?ds=sidebyside

diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 32426a5..580660e 100644
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
@@ -19,38 +19,39 @@
 **/
 /* }}} */
 
-#include <Foundation/Foundation.h>
+#include "cycript.hpp"
 
-#include "ObjectiveC/Internal.hpp"
+#include <cmath>
 
-#include <objc/objc-api.h>
+#include <map>
+#include <set>
 
-#include "cycript.hpp"
+#include <dlfcn.h>
 
-#include "ObjectiveC/Internal.hpp"
+#ifdef __APPLE__
+#include <malloc/malloc.h>
+#include <mach/mach.h>
+#endif
+
+#include <objc/message.h>
+#include <objc/runtime.h>
 
 #ifdef __APPLE__
 #include <CoreFoundation/CoreFoundation.h>
 #include <JavaScriptCore/JSStringRefCF.h>
-#include <objc/runtime.h>
 #endif
 
-#ifdef __APPLE__
-#include <malloc/malloc.h>
-#include <mach/mach.h>
-#endif
+#include <Foundation/Foundation.h>
 
 #include "Code.hpp"
+#include "Decode.hpp"
 #include "Error.hpp"
 #include "JavaScript.hpp"
 #include "String.hpp"
 #include "Execute.hpp"
 
-#include <cmath>
-#include <map>
-#include <set>
-
-#include <dlfcn.h>
+#include "ObjectiveC/Internal.hpp"
+#include "ObjectiveC/Syntax.hpp"
 
 #define CYObjectiveTry_ { \
     try
@@ -59,7 +60,7 @@
     try
 #define CYObjectiveCatch \
     catch (const CYException &error) { \
-        @throw CYCastNSObject(NULL, context, error.CastJSValue(context)); \
+        @throw CYCastNSObject(NULL, context, error.CastJSValue(context, "Error")); \
     } \
 }
 
@@ -91,49 +92,6 @@
     if (!(test)) \
         @throw [NSException exceptionWithName:NSInternalInconsistencyException reason:@"_assert(" #test ")" userInfo:nil];
 
-#ifndef __APPLE__
-#define class_getSuperclass GSObjCSuper
-#define class_getInstanceVariable GSCGetInstanceVariableDefinition
-#define class_getName GSNameFromClass
-
-#define class_removeMethods(cls, list) GSRemoveMethodList(cls, list, YES)
-
-#define ivar_getName(ivar) ((ivar)->ivar_name)
-#define ivar_getOffset(ivar) ((ivar)->ivar_offset)
-#define ivar_getTypeEncoding(ivar) ((ivar)->ivar_type)
-
-#define method_getName(method) ((method)->method_name)
-#define method_getImplementation(method) ((method)->method_imp)
-#define method_getTypeEncoding(method) ((method)->method_types)
-#define method_setImplementation(method, imp) ((void) ((method)->method_imp = (imp)))
-
-#undef objc_getClass
-#define objc_getClass GSClassFromName
-
-#define objc_getProtocol GSProtocolFromName
-
-#define object_getClass GSObjCClass
-
-#define object_getInstanceVariable(object, name, value) ({ \
-    objc_ivar *ivar(class_getInstanceVariable(object_getClass(object), name)); \
-    _assert(value != NULL); \
-    if (ivar != NULL) \
-        GSObjCGetVariable(object, ivar_getOffset(ivar), sizeof(void *), value); \
-    ivar; \
-})
-
-#define object_setIvar(object, ivar, value) ({ \
-    void *data = (value); \
-    GSObjCSetVariable(object, ivar_getOffset(ivar), sizeof(void *), &data); \
-})
-
-#define protocol_getName(protocol) [(protocol) name]
-#endif
-
-static void (*$objc_setAssociatedObject)(id object, void *key, id value, objc_AssociationPolicy policy);
-static id (*$objc_getAssociatedObject)(id object, void *key);
-static void (*$objc_removeAssociatedObjects)(id object);
-
 @class NSBlock;
 
 struct BlockLiteral {
@@ -196,29 +154,37 @@ Type_ CYPoolRelease(CYPool *pool, Type_ object) {
 }
 /* }}} */
 /* Objective-C Strings {{{ */
-const char *CYPoolCString(CYPool &pool, JSContextRef context, NSString *value) {
-    size_t size([value maximumLengthOfBytesUsingEncoding:NSUTF8StringEncoding] + 1);
-    char *string(new(pool) char[size]);
+CYUTF8String CYPoolUTF8String(CYPool &pool, JSContextRef context, NSString *value) {
+    size_t size([value maximumLengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
+    char *string(new(pool) char[size + 1]);
     if (![value getCString:string maxLength:size encoding:NSUTF8StringEncoding])
         throw CYJSError(context, "[NSString getCString:maxLength:encoding:] == NO");
-    return string;
+    return CYUTF8String(string, [value lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
 }
 
+const char *CYPoolCString(CYPool &pool, JSContextRef context, NSString *value) {
+    CYUTF8String utf8(CYPoolUTF8String(pool, context, value));
+    _assert(memchr(utf8.data, '\0', utf8.size) == NULL);
+    return utf8.data;
+}
+
+#ifdef __clang__
 JSStringRef CYCopyJSString(JSContextRef context, NSString *value) {
-#ifdef __APPLE__
     return JSStringCreateWithCFString(reinterpret_cast<CFStringRef>(value));
-#else
-    CYPool pool;
-    return CYCopyJSString(CYPoolCString(pool, context, value));
-#endif
 }
+#endif
 
 JSStringRef CYCopyJSString(JSContextRef context, NSObject *value) {
     if (value == nil)
         return NULL;
     // XXX: this definition scares me; is anyone using this?!
     NSString *string([value description]);
+#ifdef __clang__
     return CYCopyJSString(context, string);
+#else
+    CYPool pool;
+    return CYCopyJSString(CYPoolUTF8String(pool, context, string));
+#endif
 }
 
 NSString *CYCopyNSString(const CYUTF8String &value) {
@@ -307,7 +273,6 @@ static Class __NSMallocBlock__;
 static Class NSCFBoolean_;
 static Class NSCFType_;
 static Class NSGenericDeallocHandler_;
-static Class NSZombie_;
 #else
 static Class NSBoolNumber_;
 #endif
@@ -317,6 +282,7 @@ static Class NSBlock_;
 static Class NSDictionary_;
 static Class NSNumber_;
 static Class NSString_;
+static Class NSZombie_;
 static Class Object_;
 
 static Type_privateData *Object_type;
@@ -413,7 +379,7 @@ JSObjectRef Instance::Make(JSContextRef context, id object, Flags flags) {
 }
 
 Instance::~Instance() {
-    if ((flags_ & Transient) == 0)
+    if ((flags_ & Permanent) == 0)
         [GetValue() release];
 }
 
@@ -429,17 +395,28 @@ struct Message_privateData :
     }
 };
 
-JSObjectRef CYMakeInstance(JSContextRef context, id object, bool transient) {
-    Instance::Flags flags;
+JSObjectRef CYMakeInstance(JSContextRef context, id object, Instance::Flags flags = Instance::None) {
+    _assert(object != nil);
 
-    if (transient)
-        flags = Instance::Transient;
-    else {
-        flags = Instance::None;
+#ifdef __APPLE__
+    JSWeakObjectMapRef weak(CYCastPointer<JSWeakObjectMapRef>(context, CYGetCachedValue(context, weak_s)));
+
+    if (weak != NULL && &JSWeakObjectMapGet != NULL)
+        if (JSObjectRef instance = JSWeakObjectMapGet(context, weak, object))
+            return instance;
+#endif
+
+    if ((flags & Instance::Permanent) == 0)
         object = [object retain];
-    }
 
-    return Instance::Make(context, object, flags);
+    JSObjectRef instance(Instance::Make(context, object, flags));
+
+#ifdef __APPLE__
+    if (weak != NULL && &JSWeakObjectMapSet != NULL)
+        JSWeakObjectMapSet(context, weak, object, instance);
+#endif
+
+    return instance;
 }
 
 @interface NSMethodSignature (Cycript)
@@ -471,42 +448,30 @@ JSObjectRef CYMakeInstance(JSContextRef context, id object, bool transient) {
 @end
 
 NSString *CYCastNSCYON(id value, bool objective, std::set<void *> &objects) {
-    NSString *string;
+    _assert(value != nil);
 
-    if (value == nil)
-        string = @"nil";
-    else {
-        Class _class(object_getClass(value));
-        SEL sel(@selector(cy$toCYON:inSet:));
+    Class _class(object_getClass(value));
 
-        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 inSet:objects];
-            else goto fail;
-        } else fail: {
-            if (false);
-#ifdef __APPLE__
-            else if (_class == NSZombie_)
-                string = [NSString stringWithFormat:@"<_NSZombie_: %p>", value];
-#endif
-            else
-                string = [NSString stringWithFormat:@"%@", value];
-        }
-
-        // XXX: frowny pants
-        if (string == nil)
-            string = @"undefined";
+    if (class_isMetaClass(_class)) {
+        const char *name(class_getName(value));
+        if (class_isMetaClass(value))
+            return [NSString stringWithFormat:@"object_getClass(%s)", name];
+        else
+            return [NSString stringWithUTF8String:name];
     }
 
-    return string;
+    if (_class == NSZombie_)
+        return [NSString stringWithFormat:@"<_NSZombie_: %p>", value];
+
+    SEL sel(@selector(cy$toCYON:inSet:));
+
+    if (objc_method *toCYON = class_getInstanceMethod(_class, sel))
+        return 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)
+            return [value cy$toCYON:objective inSet:objects];
+
+    return [NSString stringWithFormat:@"%@", value];
 }
 
 NSString *CYCastNSCYON(id value, bool objective, std::set<void *> *objects) {
@@ -518,7 +483,6 @@ NSString *CYCastNSCYON(id value, bool objective, std::set<void *> *objects) {
     }
 }
 
-#ifdef __APPLE__
 struct PropertyAttributes {
     CYPool pool_;
 
@@ -606,7 +570,6 @@ struct PropertyAttributes {
     }
 
 };
-#endif
 
 @interface CYWebUndefined : NSObject {
 }
@@ -670,6 +633,7 @@ _finline bool CYJSValueIsInstanceOfCachedConstructor(JSContextRef context, JSVal
     return _jsccall(JSValueIsInstanceOfConstructor, context, value, CYGetCachedObject(context, cache));
 }
 
+#ifdef __APPLE__
 struct CYBlockDescriptor {
     struct {
         BlockDescriptor1 one_;
@@ -689,10 +653,6 @@ static JSValueRef BlockAdapter_(JSContextRef context, size_t count, JSValueRef v
     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))));
@@ -700,7 +660,7 @@ NSBlock *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature
     CYBlockDescriptor *descriptor(new CYBlockDescriptor);
     memset(&descriptor->d_, 0, sizeof(descriptor->d_));
 
-    descriptor->internal_ = CYMakeFunctor_(context, function, signature, &BlockClosure_);
+    descriptor->internal_ = CYMakeFunctor_(context, function, signature, &BlockAdapter_);
     literal->invoke = reinterpret_cast<void (*)(void *, ...)>(descriptor->internal_->GetValue());
 
     literal->isa = __NSMallocBlock__;
@@ -714,6 +674,7 @@ NSBlock *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature
 
     return reinterpret_cast<NSBlock *>(literal);
 }
+#endif
 
 NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSObjectRef object) {
     if (CYJSValueIsNSObject(context, object)) {
@@ -811,7 +772,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
     [json appendString:@"@["];
 
     bool comma(false);
-#ifdef __APPLE__
+#ifdef __clang__
     for (id object in self) {
 #else
     for (size_t index(0), count([self count]); index != count; ++index) {
@@ -821,7 +782,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
             [json appendString:@","];
         else
             comma = true;
-        if (object == nil || [object cy$JSType] != kJSTypeUndefined)
+        if (object != nil && [object cy$JSType] != kJSTypeUndefined)
             [json appendString:CYCastNSCYON(object, true, objects)];
         else {
             [json appendString:@","];
@@ -882,8 +843,43 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
 /* }}} */
 /* Bridge: NSBlock {{{ */
 #ifdef __APPLE__
-@interface NSBlock
+@interface NSBlock : NSObject
 - (void) invoke;
+@end
+
+static const char *CYBlockEncoding(NSBlock *self);
+static sig::Signature *CYBlockSignature(CYPool &pool, NSBlock *self);
+
+@implementation NSBlock (Cycript)
+
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
+    CYLocalPool pool;
+
+    sig::Signature *signature(CYBlockSignature(pool, self));
+    // XXX: I am checking signature->count due to Decode doing it for block_P
+    if (signature == NULL || signature->count == 0)
+        return [super cy$toCYON:objective inSet:objects];
+    _oassert(objects.insert(self).second);
+
+    sig::Block type;
+    sig::Copy(pool, type.signature, *signature);
+
+    CYTypedIdentifier *typed((new(pool) CYTypeExpression(CYDecodeType(pool, &type)))->typed_);
+    CYTypeFunctionWith *function(typed->Function());
+    _assert(function != NULL);
+
+    _assert(function->parameters_ != NULL);
+    CYObjCBlock *block(new(pool) CYObjCBlock(typed, function->parameters_, NULL));
+
+    std::ostringstream str;
+    CYOptions options;
+    CYOutput out(*str.rdbuf(), options);
+    block->Output(out, CYNoFlags);
+
+    std::string value(str.str());
+    return CYCastNSString(NULL, CYUTF8String(value.c_str(), value.size()));
+}
+
 @end
 #endif
 /* }}} */
@@ -921,7 +917,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
     [json appendString:@"@{"];
 
     bool comma(false);
-#ifdef __APPLE__
+#ifdef __clang__
     for (NSObject *key in self) {
 #else
     NSEnumerator *keys([self keyEnumerator]);
@@ -952,7 +948,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
 - (void) cy$getPropertyNames:(JSPropertyNameAccumulatorRef)names inContext:(JSContextRef)context {
     [super cy$getPropertyNames:names inContext:context];
 
-#ifdef __APPLE__
+#ifdef __clang__
     for (NSObject *key in self) {
 #else
     NSEnumerator *keys([self keyEnumerator]);
@@ -975,11 +971,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
     if ([name isEqualToString:@"length"]) {
         // XXX: is this not intelligent?
         NSNumber *number(reinterpret_cast<NSNumber *>(value));
-#ifdef __APPLE__
         NSUInteger size([number unsignedIntegerValue]);
-#else
-        NSUInteger size([number unsignedIntValue]);
-#endif
         NSUInteger count([self count]);
         if (size < count)
             [self removeObjectsInRange:NSMakeRange(size, count - size)];
@@ -1137,6 +1129,23 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
 
 @end
 /* }}} */
+/* Bridge: NSOrderedSet {{{ */
+#ifdef __APPLE__
+@implementation NSOrderedSet (Cycript)
+
+- (NSString *) cy$toCYON:(bool)objective inSet:(std::set<void *> &)objects {
+    _oassert(objects.insert(self).second);
+
+    NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
+    [json appendString:@"[NSOrderedSet orderedSetWithArray:"];
+    [json appendString:CYCastNSCYON([self array], true, objects)];
+    [json appendString:@"]]"];
+    return json;
+}
+
+@end
+#endif
+/* }}} */
 /* Bridge: NSProxy {{{ */
 @implementation NSProxy (Cycript)
 
@@ -1177,7 +1186,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
     if (!objective)
         str << '@';
     CYUTF8String string(CYCastUTF8String(self));
-    CYStringify(str, string.data, string.size);
+    CYStringify(str, string.data, string.size, true);
     std::string value(str.str());
     return CYCastNSString(NULL, CYUTF8String(value.c_str(), value.size()));
 }
@@ -1235,11 +1244,7 @@ NSObject *CYCopyNSObject(CYPool &pool, JSContextRef context, JSValueRef value) {
 /* }}} */
 
 static bool CYIsClass(id self) {
-#ifdef __APPLE__
     return class_isMetaClass(object_getClass(self));
-#else
-    return GSObjCIsClass(self);
-#endif
 }
 
 Class CYCastClass(CYPool &pool, JSContextRef context, JSValueRef value) {
@@ -1259,12 +1264,11 @@ NSArray *CYCastNSArray(JSContextRef context, JSPropertyNameArrayRef names) {
     return array;
 }
 
-JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
+JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) {
     if (value == nil)
         return CYJSNull(context);
-    else
-        return CYMakeInstance(context, value, false);
-} CYPoolCatch(NULL) return /*XXX*/ NULL; }
+    return CYMakeInstance(context, value);
+}
 
 @implementation CYJSObject
 
@@ -1447,32 +1451,36 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
 }
 
 + (CYInternal *) get:(id)object {
-    if ($objc_getAssociatedObject == NULL)
+#ifdef __APPLE__
+    if (&objc_getAssociatedObject == NULL)
         return nil;
 
     @synchronized (object) {
-        if (CYInternal *internal = $objc_getAssociatedObject(object, @selector(cy$internal)))
+        if (CYInternal *internal = objc_getAssociatedObject(object, @selector(cy$internal)))
             return internal;
     }
+#endif
 
     return nil;
 }
 
 + (CYInternal *) set:(id)object inContext:(JSContextRef)context {
-    if ($objc_getAssociatedObject == NULL)
+#ifdef __APPLE__
+    if (&objc_getAssociatedObject == NULL)
         return nil;
 
     @synchronized (object) {
-        if (CYInternal *internal = $objc_getAssociatedObject(object, @selector(cy$internal)))
+        if (CYInternal *internal = objc_getAssociatedObject(object, @selector(cy$internal)))
             return internal;
 
-        if ($objc_setAssociatedObject == NULL)
+        if (&objc_setAssociatedObject == NULL)
             return nil;
 
         CYInternal *internal([[[CYInternal alloc] initInContext:context] autorelease]);
         objc_setAssociatedObject(object, @selector(cy$internal), internal, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
         return internal;
     }
+#endif
 
     return nil;
 }
@@ -1484,6 +1492,12 @@ static JSObjectRef CYMakeSelector(JSContextRef context, SEL sel) {
     return JSObjectMake(context, Selector_, internal);
 }
 
+static JSValueRef CYCastJSValue(JSContextRef context, SEL sel) {
+    if (sel == NULL)
+        return CYJSNull(context);
+    return CYMakeSelector(context, sel);
+}
+
 static SEL CYCastSEL(JSContextRef context, JSValueRef value) {
     if (JSValueIsObjectOfClass(context, value, Selector_)) {
         Selector_privateData *internal(reinterpret_cast<Selector_privateData *>(JSObjectGetPrivate((JSObjectRef) value)));
@@ -1502,21 +1516,12 @@ void CYObjectiveC_ExecuteEnd(JSContextRef context, void *handle) { CYSadTry {
     return [(NSAutoreleasePool *) handle release];
 } CYSadCatch() }
 
-JSValueRef CYObjectiveC_RuntimeProperty(JSContextRef context, CYUTF8String name) { CYPoolTry {
-    if (name == "nil")
-        return Instance::Make(context, nil);
-    if (Class _class = objc_getClass(name.data))
-        return CYMakeInstance(context, _class, true);
-    if (Protocol *protocol = objc_getProtocol(name.data))
-        return CYMakeInstance(context, protocol, true);
-    return NULL;
-} CYPoolCatch(NULL) return /*XXX*/ NULL; }
-
-static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { CYSadTry {
-    ffi_call(cif, function, value, values);
+static void CYObjectiveC_CallFunction(CYPool &pool, JSContextRef context, ffi_cif *cif, void (*function)(), void *value, void **values) { CYSadTry {
+    CYCallFunction(pool, context, cif, function, value, values);
 } CYSadCatch() }
 
-static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef value, sig::Signature *signature) {
+static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef value, const sig::Signature *signature) {
+#ifdef __APPLE__
     if (JSValueIsNull(context, value))
         return nil;
     JSObjectRef object(CYCastJSObject(context, value));
@@ -1542,77 +1547,78 @@ static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef val
     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].type = new(pool) sig::Object();
     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);
+#else
+    _assert(false);
+#endif
 }
 
-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
+namespace sig {
 
-    switch (type->primitive) {
-        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;
+void Block::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    // XXX: this function might not handle the idea of a null pool
+    *reinterpret_cast<id *>(data) = CYCastNSBlock(*pool, context, value, &signature);
+}
 
-        case sig::object_P:
-        case sig::typename_P:
-            *reinterpret_cast<id *>(data) = CYCastNSObject(pool, context, value);
-        break;
+// XXX: assigning to an indirect id * works for return values, but not for properties and fields
+void Object::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    *reinterpret_cast<id *>(data) = CYCastNSObject(pool, context, value);
+}
 
-        case sig::selector_P:
-            *reinterpret_cast<SEL *>(data) = CYCastSEL(context, value);
-        break;
+void Meta::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    *reinterpret_cast<id *>(data) = CYCastNSObject(pool, context, value);
+}
 
-        default:
-            return false;
-    }
+void Selector::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+    *reinterpret_cast<SEL *>(data) = CYCastSEL(context, value);
+}
 
-    return true;
-} CYSadCatch(false) }
-
-static JSValueRef CYObjectiveC_FromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) { CYPoolTry {
-    switch (type->primitive) {
-        // XXX: do something epic about blocks
-        case sig::block_P:
-        case sig::object_P:
-            if (NSObject *object = *reinterpret_cast<NSObject **>(data)) {
-                JSValueRef value(CYCastJSValue(context, object));
-                if (initialize)
-                    [object release];
-                return value;
-            } else goto null;
-
-        case sig::typename_P:
-            return CYMakeInstance(context, *reinterpret_cast<Class *>(data), true);
-
-        case sig::selector_P:
-            if (SEL sel = *reinterpret_cast<SEL *>(data))
-                return CYMakeSelector(context, sel);
-            else goto null;
-
-        null:
-            return CYJSNull(context);
-        default:
-            return NULL;
+JSValueRef Object::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    NSObject *value(*reinterpret_cast<NSObject **>(data));
+    if (value == NULL)
+        return CYJSNull(context);
+    JSObjectRef object(CYMakeInstance(context, value));
+
+    if (initialize) {
+        Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
+
+        if ((internal->flags_ & Instance::Uninitialized) != 0) {
+            internal->flags_ = static_cast<Instance::Flags>(internal->flags_ & ~Instance::Uninitialized);
+            _assert(internal->value_ == nil);
+            internal->value_ = value;
+        }
+
+        [value release];
     }
-} CYPoolCatch(NULL) return /*XXX*/ NULL; }
+
+    return object;
+}
+
+JSValueRef Meta::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    if (Class value = *reinterpret_cast<Class *>(data))
+        return CYMakeInstance(context, value, Instance::Permanent);
+    return CYJSNull(context);
+}
+
+JSValueRef Selector::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    return CYCastJSValue(context, *reinterpret_cast<SEL *>(data));
+}
+
+JSValueRef Block::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
+    return CYCastJSValue(context, *reinterpret_cast<NSObject **>(data));
+}
+
+}
 
 static bool CYImplements(id object, Class _class, SEL selector, bool devoid = false) {
     if (objc_method *method = class_getInstanceMethod(_class, selector)) {
         if (!devoid)
             return true;
-#if OBJC_API_VERSION >= 2
         char type[16];
         method_getReturnType(method, type, sizeof(type));
-#else
-        const char *type(method_getTypeEncoding(method));
-#endif
         if (type[0] != 'v')
             return true;
     }
@@ -1626,10 +1632,6 @@ static JSValueRef MessageAdapter_(JSContextRef context, size_t count, JSValueRef
     return CYCallAsFunction(context, function, _this, count - 2, values + 2);
 }
 
-static void MessageClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
-    CYExecuteClosure(cif, result, arguments, arg, &MessageAdapter_);
-}
-
 static JSObjectRef CYMakeMessage(JSContextRef context, SEL sel, IMP imp, const char *type) {
     Message_privateData *internal(new Message_privateData(sel, type, imp));
     return JSObjectMake(context, Message_, internal);
@@ -1640,7 +1642,7 @@ static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *enc
     CYPool pool;
     sig::Signature signature;
     sig::Parse(pool, &signature, encoding, &Structor_);
-    Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &MessageClosure_));
+    Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &MessageAdapter_));
     // XXX: see notes in Library.cpp about needing to leak
     return reinterpret_cast<IMP>(internal->GetValue());
 }
@@ -1694,7 +1696,6 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
     } 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)
@@ -1703,65 +1704,24 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr
             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);
-    else {
-#ifdef GNU_RUNTIME
-        GSMethodList list(GSAllocMethodList(1));
-        GSAppendMethodToList(list, sel, type, imp, YES);
-        GSAddMethodList(_class, list, YES);
-        GSFlushMethodCacheForClass(_class);
-#else
+    else
         class_addMethod(_class, sel, imp, type);
-#endif
-    }
 
     return true;
 } CYCatch(false) }
 
-#if 0 && OBJC_API_VERSION < 2
-static bool Messages_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
-    Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
-    Class _class(internal->GetValue());
-
-    CYPool pool;
-    const char *name(CYPoolCString(pool, context, property));
-
-    if (SEL sel = sel_getUid(name))
-        if (objc_method *method = class_getInstanceMethod(_class, sel)) {
-            objc_method_list list = {NULL, 1, {method}};
-            class_removeMethods(_class, &list);
-            return true;
-        }
-
-    return false;
-} CYCatch(false) }
-#endif
-
 static void Messages_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
     Messages *internal(reinterpret_cast<Messages *>(JSObjectGetPrivate(object)));
     Class _class(internal->GetValue());
 
-#if OBJC_API_VERSION >= 2
     unsigned int size;
     objc_method **data(class_copyMethodList(_class, &size));
     for (size_t i(0); i != size; ++i)
         JSPropertyNameAccumulatorAddName(names, CYJSString(sel_getName(method_getName(data[i]))));
     free(data);
-#else
-    for (objc_method_list *methods(_class->methods); methods != NULL; methods = methods->method_next)
-        for (int i(0); i != methods->method_count; ++i)
-            JSPropertyNameAccumulatorAddName(names, CYJSString(sel_getName(method_getName(&methods->method_list[i]))));
-#endif
 }
 
 static bool CYHasImplicitProperties(Class _class) {
@@ -1796,10 +1756,8 @@ static bool Instance_hasProperty(JSContextRef context, JSObjectRef object, JSStr
 
     const char *string(CYPoolCString(pool, context, name));
 
-#ifdef __APPLE__
     if (class_getProperty(_class, string) != NULL)
         return true;
-#endif
 
     if (CYHasImplicitProperties(_class))
         if (SEL sel = sel_getUid(string))
@@ -1831,13 +1789,11 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object,
     const char *string(CYPoolCString(pool, context, name));
     Class _class(object_getClass(self));
 
-#ifdef __APPLE__
     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);
     }
-#endif
 
     if (CYHasImplicitProperties(_class))
         if (SEL sel = sel_getUid(string))
@@ -1864,7 +1820,6 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
     const char *string(CYPoolCString(pool, context, name));
     Class _class(object_getClass(self));
 
-#ifdef __APPLE__
     if (objc_property_t property = class_getProperty(_class, string)) {
         PropertyAttributes attributes(property);
         if (const char *setter = attributes.Setter()) {
@@ -1874,7 +1829,6 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
             return true;
         }
     }
-#endif
 
     size_t length(strlen(string));
 
@@ -1936,7 +1890,6 @@ static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object,
     CYPool pool;
     Class _class(object_getClass(self));
 
-#ifdef __APPLE__
     {
         unsigned int size;
         objc_property_t *data(class_copyPropertyList(_class, &size));
@@ -1944,21 +1897,14 @@ static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object,
             JSPropertyNameAccumulatorAddName(names, CYJSString(property_getName(data[i])));
         free(data);
     }
-#endif
 
     if (CYHasImplicitProperties(_class))
         for (Class current(_class); current != nil; current = class_getSuperclass(current)) {
-#if OBJC_API_VERSION >= 2
             unsigned int size;
             objc_method **data(class_copyMethodList(current, &size));
             for (size_t i(0); i != size; ++i)
                 Instance_getPropertyNames_message(names, data[i]);
             free(data);
-#else
-            for (objc_method_list *methods(current->methods); methods != NULL; methods = methods->method_next)
-                for (int i(0); i != methods->method_count; ++i)
-                    Instance_getPropertyNames_message(names, &methods->method_list[i]);
-#endif
         }
 
     CYPoolTry {
@@ -1970,7 +1916,7 @@ static void Instance_getPropertyNames(JSContextRef context, JSObjectRef object,
 
 static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(object)));
-    JSObjectRef value(Instance::Make(context, [internal->GetValue() alloc], Instance::Uninitialized));
+    JSObjectRef value(CYMakeInstance(context, [internal->GetValue() alloc], Instance::Uninitialized));
     return value;
 } CYCatch(NULL) }
 
@@ -1986,6 +1932,16 @@ static const char *CYBlockEncoding(NSBlock *self) {
     return descriptor3->signature;
 }
 
+static sig::Signature *CYBlockSignature(CYPool &pool, NSBlock *self) {
+    const char *encoding(CYBlockEncoding(self));
+    if (encoding == NULL)
+        return NULL;
+    // XXX: this should be stored on a FunctionInstance private value subclass
+    sig::Signature *signature(new(pool) sig::Signature());
+    sig::Parse(pool, signature, encoding, &Structor_);
+    return 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());
@@ -2000,7 +1956,7 @@ static JSValueRef FunctionInstance_callAsFunction(JSContextRef context, JSObject
         sig::Parse(pool, &signature, encoding, &Structor_);
 
         ffi_cif cif;
-        sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
+        sig::sig_ffi_cif(pool, &signature, &cif);
 
         BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(self));
         void (*function)() = reinterpret_cast<void (*)()>(literal->invoke);
@@ -2080,17 +2036,13 @@ 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)) {
         ptrdiff_t offset(ivar_getOffset(ivar));
         void *data(reinterpret_cast<uint8_t *>(self) + offset);
 
         const char *encoding(ivar_getTypeEncoding(ivar));
         _assert(encoding != NULL);
+        _assert(encoding[0] != '\0');
         if (encoding[0] == 'b') {
             unsigned length, shift;
             CYBitField(length, shift, self, ivar, encoding, offset);
@@ -2099,8 +2051,14 @@ static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object,
             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);
+#if defined(__APPLE__) && defined(__LP64__)
+            // XXX: maybe do even more verifications here
+            if (strcmp(name, "isa") == 0)
+                return CYCastJSValue(context, object_getClass(self));
+#endif
+
+            auto type(new(pool) Type_privateData(encoding));
+            return type->type_->FromFFI(context, type->GetFFI(), data);
         }
     }
 
@@ -2129,7 +2087,7 @@ static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStr
             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);
+            type->type_->PoolFFI(&pool, context, type->GetFFI(), reinterpret_cast<uint8_t *>(self) + ivar_getOffset(ivar), value);
             return true;
         }
     }
@@ -2141,17 +2099,11 @@ static void Internal_getPropertyNames_(Class _class, JSPropertyNameAccumulatorRe
     if (Class super = class_getSuperclass(_class))
         Internal_getPropertyNames_(super, names);
 
-#if OBJC_API_VERSION >= 2
     unsigned int size;
     objc_ivar **data(class_copyIvarList(_class, &size));
     for (size_t i(0); i != size; ++i)
         JSPropertyNameAccumulatorAddName(names, CYJSString(ivar_getName(data[i])));
     free(data);
-#else
-    if (objc_ivar_list *ivars = _class->ivars)
-        for (int i(0); i != ivars->ivar_count; ++i)
-            JSPropertyNameAccumulatorAddName(names, CYJSString(ivar_getName(&ivars->ivar_list[i])));
-#endif
 }
 
 static void Internal_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
@@ -2178,11 +2130,10 @@ static JSValueRef ObjectiveC_Classes_getProperty(JSContextRef context, JSObjectR
     CYPool pool;
     NSString *name(CYCastNSString(&pool, context, property));
     if (Class _class = NSClassFromString(name))
-        return CYMakeInstance(context, _class, true);
+        return CYMakeInstance(context, _class, Instance::Permanent);
     return NULL;
 } CYCatch(NULL) }
 
-#ifdef __APPLE__
 static Class *CYCopyClassList(size_t &size) {
     size = objc_getClassList(NULL, 0);
     Class *data(reinterpret_cast<Class *>(malloc(sizeof(Class) * size)));
@@ -2204,24 +2155,17 @@ static Class *CYCopyClassList(size_t &size) {
         size = writ;
     }
 }
-#endif
 
 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))
-        JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(_class)));
-#endif
 }
 
-#if OBJC_API_VERSION >= 2
+#ifdef __APPLE__
 static JSValueRef ObjectiveC_Image_Classes_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     const char *internal(reinterpret_cast<const char *>(JSObjectGetPrivate(object)));
 
@@ -2233,7 +2177,7 @@ static JSValueRef ObjectiveC_Image_Classes_getProperty(JSContextRef context, JSO
     for (size_t i(0); i != size; ++i)
         if (strcmp(name, data[i]) == 0) {
             if (Class _class = objc_getClass(name)) {
-                value = CYMakeInstance(context, _class, true);
+                value = CYMakeInstance(context, _class, Instance::Permanent);
                 goto free;
             } else
                 break;
@@ -2255,22 +2199,20 @@ static void ObjectiveC_Image_Classes_getPropertyNames(JSContextRef context, JSOb
 
 static JSValueRef ObjectiveC_Images_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     CYPool pool;
-    const char *name(CYPoolCString(pool, context, property));
+    CYUTF8String name(CYPoolUTF8String(pool, context, property));
+
     unsigned int size;
     const char **data(objc_copyImageNames(&size));
+    pool.atexit(free, data);
+
     for (size_t i(0); i != size; ++i)
-        if (strcmp(name, data[i]) == 0) {
-            name = data[i];
-            goto free;
+        if (name == data[i]) {
+            JSObjectRef value(JSObjectMake(context, NULL, NULL));
+            CYSetProperty(context, value, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Image_Classes_, const_cast<char *>(data[i])));
+            return value;
         }
-    name = NULL;
-  free:
-    free(data);
-    if (name == NULL)
-        return NULL;
-    JSObjectRef value(JSObjectMake(context, NULL, NULL));
-    CYSetProperty(context, value, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Image_Classes_, const_cast<char *>(name)));
-    return value;
+
+    return NULL;
 } CYCatch(NULL) }
 
 static void ObjectiveC_Images_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
@@ -2286,27 +2228,23 @@ static JSValueRef ObjectiveC_Protocols_getProperty(JSContextRef context, JSObjec
     CYPool pool;
     const char *name(CYPoolCString(pool, context, property));
     if (Protocol *protocol = objc_getProtocol(name))
-        return CYMakeInstance(context, protocol, true);
+        return CYMakeInstance(context, protocol, Instance::Permanent);
     return NULL;
 } CYCatch(NULL) }
 
 static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
-#if OBJC_API_VERSION >= 2
     unsigned int size;
     Protocol **data(objc_copyProtocolList(&size));
     for (size_t i(0); i != size; ++i)
         JSPropertyNameAccumulatorAddName(names, CYJSString(protocol_getName(data[i])));
     free(data);
-#else
-    // XXX: fix this!
-#endif
 }
 
 static JSValueRef ObjectiveC_Constants_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
     CYPool pool;
     CYUTF8String name(CYPoolUTF8String(pool, context, property));
     if (name == "nil")
-        return Instance::Make(context, nil);
+        return CYJSNull(context);
     return NULL;
 } CYCatch(NULL) }
 
@@ -2343,7 +2281,7 @@ static void choose_(task_t task, void *baton, unsigned type, vm_range_t *ranges,
             continue;
 
         uintptr_t *pointers(reinterpret_cast<uintptr_t *>(data));
-#ifdef __arm64__
+#if defined(__APPLE__) && defined(__LP64__)
         Class isa(reinterpret_cast<Class>(pointers[0] & 0x1fffffff8));
 #else
         Class isa(reinterpret_cast<Class>(pointers[0]));
@@ -2373,7 +2311,7 @@ static JSValueRef choose(JSContextRef context, JSObjectRef object, JSObjectRef _
     CYGarbageCollect(context);
 
     CYPool pool;
-    Class _class(CYCastNSObject(&pool, context, arguments[0]));
+    id _class(CYCastNSObject(&pool, context, arguments[0]));
 
     vm_address_t *zones(NULL);
     unsigned size(0);
@@ -2435,6 +2373,8 @@ static bool stret(ffi_type *ffi_type) {
     );
 }
 #endif
+#else
+#define CY_NO_STRET
 #endif
 
 JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _class, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize) {
@@ -2452,11 +2392,14 @@ JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _cla
         imp = NULL;
 
         CYPoolTry {
-            NSMethodSignature *method([self methodSignatureForSelector:_cmd]);
-            if (method == nil)
-                throw CYJSError(context, "unrecognized selector %s sent to object %p", sel_getName(_cmd), self);
-            type = CYPoolCString(pool, context, [method _typeString]);
+            if (NSMethodSignature *method = [self methodSignatureForSelector:_cmd])
+                type = CYPoolCString(pool, context, [method _typeString]);
+            else
+                type = NULL;
         } CYPoolCatch(NULL)
+
+        if (type == NULL)
+            throw CYJSError(context, "unrecognized selector %s sent to object %p", sel_getName(_cmd), self);
     }
 
     void *setup[2];
@@ -2475,11 +2418,7 @@ JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _cla
             sig::Element *element(&elements[index]);
             element->name = NULL;
             element->offset = _not(size_t);
-
-            sig::Type *type(new (pool) sig::Type);
-            memset(type, 0, sizeof(*type));
-            type->primitive = sig::object_P;
-            element->type = type;
+            element->type = new(pool) sig::Object();
         }
 
         signature.elements = elements;
@@ -2487,20 +2426,15 @@ JSValueRef CYSendMessage(CYPool &pool, JSContextRef context, id self, Class _cla
     }
 
     ffi_cif cif;
-    sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif);
+    sig::sig_ffi_cif(pool, &signature, &cif);
 
     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};
-        imp = objc_msg_lookup_super(&super, _cmd);
-#endif
     }
 
     void (*function)() = reinterpret_cast<void (*)()>(imp);
@@ -2589,10 +2523,9 @@ static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t
 } CYCatch(NULL) }
 
 static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
-    if (count > 1)
+    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);
+    return CYMakeInstance(context, CYCastPointer<id>(context, arguments[0]));
 } CYCatch(NULL) }
 
 static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
@@ -2604,35 +2537,34 @@ static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef
     CYValue *internal(reinterpret_cast<CYValue *>(JSObjectGetPrivate(_this)));
     Type_privateData *typical(internal->GetType());
 
+    sig::Void XXX;
+
     sig::Type *type;
     ffi_type *ffi;
 
     if (typical == NULL) {
-        type = NULL;
+        type = &XXX;
         ffi = NULL;
     } else {
         type = typical->type_;
         ffi = typical->ffi_;
     }
 
-    return CYMakePointer(context, &internal->value_, _not(size_t), type, ffi, object);
+    return CYMakePointer(context, &internal->value_, *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);
+    sig::Signature *signature(CYBlockSignature(pool, internal->GetValue()));
+    if (signature == NULL)
+        return CYJSNull(context);
+    return CYMakeType(context, signature);
 } CYCatch(NULL) }
 
 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()));
+    return CYMakeInstance(context, object_getClass(internal->GetValue()), Instance::Permanent);
 } CYCatch(NULL) }
 
 static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
@@ -2690,6 +2622,7 @@ static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObject
 
     Instance *internal(reinterpret_cast<Instance *>(JSObjectGetPrivate(_this)));
     id value(internal->GetValue());
+    _assert(value != nil);
 
     if (![value respondsToSelector:@selector(cy$valueOfInContext:)])
         return _this;
@@ -2732,11 +2665,8 @@ static JSValueRef Class_callAsFunction_pointerTo(JSContextRef context, JSObjectR
     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);
+    sig::Object type(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 {
@@ -2834,14 +2764,10 @@ JSValueRef NSCFType$cy$toJSON$inContext$(id self, SEL sel, JSValueRef key, JSCon
 #endif
 
 void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
-    $objc_setAssociatedObject = reinterpret_cast<void (*)(id, void *, id value, objc_AssociationPolicy)>(dlsym(RTLD_DEFAULT, "objc_setAssociatedObject"));
-    $objc_getAssociatedObject = reinterpret_cast<id (*)(id, void *)>(dlsym(RTLD_DEFAULT, "objc_getAssociatedObject"));
-    $objc_removeAssociatedObjects = reinterpret_cast<void (*)(id)>(dlsym(RTLD_DEFAULT, "objc_removeAssociatedObjects"));
-
     CYPool &pool(CYGetGlobalPool());
 
-    Object_type = new(pool) Type_privateData("@");
-    Selector_type = new(pool) Type_privateData(":");
+    Object_type = new(pool) Type_privateData(sig::Object());
+    Selector_type = new(pool) Type_privateData(sig::Selector());
 
     NSArray_ = objc_getClass("NSArray");
     NSBlock_ = objc_getClass("NSBlock");
@@ -2863,6 +2789,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     NSZombie_ = objc_getClass("_NSZombie_");
 #else
     NSBoolNumber_ = objc_getClass("NSBoolNumber");
+    NSZombie_ = objc_getClass("NSZombie");
 #endif
 
     JSClassDefinition definition;
@@ -2929,9 +2856,6 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     definition.hasProperty = &Messages_hasProperty;
     definition.getProperty = &Messages_getProperty;
     definition.setProperty = &Messages_setProperty;
-#if 0 && OBJC_API_VERSION < 2
-    definition.deleteProperty = &Messages_deleteProperty;
-#endif
     definition.getPropertyNames = &Messages_getPropertyNames;
     definition.finalize = &CYFinalize;
     Messages_ = JSClassCreate(&definition);
@@ -2963,7 +2887,7 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry {
     definition.getPropertyNames = &ObjectiveC_Constants_getPropertyNames;
     ObjectiveC_Constants_ = JSClassCreate(&definition);
 
-#if OBJC_API_VERSION >= 2
+#ifdef __APPLE__
     definition = kJSClassDefinitionEmpty;
     definition.className = "ObjectiveC::Images";
     definition.getProperty = &ObjectiveC_Images_getProperty;
@@ -3017,7 +2941,7 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
     CYSetProperty(context, ObjectiveC, CYJSString("constants"), constants);
     CYArrayPush(context, alls, constants);
 
-#if OBJC_API_VERSION >= 2
+#ifdef __APPLE__
     CYSetProperty(context, ObjectiveC, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL));
 #endif
 
@@ -3085,30 +3009,44 @@ void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry {
 
     CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Message, prototype_s)), Function_prototype);
     CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Selector, prototype_s)), Function_prototype);
+
+    JSObjectRef cache(CYGetCachedObject(context, CYJSString("cache")));
+    CYSetProperty(context, cache, CYJSString("YES"), JSValueMakeBoolean(context, true), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("NO"), JSValueMakeBoolean(context, false), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("id"), CYMakeType(context, sig::Object()), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("Class"), CYMakeType(context, sig::Meta()), kJSPropertyAttributeDontEnum);
+    CYSetProperty(context, cache, CYJSString("SEL"), CYMakeType(context, sig::Selector()), kJSPropertyAttributeDontEnum);
 } CYPoolCatch() }
 
+static void *CYObjectiveC_CastSymbol(const char *name) {
+    if (false);
+#ifdef __GNU_LIBOBJC__
+    else if (strcmp(name, "object_getClass") == 0)
+        return reinterpret_cast<void *>(&object_getClass);
+#endif
+    return NULL;
+}
+
 static CYHook CYObjectiveCHook = {
     &CYObjectiveC_ExecuteStart,
     &CYObjectiveC_ExecuteEnd,
     &CYObjectiveC_CallFunction,
     &CYObjectiveC_Initialize,
     &CYObjectiveC_SetupContext,
-    &CYObjectiveC_PoolFFI,
-    &CYObjectiveC_FromFFI,
+    &CYObjectiveC_CastSymbol,
 };
 
 CYRegisterHook CYObjectiveC(&CYObjectiveCHook);
 
-extern "C" void CydgetSetupContext(JSGlobalContextRef context) { CYObjectiveTry_ {
+_extern void CydgetSetupContext(JSGlobalContextRef context) { CYObjectiveTry_ {
     CYSetupContext(context);
 } CYObjectiveCatch }
 
-extern "C" void CydgetMemoryParse(const uint16_t **data, size_t *size) { try {
+_extern 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);
+    utf8 = CYPoolCode(pool, utf8);
 
     CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(utf8.data, utf8.size)));
     size_t bytes(utf16.size * sizeof(uint16_t));