X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/6419a40fb7c8e1c92e2bb7a6691f071fbfa76e77..2b1911b269244f4e84abbb671c82cd804f8c93c6:/Execute.cpp diff --git a/Execute.cpp b/Execute.cpp index 57c812f..18bdce6 100644 --- a/Execute.cpp +++ b/Execute.cpp @@ -181,11 +181,12 @@ static JSObjectRef (*JSObjectMakeArray$)(JSContextRef, size_t, const JSValueRef[ JSObjectRef CYObjectMakeArray(JSContextRef context, size_t length, const JSValueRef values[]) { if (JSObjectMakeArray$ != NULL) return _jsccall(*JSObjectMakeArray$, context, length, values); - else { - JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array"))); - JSValueRef value(CYCallAsFunction(context, Array, NULL, length, values)); - return CYCastJSObject(context, value); - } + JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array"))); + bool wat(length == 1 && JSValueGetType(context, values[0]) == kJSTypeNumber); + JSValueRef value(CYCallAsFunction(context, Array, NULL, wat ? 0 : length, values)); + JSObjectRef object(CYCastJSObject(context, value)); + if (wat) CYArrayPush(context, object, 1, values); + return object; } static JSClassRef All_; @@ -197,6 +198,7 @@ JSStringRef constructor_s; JSStringRef cy_s; JSStringRef cyi_s; JSStringRef cyt_s; +JSStringRef cyt__s; JSStringRef length_s; JSStringRef message_s; JSStringRef name_s; @@ -216,6 +218,8 @@ static JSStringRef Result_; void CYFinalize(JSObjectRef object) { CYData *internal(reinterpret_cast(JSObjectGetPrivate(object))); + if (internal == NULL) + return; _assert(internal->count_ != _not(unsigned)); if (--internal->count_ == 0) delete internal; @@ -251,12 +255,6 @@ struct CArray : type_(new(*pool_) Type_privateData(type, ffi)), length_(length) { - if (owner == NULL) { - size_t size(ffi->size * length); - void *copy(pool_->malloc(size, ffi->alignment)); - memcpy(copy, value_, size); - value_ = copy; - } } }; @@ -270,8 +268,6 @@ struct CString : value_(value), owner_(context, owner) { - if (owner == NULL) - value_ = pool_->strdup(value_); } }; @@ -340,6 +336,7 @@ JSValueRef CYCastJSValue(JSContextRef context, double value) { return JSValueMakeNumber(context, static_cast(value)); \ } +CYCastJSValue_(long double) CYCastJSValue_(signed short int) CYCastJSValue_(unsigned short int) CYCastJSValue_(signed int) @@ -675,6 +672,24 @@ bool CYGetOffset(CYPool &pool, JSContextRef context, JSStringRef value, ssize_t return CYGetOffset(CYPoolCString(pool, context, value), index); } +// XXX: this is a horrible back added for CFType +void *CYCastPointerEx_(JSContextRef context, JSObjectRef value) { + JSObjectRef object((JSObjectRef) value); + if (JSValueIsObjectOfClass(context, value, CYPrivate::Class_)) { + Pointer *internal(reinterpret_cast(JSObjectGetPrivate(object))); + return internal->value_; + } + + JSValueRef toPointer(CYGetProperty(context, object, toPointer_s)); + if (CYIsCallable(context, toPointer)) { + JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toPointer, object, 0, NULL)); + _assert(value != NULL); + return CYCastPointer_(context, value); + } + + return NULL; +} + void *CYCastPointer_(JSContextRef context, JSValueRef value, bool *guess) { if (value == NULL) return NULL; @@ -709,6 +724,8 @@ void *CYCastPointer_(JSContextRef context, JSValueRef value, bool *guess) { } } +static JSValueRef FunctionAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function); + namespace sig { // XXX: this is somehow not quite a template :/ @@ -724,14 +741,17 @@ void Primitive::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi *reinterpret_cast(data) = CYCastDouble(context, value); \ } -CYPoolFFI_(char) -CYPoolFFI_(double) +CYPoolFFI_(wchar_t) CYPoolFFI_(float) +CYPoolFFI_(double) +CYPoolFFI_(long double) + CYPoolFFI_(signed char) CYPoolFFI_(signed int) CYPoolFFI_(signed long int) CYPoolFFI_(signed long long int) CYPoolFFI_(signed short int) + CYPoolFFI_(unsigned char) CYPoolFFI_(unsigned int) CYPoolFFI_(unsigned long int) @@ -743,8 +763,21 @@ CYPoolFFI_(signed __int128) CYPoolFFI_(unsigned __int128) #endif +template <> +void Primitive::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { + if (JSValueGetType(context, value) != kJSTypeString) + *reinterpret_cast(data) = CYCastDouble(context, value); + else { + CYJSString script(context, value); + auto string(CYCastUTF16String(script)); + _assert(string.size == 1); + _assert((string.data[0] & 0xff) == string.data[0]); + *reinterpret_cast(data) = string.data[0]; + } +} + void Void::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { - _assert(false); + _assert(JSValueIsUndefined(context, value)); } void Unknown::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { @@ -762,17 +795,11 @@ void Bits::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data _assert(false); } -static void CYArrayCopy(CYPool *pool, JSContextRef context, uint8_t *base, size_t length, const sig::Type &type, ffi_type *ffi, JSValueRef value, JSObjectRef object) { +static void CYArrayCopy(CYPool *pool, JSContextRef context, uint8_t *base, size_t length, const sig::Type &type, ffi_type *ffi, JSObjectRef object) { for (size_t index(0); index != length; ++index) { - JSValueRef rhs; - if (object == NULL) - rhs = value; - else { - rhs = CYGetProperty(context, object, index); - if (JSValueIsUndefined(context, rhs)) - throw CYJSError(context, "unable to extract array value"); - } - + JSValueRef rhs(CYGetProperty(context, object, index)); + if (JSValueIsUndefined(context, rhs)) + throw CYJSError(context, "unable to extract array value"); type.PoolFFI(pool, context, ffi, base, rhs); base += ffi->size; } @@ -783,13 +810,20 @@ void Pointer::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *d *reinterpret_cast(data) = CYCastPointer(context, value, &guess); if (!guess || pool == NULL || !JSValueIsObject(context, value)) return; + JSObjectRef object(CYCastJSObject(context, value)); - if (CYHasProperty(context, object, length_s)) { + + if (sig::Function *function = dynamic_cast(&type)) { + _assert(!function->variadic); + auto internal(CYMakeFunctor_(context, object, function->signature, &FunctionAdapter_)); + // XXX: see notes in Library.cpp about needing to leak + *reinterpret_cast(data) = internal->value_; + } else if (CYHasProperty(context, object, length_s)) { size_t length(CYArrayLength(context, object)); ffi_type *element(type.GetFFI(*pool)); size_t size(element->size * length); uint8_t *base(pool->malloc(size, element->alignment)); - CYArrayCopy(pool, context, base, length, type, element, value, object); + CYArrayCopy(pool, context, base, length, type, element, object); *reinterpret_cast(data) = base; } } @@ -798,8 +832,7 @@ void Array::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *dat if (size == 0) return; uint8_t *base(reinterpret_cast(data)); - JSObjectRef object(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL); - CYArrayCopy(pool, context, base, size, type, ffi->elements[0], value, object); + CYArrayCopy(pool, context, base, size, type, ffi->elements[0], CYCastJSObject(context, value)); } void Enum::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const { @@ -842,32 +875,60 @@ void Function::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void * _assert(false); } +// XXX: this code is getting worse, not better :/ + #define CYFromFFI_(Type_) \ template <> \ +JSValueRef Primitive::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { \ + JSValueRef value(CYCastJSValue(context, *reinterpret_cast(data))); \ + JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("Number")), 1, &value)); \ + CYSetProperty(context, typed, cyt__s, CYMakeType(context, *this), kJSPropertyAttributeDontEnum); \ + return typed; \ +} + +#define CYFromFFI_2(Type_) \ +template <> \ JSValueRef Primitive::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { \ return CYCastJSValue(context, *reinterpret_cast(data)); \ } -CYFromFFI_(bool) -CYFromFFI_(char) -CYFromFFI_(double) +CYFromFFI_(wchar_t) CYFromFFI_(float) -CYFromFFI_(signed char) -CYFromFFI_(signed int) +CYFromFFI_(double) +CYFromFFI_(long double) + +CYFromFFI_2(signed char) +CYFromFFI_2(signed int) CYFromFFI_(signed long int) CYFromFFI_(signed long long int) -CYFromFFI_(signed short int) -CYFromFFI_(unsigned char) -CYFromFFI_(unsigned int) +CYFromFFI_2(signed short int) + +CYFromFFI_2(unsigned char) +CYFromFFI_2(unsigned int) CYFromFFI_(unsigned long int) CYFromFFI_(unsigned long long int) -CYFromFFI_(unsigned short int) +CYFromFFI_2(unsigned short int) #ifdef __SIZEOF_INT128__ CYFromFFI_(signed __int128) CYFromFFI_(unsigned __int128) #endif +template <> +JSValueRef Primitive::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + return CYCastJSValue(context, *reinterpret_cast(data)); +} + +template <> +JSValueRef Primitive::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { + uint16_t string(uint8_t(*reinterpret_cast(data))); + JSValueRef value(CYCastJSValue(context, CYJSString(CYUTF16String(&string, 1)))); + JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("String")), 1, &value)); + CYSetProperty(context, typed, cyt_s, CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + CYSetPrototype(context, typed, CYGetCachedValue(context, CYJSString("Character_prototype"))); + return typed; +} + JSValueRef Void::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { return CYJSUndefined(context); } @@ -924,8 +985,7 @@ void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg) { values[index] = internal->signature_.elements[1 + index].type->FromFFI(context, internal->cif_.arg_types[index], arguments[index]); JSValueRef value(internal->adapter_(context, count, values, internal->function_)); - if (internal->cif_.rtype != &ffi_type_void) - internal->signature_.elements[0].type->PoolFFI(NULL, context, internal->cif_.rtype, result, value); + internal->signature_.elements[0].type->PoolFFI(NULL, context, internal->cif_.rtype, result, value); } static JSValueRef FunctionAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) { @@ -1013,7 +1073,8 @@ static JSValueRef CString_getProperty(JSContextRef context, JSObjectRef object, else if (!CYGetOffset(pool, context, property, offset)) return NULL; - return CYCastJSValue(context, CYJSString(CYUTF8String(&internal->value_[offset], 1))); + sig::Primitive type; + return type.FromFFI(context, type.GetFFI(pool), internal->value_ + offset, false, NULL); } CYCatch(NULL) } static bool CString_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { @@ -1026,8 +1087,8 @@ static bool CString_setProperty(JSContextRef context, JSObjectRef object, JSStri else if (!CYGetOffset(pool, context, property, offset)) return false; - const char *data(CYPoolCString(pool, context, value)); - internal->value_[offset] = *data; + sig::Primitive type; + type.PoolFFI(NULL, context, type.GetFFI(pool), internal->value_ + offset, value); return true; } CYCatch(false) } @@ -1221,7 +1282,10 @@ static sig::Type *CYGetType(CYPool &pool, JSContextRef context, JSValueRef value if (JSValueIsNull(context, value)) return &PointerToVoid_; JSObjectRef object(CYCastJSObject(context, value)); - JSObjectRef type(CYCastJSObject(context, CYGetProperty(context, object, cyt_s))); + JSValueRef check(CYGetProperty(context, object, cyt_s)); + if (JSValueIsUndefined(context, check)) + CYThrow("could not infer type of argument '%s'", CYPoolCString(pool, context, value)); + JSObjectRef type(CYCastJSObject(context, check)); _assert(JSValueIsObjectOfClass(context, type, CYPrivate::Class_)); Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(type))); return internal->type_; @@ -1272,7 +1336,8 @@ JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, voi element.type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]); } - uint8_t *value(pool.malloc(std::max(cif->rtype->size, sizeof(ffi_arg)), std::max(cif->rtype->alignment, alignof(ffi_arg)))); + CYBuffer buffer(context); + uint8_t *value(buffer->malloc(std::max(cif->rtype->size, sizeof(ffi_arg)), std::max(cif->rtype->alignment, alignof(ffi_arg)))); void (*call)(CYPool &, JSContextRef, ffi_cif *, void (*)(), void *, void **) = &CYCallFunction; // XXX: this only supports one hook, but it is a bad idea anyway @@ -1281,7 +1346,7 @@ JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, voi call = hook->CallFunction; call(pool, context, cif, function, value, values); - return signature.elements[0].type->FromFFI(context, cif->rtype, value, initialize); + return signature.elements[0].type->FromFFI(context, cif->rtype, value, initialize, buffer); } static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1645,7 +1710,7 @@ static JSValueRef Type_callAsFunction_pointerTo(JSContextRef context, JSObjectRe Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); if (dynamic_cast *>(internal->type_) != NULL) - return CYMakeType(context, sig::String()); + return CYMakeType(context, sig::String((internal->type_->flags & JOC_TYPE_CONST) != 0)); else return CYMakeType(context, sig::Pointer(*internal->type_)); } CYCatch(NULL) } @@ -1667,21 +1732,21 @@ static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object, if (sig::Function *function = dynamic_cast(internal->type_)) return CYMakeFunctor(context, arguments[0], function->variadic, function->signature); - CYPool pool; + CYBuffer buffer(context); sig::Type *type(internal->type_); ffi_type *ffi(internal->GetFFI()); - void *data(pool.malloc(ffi->size, ffi->alignment)); - type->PoolFFI(&pool, context, ffi, data, arguments[0]); - JSValueRef value(type->FromFFI(context, ffi, data)); - - if (JSValueGetType(context, value) == kJSTypeNumber) { - JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("Number")), 1, &value)); - CYSetProperty(context, typed, cyt_s, object, kJSPropertyAttributeDontEnum); - value = typed; + void *data; + if (_this == NULL || CYIsStrictEqual(context, _this, CYGetGlobalObject(context))) + data = buffer->malloc(ffi->size, ffi->alignment); + else { + CYSetProperty(context, buffer, CYJSString("$cyo"), _this, kJSPropertyAttributeDontEnum); + data = CYCastPointer(context, _this); } + type->PoolFFI(buffer, context, ffi, data, arguments[0]); + JSValueRef value(type->FromFFI(context, ffi, data, false, buffer)); return value; } CYCatch(NULL) } @@ -1827,7 +1892,7 @@ static JSValueRef CString_getProperty_length(JSContextRef context, JSObjectRef o } CYCatch(NULL) } static JSValueRef CString_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { - return CYMakeType(context, sig::String()); + return CYMakeType(context, sig::String(true)); } CYCatch(NULL) } static JSValueRef CArray_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { @@ -1954,9 +2019,10 @@ static JSStaticValue Struct_staticValues[2] = { {NULL, NULL, NULL, 0} }; -static JSStaticFunction Functor_staticFunctions[4] = { +static JSStaticFunction Functor_staticFunctions[5] = { {"$cya", &Functor_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toCYON", &Functor_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"toPointer", &Functor_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"valueOf", &Functor_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} }; @@ -2096,6 +2162,7 @@ void CYInitializeDynamic() { JSClassDefinition definition; definition = kJSClassDefinitionEmpty; + definition.attributes = kJSClassAttributeNoAutomaticPrototype; definition.className = "All"; definition.staticFunctions = All_staticFunctions; definition.hasProperty = &All_hasProperty; @@ -2104,6 +2171,7 @@ void CYInitializeDynamic() { All_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; + definition.attributes = kJSClassAttributeNoAutomaticPrototype; definition.className = "Context"; definition.finalize = &CYFinalize; CYPrivate::Class_ = JSClassCreate(&definition); @@ -2144,6 +2212,11 @@ void CYInitializeDynamic() { definition.finalize = &CYFinalize; CYPrivate::Class_ = JSClassCreate(&definition); + definition = kJSClassDefinitionEmpty; + definition.className = "Root"; + definition.finalize = &CYFinalize; + CYPrivate::Class_ = JSClassCreate(&definition); + definition = kJSClassDefinitionEmpty; definition.className = "Struct"; definition.staticFunctions = Struct_staticFunctions; @@ -2173,6 +2246,7 @@ void CYInitializeDynamic() { cy_s = JSStringCreateWithUTF8CString("$cy"); cyi_s = JSStringCreateWithUTF8CString("$cyi"); cyt_s = JSStringCreateWithUTF8CString("$cyt"); + cyt__s = JSStringCreateWithUTF8CString("$cyt_"); length_s = JSStringCreateWithUTF8CString("length"); message_s = JSStringCreateWithUTF8CString("message"); name_s = JSStringCreateWithUTF8CString("name"); @@ -2460,7 +2534,17 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { CYSetProperty(context, cycript, CYJSString("Functor"), Functor); CYSetProperty(context, cycript, CYJSString("Pointer"), JSObjectMakeConstructor(context, CYPrivate::Class_, &Pointer_new)); - CYSetProperty(context, cycript, CYJSString("Type"), JSObjectMakeConstructor(context, CYPrivate::Class_, &Type_new)); + + JSObjectRef Type(JSObjectMakeConstructor(context, CYPrivate::Class_, &Type_new)); + JSObjectRef Type_prototype(CYCastJSObject(context, CYGetProperty(context, Type, prototype_s))); + CYSetPrototype(context, Type_prototype, Function_prototype); + CYSetProperty(context, cy, CYJSString("Type_prototype"), Type_prototype); + CYSetProperty(context, cycript, CYJSString("Type"), Type); + + JSObjectRef Character_prototype(JSObjectMake(context, NULL, NULL)); + CYSetPrototype(context, Character_prototype, String_prototype); + CYSetProperty(context, cy, CYJSString("Character_prototype"), Character_prototype); + CYSetProperty(context, Character_prototype, CYJSString("valueOf"), _jsccall(JSEvaluateScript, context, CYJSString("(function(){return this.charCodeAt(0);})"), NULL, NULL, 0)); JSObjectRef modules(JSObjectMake(context, NULL, NULL)); CYSetProperty(context, cy, CYJSString("modules"), modules); @@ -2497,7 +2581,7 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { } #endif - CYSetProperty(context, String_prototype, cyt_s, CYMakeType(context, sig::String()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, String_prototype, cyt_s, CYMakeType(context, sig::String(true)), kJSPropertyAttributeDontEnum); CYSetProperty(context, cache, CYJSString("dlerror"), CYMakeFunctor(context, "dlerror", "*"), kJSPropertyAttributeDontEnum); CYSetProperty(context, cache, CYJSString("RTLD_DEFAULT"), CYCastJSValue(context, reinterpret_cast(RTLD_DEFAULT)), kJSPropertyAttributeDontEnum); @@ -2527,6 +2611,7 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { CYSetProperty(context, cache, CYJSString("float"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); CYSetProperty(context, cache, CYJSString("double"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("longdouble"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); CYSetProperty(context, global, CYJSString("require"), &require_callAsFunction, kJSPropertyAttributeDontEnum);