X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b81e7fb6237425dcdc657869f7516ecdf2c93161..fe123f47092fe716bf5111ca57b2670932c10d6d:/ObjectiveC/Library.mm diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm index 1de5595..9d5289f 100644 --- a/ObjectiveC/Library.mm +++ b/ObjectiveC/Library.mm @@ -1,17 +1,56 @@ +/* Cycript - Inlining/Optimizing JavaScript Compiler + * Copyright (C) 2009 Jay Freeman (saurik) +*/ + +/* Modified BSD License {{{ */ +/* + * Redistribution and use in source and binary + * forms, with or without modification, are permitted + * provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the + * above copyright notice, this list of conditions + * and the following disclaimer. + * 2. Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the + * distribution. + * 3. The name of the author may not be used to endorse + * or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ +/* }}} */ + #if defined(__APPLE__) && defined(__arm__) #include #else #include #endif -#include "ObjectiveC/Internal.hpp" - #ifdef __APPLE__ #include "Struct.hpp" #endif #include +#include "ObjectiveC/Internal.hpp" + #include #include "cycript.hpp" @@ -27,6 +66,7 @@ #include "Error.hpp" #include "JavaScript.hpp" #include "String.hpp" +#include "Execute.hpp" #include #include @@ -58,6 +98,14 @@ } \ } +#define CYSadTry { \ + @try +#define CYSadCatch(value) \ + @catch (NSException *error ) { \ + throw CYJSError(context, CYCastJSValue(context, error)); \ + } return value; \ +} + #ifndef __APPLE__ #define class_getSuperclass GSObjCSuper #define class_getInstanceVariable GSCGetInstanceVariableDefinition @@ -98,8 +146,6 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class super, SEL _cmd, size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception); -extern sqlite3 *Bridge_; - /* Objective-C Pool Release {{{ */ apr_status_t CYPoolRelease_(void *data) { id object(reinterpret_cast(data)); @@ -224,8 +270,6 @@ static JSClassRef ObjectiveC_Image_Classes_; static JSClassRef ObjectiveC_Images_; #endif -static JSObjectRef Instance_prototype_; - #ifdef __APPLE__ static Class NSCFBoolean_; static Class NSCFType_; @@ -250,34 +294,34 @@ Type_privateData *Selector_privateData::GetType() const { return Selector_type; } -// XXX: trick this out with associated objects! JSValueRef CYGetClassPrototype(JSContextRef context, id self) { if (self == nil) - return Instance_prototype_; + return CYGetCachedObject(context, CYJSString("Instance_prototype")); + + JSObjectRef global(CYGetGlobalObject(context)); + JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s))); - // XXX: I need to think through multi-context - typedef std::map CacheMap; - static CacheMap cache_; + char label[32]; + sprintf(label, "i%p", self); + CYJSString name(label); - JSValueRef &value(cache_[self]); - if (value != NULL) + JSValueRef value(CYGetProperty(context, cy, name)); + if (!JSValueIsUndefined(context, value)) return value; JSClassRef _class(NULL); JSValueRef prototype; if (self == NSArray_) - prototype = Array_prototype_; + prototype = CYGetCachedObject(context, CYJSString("Array_prototype")); else if (self == NSDictionary_) - prototype = Object_prototype_; + prototype = CYGetCachedObject(context, CYJSString("Object_prototype")); else prototype = CYGetClassPrototype(context, class_getSuperclass(self)); JSObjectRef object(JSObjectMake(context, _class, NULL)); JSObjectSetPrototype(context, object, prototype); - - JSValueProtect(context, object); - value = object; + CYSetProperty(context, cy, name, object); return object; } @@ -556,8 +600,9 @@ NSObject *NSCFType$cy$toJSON(id self, SEL sel, NSString *key) { /* }}} */ NSObject *CYCastNSObject_(apr_pool_t *pool, JSContextRef context, JSObjectRef object) { + JSObjectRef Array(CYGetCachedObject(context, Array_s)); JSValueRef exception(NULL); - bool array(JSValueIsInstanceOfConstructor(context, object, Array_, &exception)); + bool array(JSValueIsInstanceOfConstructor(context, object, Array, &exception)); CYThrow(context, exception); id value(array ? [CYJSArray alloc] : [CYJSObject alloc]); return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]); @@ -748,10 +793,10 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu bool comma(false); #ifdef __APPLE__ - for (id key in self) { + for (NSObject *key in self) { #else NSEnumerator *keys([self keyEnumerator]); - while (id key = [keys nextObject]) { + while (NSObject *key = [keys nextObject]) { #endif if (comma) [json appendString:@","]; @@ -779,10 +824,10 @@ NSObject *CYCopyNSObject(apr_pool_t *pool, JSContextRef context, JSValueRef valu [super cy$getPropertyNames:names inContext:context]; #ifdef __APPLE__ - for (NSString *key in self) { + for (NSObject *key in self) { #else NSEnumerator *keys([self keyEnumerator]); - while (NSString *key = [keys nextObject]) { + while (NSObject *key = [keys nextObject]) { #endif JSPropertyNameAccumulatorAddName(names, CYJSString(context, key)); } @@ -1053,18 +1098,20 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry { if ((self = [super init]) != nil) { object_ = object; - context_ = context; + context_ = CYGetJSContext(context); + //XXX:JSGlobalContextRetain(context_); JSValueProtect(context_, object_); } return self; } CYObjectiveCatch } - (void) dealloc { CYObjectiveTry { JSValueUnprotect(context_, object_); + //XXX:JSGlobalContextRelease(context_); [super dealloc]; } CYObjectiveCatch } - (NSObject *) cy$toJSON:(NSString *)key { CYObjectiveTry { - JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_)); + JSValueRef toJSON(CYGetProperty(context_, object_, toJSON_s)); if (!CYIsCallable(context_, toJSON)) return [super cy$toJSON:key]; else { @@ -1094,8 +1141,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { } CYObjectiveCatch } - (id) objectForKey:(id)key { CYObjectiveTry { - // XXX: are NSDictionary keys always NSString *? - JSValueRef value(CYGetProperty(context_, object_, CYJSString(context_, (NSString *) key))); + JSValueRef value(CYGetProperty(context_, object_, CYJSString(context_, (NSObject *) key))); if (JSValueIsUndefined(context_, value)) return nil; return CYCastNSObject(NULL, context_, value) ?: [NSNull null]; @@ -1109,14 +1155,12 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { } CYObjectiveCatch } - (void) setObject:(id)object forKey:(id)key { CYObjectiveTry { - // XXX: are NSDictionary keys always NSString *? - CYSetProperty(context_, object_, CYJSString(context_, (NSString *) 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); - // XXX: are NSDictionary keys always NSString *? - (void) JSObjectDeleteProperty(context_, object_, CYJSString(context_, (NSString *) key), &exception); + (void) JSObjectDeleteProperty(context_, object_, CYJSString(context_, (NSObject *) key), &exception); CYThrow(context_, exception); } CYObjectiveCatch } @@ -1127,18 +1171,20 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { - (id) initWithJSObject:(JSObjectRef)object inContext:(JSContextRef)context { CYObjectiveTry { if ((self = [super init]) != nil) { object_ = object; - context_ = context; + context_ = CYGetJSContext(context); + //XXX:JSGlobalContextRetain(context_); JSValueProtect(context_, object_); } return self; } CYObjectiveCatch } - (void) dealloc { CYObjectiveTry { JSValueUnprotect(context_, object_); + //XXX:JSGlobalContextRelease(context_); [super dealloc]; } CYObjectiveCatch } - (NSUInteger) count { CYObjectiveTry { - return CYCastDouble(context_, CYGetProperty(context_, object_, length_)); + return CYCastDouble(context_, CYGetProperty(context_, object_, length_s)); } CYObjectiveCatch } - (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry { @@ -1155,7 +1201,8 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { JSValueRef exception(NULL); JSValueRef arguments[1]; arguments[0] = CYCastJSValue(context_, (NSObject *) object); - JSObjectCallAsFunction(context_, Array_push_, object_, 1, arguments, &exception); + JSObjectRef Array(CYGetCachedObject(context_, Array_s)); + JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, push_s)), object_, 1, arguments, &exception); CYThrow(context_, exception); } CYObjectiveCatch } @@ -1168,13 +1215,15 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { arguments[0] = CYCastJSValue(context_, index); arguments[1] = CYCastJSValue(context_, 0); arguments[2] = CYCastJSValue(context_, (NSObject *) object); - JSObjectCallAsFunction(context_, Array_splice_, object_, 3, arguments, &exception); + JSObjectRef Array(CYGetCachedObject(context_, Array_s)); + JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 3, arguments, &exception); CYThrow(context_, exception); } CYObjectiveCatch } - (void) removeLastObject { CYObjectiveTry { JSValueRef exception(NULL); - JSObjectCallAsFunction(context_, Array_pop_, object_, 0, NULL, &exception); + JSObjectRef Array(CYGetCachedObject(context_, Array_s)); + JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, pop_s)), object_, 0, NULL, &exception); CYThrow(context_, exception); } CYObjectiveCatch } @@ -1186,7 +1235,8 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry { JSValueRef arguments[2]; arguments[0] = CYCastJSValue(context_, index); arguments[1] = CYCastJSValue(context_, 1); - JSObjectCallAsFunction(context_, Array_splice_, object_, 2, arguments, &exception); + JSObjectRef Array(CYGetCachedObject(context_, Array_s)); + JSObjectCallAsFunction(context_, CYCastJSObject(context_, CYGetProperty(context_, Array, splice_s)), object_, 2, arguments, &exception); CYThrow(context_, exception); } CYObjectiveCatch } @@ -1269,30 +1319,32 @@ static SEL CYCastSEL(JSContextRef context, JSValueRef value) { return CYCastPointer(context, value); } -void *CYObjectiveC_ExecuteStart(JSContextRef context) { - // XXX: deal with exceptions! +void *CYObjectiveC_ExecuteStart(JSContextRef context) { CYSadTry { return (void *) [[NSAutoreleasePool alloc] init]; -} +} CYSadCatch(NULL) } -void CYObjectiveC_ExecuteEnd(JSContextRef context, void *handle) { - // XXX: deal with exceptions! +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) { CYPoolTry { +static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void (*function)(), uint8_t *value, void **values) { CYSadTry { ffi_call(cif, function, value, values); -} CYPoolCatch() } +} CYSadCatch() } -static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYPoolTry { +static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry { switch (type->primitive) { + // XXX: do something epic about blocks + case sig::block_P: case sig::object_P: case sig::typename_P: *reinterpret_cast(data) = CYCastNSObject(pool, context, value); @@ -1307,10 +1359,12 @@ static bool CYObjectiveC_PoolFFI(apr_pool_t *pool, JSContextRef context, sig::Ty } return true; -} CYPoolCatch(false) return /*XXX*/ NULL; } +} 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(data)) { JSValueRef value(CYCastJSValue(context, object)); @@ -1357,36 +1411,16 @@ static const char *CYPoolTypeEncoding(apr_pool_t *pool, JSContextRef context, SE return method_getTypeEncoding(method); const char *name(sel_getName(sel)); + size_t length(strlen(name)); - sqlite3_stmt *statement; - - _sqlcall(sqlite3_prepare(Bridge_, - "select " - "\"bridge\".\"value\" " - "from \"bridge\" " - "where" - " \"bridge\".\"mode\" = -1 and" - " \"bridge\".\"name\" = ?" - " limit 1" - , -1, &statement, NULL)); - - _trace(); - _sqlcall(sqlite3_bind_text(statement, 1, name, -1, SQLITE_STATIC)); - - const char *value; - if (_sqlcall(sqlite3_step(statement)) == SQLITE_DONE) { - _trace(); - value = NULL;} - else { - _trace(); - value = sqlite3_column_pooled(pool, statement, 0); - } + char keyed[length + 2]; + keyed[0] = '6'; + keyed[length + 1] = '\0'; + memcpy(keyed + 1, name, length); - _sqlcall(sqlite3_finalize(statement)); + if (CYBridgeEntry *entry = CYBridgeHash(keyed, length + 1)) + return entry->value_; - if (value != NULL) - return value; -_trace(); return NULL; } @@ -1415,6 +1449,7 @@ static JSObjectRef CYMakeMessage(JSContextRef context, SEL sel, IMP imp, const c static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *type) { JSObjectRef function(CYCastJSObject(context, value)); Closure_privateData *internal(CYMakeFunctor_(context, function, type, &MessageClosure_)); + // XXX: see notes in Library.cpp about needing to leak return reinterpret_cast(internal->GetValue()); } @@ -2076,7 +2111,7 @@ static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t if (count > 1) throw CYJSError(context, "incorrect number of arguments to Instance constructor"); id self(count == 0 ? nil : CYCastPointer(context, arguments[0])); - return Instance::Make(context, self); + return CYMakeInstance(context, self, false); } CYCatch } static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { @@ -2099,7 +2134,7 @@ static JSValueRef CYValue_callAsFunction_$cya(JSContextRef context, JSObjectRef ffi = typical->ffi_; } - return CYMakePointer(context, &internal->value_, type, ffi, object); + return CYMakePointer(context, &internal->value_, _not(size_t), type, ffi, object); } static JSValueRef Instance_getProperty_constructor(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { @@ -2148,12 +2183,35 @@ static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectR } CYPoolCatch(NULL) } CYCatch return /*XXX*/ NULL; } +#if 0 +static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (!JSValueIsObjectOfClass(context, _this, Instance_)) + return NULL; + + Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + return CYCastJSValue(context, reinterpret_cast(internal->GetValue())); +} CYCatch return /*XXX*/ NULL; } +#endif + +static JSValueRef Instance_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (!JSValueIsObjectOfClass(context, _this, Instance_)) + return NULL; + + Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + // XXX: but... but... THIS ISN'T A POINTER! :( + return CYCastJSValue(context, reinterpret_cast(internal->GetValue())); +} CYCatch return /*XXX*/ NULL; } + static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (!JSValueIsObjectOfClass(context, _this, Instance_)) return NULL; Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + id value(internal->GetValue()); + if (value == nil) + return CYCastJSValue(context, "nil"); + CYPoolTry { // XXX: this seems like a stupid implementation; what if it crashes? why not use the CYONifier backend? return CYCastJSValue(context, CYJSString(context, [internal->GetValue() description])); @@ -2212,10 +2270,12 @@ static JSStaticValue Instance_staticValues[5] = { {NULL, NULL, NULL, 0} }; -static JSStaticFunction Instance_staticFunctions[5] = { +static JSStaticFunction Instance_staticFunctions[6] = { {"$cya", &CYValue_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toCYON", &Instance_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toJSON", &Instance_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + //{"valueOf", &Instance_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"toPointer", &Instance_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toString", &Instance_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} }; @@ -2233,12 +2293,11 @@ static JSStaticFunction Selector_staticFunctions[5] = { {NULL, NULL, 0} }; -void CYObjectiveC_SetupContext(JSContextRef context) { - JSObjectRef global(CYGetGlobalObject(context)); +void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { apr_pool_t *pool(CYGetGlobalPool()); - Object_type = new(pool) Type_privateData(pool, "@"); - Selector_type = new(pool) Type_privateData(pool, ":"); + Object_type = new(pool) Type_privateData("@"); + Selector_type = new(pool) Type_privateData(":"); #ifdef __APPLE__ NSCFBoolean_ = objc_getClass("NSCFBoolean"); @@ -2318,18 +2377,6 @@ void CYObjectiveC_SetupContext(JSContextRef context) { definition.getPropertyNames = &ObjectiveC_Classes_getPropertyNames; ObjectiveC_Classes_ = JSClassCreate(&definition); - definition = kJSClassDefinitionEmpty; - definition.className = "ObjectiveC::Protocols"; - definition.getProperty = &ObjectiveC_Protocols_getProperty; - definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames; - ObjectiveC_Protocols_ = JSClassCreate(&definition); - - JSObjectRef ObjectiveC(JSObjectMake(context, NULL, NULL)); - CYSetProperty(context, global, CYJSString("ObjectiveC"), ObjectiveC); - - CYSetProperty(context, ObjectiveC, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Classes_, NULL)); - CYSetProperty(context, ObjectiveC, CYJSString("protocols"), JSObjectMake(context, ObjectiveC_Protocols_, NULL)); - #if OBJC_API_VERSION >= 2 definition = kJSClassDefinitionEmpty; definition.className = "ObjectiveC::Images"; @@ -2342,7 +2389,36 @@ void CYObjectiveC_SetupContext(JSContextRef context) { definition.getProperty = &ObjectiveC_Image_Classes_getProperty; definition.getPropertyNames = &ObjectiveC_Image_Classes_getPropertyNames; ObjectiveC_Image_Classes_ = JSClassCreate(&definition); +#endif + + definition = kJSClassDefinitionEmpty; + definition.className = "ObjectiveC::Protocols"; + definition.getProperty = &ObjectiveC_Protocols_getProperty; + definition.getPropertyNames = &ObjectiveC_Protocols_getPropertyNames; + ObjectiveC_Protocols_ = JSClassCreate(&definition); + +#if defined(__APPLE__) && defined(__arm__) + MSHookFunction(&objc_registerClassPair, MSHake(objc_registerClassPair)); +#endif +#ifdef __APPLE__ + class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast(&NSCFType$cy$toJSON), "@12@0:4@8"); +#endif +} CYPoolCatch() } + +void CYObjectiveC_SetupContext(JSContextRef context) { CYPoolTry { + JSObjectRef global(CYGetGlobalObject(context)); + JSObjectRef cy(CYCastJSObject(context, CYGetProperty(context, global, cy_s))); + JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript")))); + JSObjectRef all(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("all")))); + + JSObjectRef ObjectiveC(JSObjectMake(context, NULL, NULL)); + CYSetProperty(context, cycript, CYJSString("ObjectiveC"), ObjectiveC); + + CYSetProperty(context, ObjectiveC, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Classes_, NULL)); + CYSetProperty(context, ObjectiveC, CYJSString("protocols"), JSObjectMake(context, ObjectiveC_Protocols_, NULL)); + +#if OBJC_API_VERSION >= 2 CYSetProperty(context, ObjectiveC, CYJSString("images"), JSObjectMake(context, ObjectiveC_Images_, NULL)); #endif @@ -2351,33 +2427,30 @@ void CYObjectiveC_SetupContext(JSContextRef context) { JSObjectRef Selector(JSObjectMakeConstructor(context, Selector_, &Selector_new)); JSObjectRef Super(JSObjectMakeConstructor(context, Super_, &Super_new)); - Instance_prototype_ = (JSObjectRef) CYGetProperty(context, Instance, prototype_); - JSValueProtect(context, Instance_prototype_); + JSObjectRef Instance_prototype(CYCastJSObject(context, CYGetProperty(context, Instance, prototype_s))); + CYSetProperty(context, cy, CYJSString("Instance_prototype"), Instance_prototype); - CYSetProperty(context, global, CYJSString("Instance"), Instance); - CYSetProperty(context, global, CYJSString("Selector"), Selector); - CYSetProperty(context, global, CYJSString("Super"), Super); + CYSetProperty(context, cycript, CYJSString("Instance"), Instance); + CYSetProperty(context, cycript, CYJSString("Selector"), Selector); + CYSetProperty(context, cycript, CYJSString("Super"), Super); #if defined(__APPLE__) && defined(__arm__) - CYSetProperty(context, global, CYJSString("objc_registerClassPair"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_registerClassPair"), &objc_registerClassPair_)); - MSHookFunction(&objc_registerClassPair, MSHake(objc_registerClassPair)); + CYSetProperty(context, all, CYJSString("objc_registerClassPair"), &objc_registerClassPair_, kJSPropertyAttributeDontEnum); #endif - CYSetProperty(context, global, CYJSString("objc_msgSend"), JSObjectMakeFunctionWithCallback(context, CYJSString("objc_msgSend"), &$objc_msgSend)); - - JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Message, prototype_), Function_prototype_); - JSObjectSetPrototype(context, (JSObjectRef) CYGetProperty(context, Selector, prototype_), Function_prototype_); + CYSetProperty(context, all, CYJSString("objc_msgSend"), &$objc_msgSend, kJSPropertyAttributeDontEnum); -#ifdef __APPLE__ - class_addMethod(NSCFType_, @selector(cy$toJSON:), reinterpret_cast(&NSCFType$cy$toJSON), "@12@0:4@8"); -#endif -} + JSObjectRef Function_prototype(CYGetCachedObject(context, CYJSString("Function_prototype"))); + JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Message, prototype_s)), Function_prototype); + JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Selector, prototype_s)), Function_prototype); +} CYPoolCatch() } static CYHooks CYObjectiveCHooks = { &CYObjectiveC_ExecuteStart, &CYObjectiveC_ExecuteEnd, &CYObjectiveC_RuntimeProperty, &CYObjectiveC_CallFunction, + &CYObjectiveC_Initialize, &CYObjectiveC_SetupContext, &CYObjectiveC_PoolFFI, &CYObjectiveC_FromFFI, @@ -2386,5 +2459,7 @@ static CYHooks CYObjectiveCHooks = { 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;