X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/8493347dd9711848398e2d667080110a376be96d..13c7f2fb8fc0619c8da1b5c8a697f7894479b070:/ObjectiveC/Library.mm diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm index 7ac3bb0..a685816 100644 --- a/ObjectiveC/Library.mm +++ b/ObjectiveC/Library.mm @@ -40,6 +40,7 @@ #include #endif +#include "Code.hpp" #include "Error.hpp" #include "JavaScript.hpp" #include "String.hpp" @@ -129,6 +130,8 @@ 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); +@class NSBlock; + struct BlockLiteral { Class isa; int flags; @@ -394,8 +397,15 @@ 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))); + JSObjectRef value(JSObjectMake(context, CYIsKindOfClass(object, NSBlock_) ? FunctionInstance_ : Instance_, new Instance(object, flags))); JSObjectSetPrototype(context, value, CYGetClassPrototype(context, object_getClass(object))); return value; } @@ -641,7 +651,7 @@ 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) { @@ -671,7 +681,7 @@ static void BlockClosure_(ffi_cif *cif, void *result, void **arguments, void *ar CYExecuteClosure(cif, result, arguments, arg, &BlockAdapter_); } -NSObject *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature &signature) { +NSBlock *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature &signature) { _assert(__NSMallocBlock__ != Nil); BlockLiteral *literal(reinterpret_cast(malloc(sizeof(BlockLiteral)))); @@ -690,7 +700,7 @@ NSObject *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature descriptor->d_.two_.dispose_helper = &CYDisposeBlock; descriptor->d_.three_.signature = sig::Unparse(*descriptor->internal_->pool_, &signature); - return reinterpret_cast(literal); + return reinterpret_cast(literal); } NSObject *CYCastNSObject(CYPool *pool, JSContextRef context, JSObjectRef object) { @@ -1460,8 +1470,10 @@ static SEL CYCastSEL(JSContextRef context, JSValueRef value) { if (JSValueIsObjectOfClass(context, value, Selector_)) { Selector_privateData *internal(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) value))); return reinterpret_cast(internal->value_); - } else - return CYCastPointer(context, value); + } else { + CYPool pool; + return sel_registerName(CYPoolCString(pool, context, value)); + } } void *CYObjectiveC_ExecuteStart(JSContextRef context) { CYSadTry { @@ -1486,30 +1498,49 @@ static void CYObjectiveC_CallFunction(JSContextRef context, ffi_cif *cif, void ( ffi_call(cif, function, value, values); } CYSadCatch() } -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 +static NSBlock *CYCastNSBlock(CYPool &pool, JSContextRef context, JSValueRef value, sig::Signature *signature) { + if (JSValueIsNull(context, value)) + return nil; + JSObjectRef object(CYCastJSObject(context, value)); - switch (type->primitive) { - case sig::block_P: { - _assert(type->data.signature.count != 0); - sig::Signature signature; - sig::Copy(*pool, signature, type->data.signature); + if (JSValueIsObjectOfClass(context, object, FunctionInstance_)) + return reinterpret_cast(JSObjectGetPrivate(object))->GetValue(); - sig::Element *elements(new(*pool) sig::Element[++signature.count]); - elements[0] = signature.elements[0]; - memcpy(elements + 2, signature.elements + 1, sizeof(sig::Element) * (signature.count - 2)); - signature.elements = elements; + if (JSValueIsObjectOfClass(context, object, Instance_)) { + _assert(reinterpret_cast(JSObjectGetPrivate(object))->GetValue() == nil); + return nil; + } + + _assert(JSObjectIsFunction(context, object)); + + _assert(signature != NULL); + _assert(signature->count != 0); - elements[1].name = NULL; - elements[1].type = new(*pool) sig::Type(); - elements[1].offset = _not(size_t); + sig::Signature modified; + modified.count = signature->count + 1; + modified.elements = new(pool) sig::Element[modified.count]; - memset(elements[1].type, 0, sizeof(sig::Type)); - elements[1].type->primitive = sig::object_P; + modified.elements[0] = signature->elements[0]; + memcpy(modified.elements + 2, signature->elements + 1, sizeof(sig::Element) * (signature->count - 1)); - JSObjectRef function(CYCastJSObject(context, value)); - *reinterpret_cast(data) = CYMakeBlock(context, function, signature); - } break; + 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) { + case sig::block_P: + // XXX: this function might not handle the idea of a null pool + *reinterpret_cast(data) = CYCastNSBlock(*pool, context, value, &type->data.signature); + break; case sig::object_P: case sig::typename_P: @@ -1572,24 +1603,6 @@ static bool CYImplements(id object, Class _class, SEL selector, bool devoid = fa return false; } -static const char *CYPoolTypeEncoding(CYPool &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); @@ -1648,11 +1661,8 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr 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; @@ -1660,10 +1670,29 @@ static bool Messages_setProperty(JSContextRef context, JSObjectRef object, JSStr Message_privateData *message(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) value))); type = sig::Unparse(pool, &message->signature_); imp = reinterpret_cast(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); @@ -1927,42 +1956,37 @@ static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef return value; } CYCatch(NULL) } -static JSValueRef Instance_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - Instance *internal(reinterpret_cast(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 - +static const char *CYBlockEncoding(NSBlock *self) { BlockLiteral *literal(reinterpret_cast(self)); + if ((literal->flags & BLOCK_HAS_SIGNATURE) == 0) + return NULL; + uint8_t *descriptor(reinterpret_cast(literal->descriptor)); + descriptor += sizeof(BlockDescriptor1); + if ((literal->flags & BLOCK_HAS_COPY_DISPOSE) != 0) + descriptor += sizeof(BlockDescriptor2); + BlockDescriptor3 *descriptor3(reinterpret_cast(descriptor)); + return descriptor3->signature; +} - if ((literal->flags & BLOCK_HAS_SIGNATURE) != 0) { - uint8_t *descriptor(reinterpret_cast(literal->descriptor)); - descriptor += sizeof(BlockDescriptor1); - if ((literal->flags & BLOCK_HAS_COPY_DISPOSE) != 0) - descriptor += sizeof(BlockDescriptor2); - BlockDescriptor3 *descriptor3(reinterpret_cast(descriptor)); +static JSValueRef FunctionInstance_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); + id self(internal->GetValue()); - if (const char *type = descriptor3->signature) { - CYPool pool; + if (const char *encoding = CYBlockEncoding(self)) { + CYPool pool; - void *setup[1]; - setup[0] = &self; + void *setup[1]; + setup[0] = &self; - sig::Signature signature; - sig::Parse(pool, &signature, type, &Structor_); + sig::Signature signature; + sig::Parse(pool, &signature, encoding, &Structor_); - ffi_cif cif; - sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif); + ffi_cif cif; + sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif); - void (*function)() = reinterpret_cast(literal->invoke); - return CYCallFunction(pool, context, 1, setup, count, arguments, false, &signature, &cif, function); - } + BlockLiteral *literal(reinterpret_cast(self)); + void (*function)() = reinterpret_cast(literal->invoke); + return CYCallFunction(pool, context, 1, setup, count, arguments, false, &signature, &cif, function); } if (count != 0) @@ -2124,6 +2148,11 @@ static JSValueRef Internal_callAsFunction_$cya(JSContextRef context, JSObjectRef 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)); @@ -2303,8 +2332,14 @@ static void choose_(task_t task, void *baton, unsigned type, vm_range_t *ranges, if (result == choice->query_.end()) continue; - // XXX: if (size < class_getInstanceSize(*result)) - if ((class_getInstanceSize(*result) + 15) / 16 * 16 != size) + 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(data))); } @@ -2562,6 +2597,18 @@ 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(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) { CYTry { Instance *internal(reinterpret_cast(JSObjectGetPrivate(object))); return Instance::Make(context, (id) object_getClass(internal->GetValue())); @@ -2701,15 +2748,9 @@ static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef Selector_privateData *internal(reinterpret_cast(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; - - const char *encoding(CYPoolTypeEncoding(pool, context, sel, method)); - if (encoding == NULL) - return CYJSNull(context); + Class _class(_require(CYCastClass(pool, context, arguments[0]))); + objc_method *method(_require(class_getInstanceMethod(_class, sel))); + const char *encoding(method_getTypeEncoding(method)); sig::Signature signature; sig::Parse(pool, &signature, encoding, &Structor_); @@ -2721,6 +2762,7 @@ static JSStaticValue Selector_staticValues[2] = { {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}, @@ -2729,6 +2771,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}, @@ -2813,7 +2865,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); @@ -2824,9 +2875,6 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition.className = "BooleanInstance"; BooleanInstance_ = JSClassCreate(&definition); - definition.className = "FunctionInstance"; - FunctionInstance_ = JSClassCreate(&definition); - definition.className = "NumberInstance"; NumberInstance_ = JSClassCreate(&definition); @@ -2836,6 +2884,11 @@ void CYObjectiveC_Initialize() { /*XXX*/ JSContextRef context(NULL); CYPoolTry { definition.className = "StringInstance"; StringInstance_ = 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; @@ -2887,6 +2940,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); @@ -3045,7 +3099,8 @@ extern "C" void CydgetMemoryParse(const uint16_t **data, size_t *size) { try { CYPool pool; CYUTF8String utf8(CYPoolUTF8String(pool, CYUTF16String(*data, *size))); - utf8 = CYPoolCode(pool, utf8); + 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));