X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/bc3080fdd24b9858d9c9dcbd3d8dd78ae010962a..64a505ff07b28093bb91a680f8a2c2292327e896:/Execute.cpp diff --git a/Execute.cpp b/Execute.cpp index 0bb732c..bb337ba 100644 --- a/Execute.cpp +++ b/Execute.cpp @@ -1,86 +1,91 @@ /* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2012 Jay Freeman (saurik) + * Copyright (C) 2009-2015 Jay Freeman (saurik) */ -/* GNU Lesser General Public License, Version 3 {{{ */ +/* GNU Affero General Public License, Version 3 {{{ */ /* - * Cycript is free software: you can redistribute it and/or modify it under - * the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or (at your - * option) any later version. - * - * Cycript is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public - * License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Cycript. If not, see . + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . **/ /* }}} */ -#include "Internal.hpp" - -#include -#include - #include "cycript.hpp" -#include "sig/parse.hpp" -#include "sig/ffi_type.hpp" - -#include "Pooling.hpp" -#include "Execute.hpp" - -#include - #include -#include #include #include #include #include #include -#include "Parser.hpp" -#include "Cycript.tab.hh" +#include +#include +#include +#include + +#include +#include + +#include "sig/parse.hpp" +#include "sig/ffi_type.hpp" +#include "Code.hpp" +#include "Decode.hpp" #include "Error.hpp" +#include "Execute.hpp" +#include "Internal.hpp" #include "JavaScript.hpp" +#include "Pooling.hpp" #include "String.hpp" -struct CYHooks *hooks_; +static std::vector &GetHooks() { + static std::vector hooks; + return hooks; +} + +CYRegisterHook::CYRegisterHook(CYHook *hook) { + GetHooks().push_back(hook); +} /* JavaScript Properties {{{ */ +bool CYHasProperty(JSContextRef context, JSObjectRef object, JSStringRef name) { + return JSObjectHasProperty(context, object, name); +} + JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, size_t index) { - JSValueRef exception(NULL); - JSValueRef value(JSObjectGetPropertyAtIndex(context, object, index, &exception)); - CYThrow(context, exception); - return value; + return _jsccall(JSObjectGetPropertyAtIndex, context, object, index); } JSValueRef CYGetProperty(JSContextRef context, JSObjectRef object, JSStringRef name) { - JSValueRef exception(NULL); - JSValueRef value(JSObjectGetProperty(context, object, name, &exception)); - CYThrow(context, exception); - return value; + return _jsccall(JSObjectGetProperty, context, object, name); } void CYSetProperty(JSContextRef context, JSObjectRef object, size_t index, JSValueRef value) { - JSValueRef exception(NULL); - JSObjectSetPropertyAtIndex(context, object, index, value, &exception); - CYThrow(context, exception); + _jsccall(JSObjectSetPropertyAtIndex, context, object, index, value); } void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef value, JSPropertyAttributes attributes) { - JSValueRef exception(NULL); - JSObjectSetProperty(context, object, name, value, attributes, &exception); - CYThrow(context, exception); + _jsccall(JSObjectSetProperty, context, object, name, value, attributes); } void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, JSValueRef (*callback)(JSContextRef, JSObjectRef, JSObjectRef, size_t, const JSValueRef[], JSValueRef *), JSPropertyAttributes attributes) { CYSetProperty(context, object, name, JSObjectMakeFunctionWithCallback(context, name, callback), attributes); } + +void CYSetPrototype(JSContextRef context, JSObjectRef object, JSValueRef value) { + JSObjectSetPrototype(context, object, value); + _assert(CYIsStrictEqual(context, JSObjectGetPrototype(context, object), value)); +} /* }}} */ /* JavaScript Strings {{{ */ JSStringRef CYCopyJSString(const char *value) { @@ -99,45 +104,43 @@ JSStringRef CYCopyJSString(CYUTF8String value) { JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value) { if (JSValueIsNull(context, value)) return NULL; - JSValueRef exception(NULL); - JSStringRef string(JSValueToStringCopy(context, value, &exception)); - CYThrow(context, exception); - return string; + return _jsccall(JSValueToStringCopy, context, value); } static CYUTF16String CYCastUTF16String(JSStringRef value) { return CYUTF16String(JSStringGetCharactersPtr(value), JSStringGetLength(value)); } -CYUTF8String CYPoolUTF8String(apr_pool_t *pool, JSContextRef context, JSStringRef value) { +CYUTF8String CYPoolUTF8String(CYPool &pool, JSContextRef context, JSStringRef value) { return CYPoolUTF8String(pool, CYCastUTF16String(value)); } -const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSStringRef value) { +const char *CYPoolCString(CYPool &pool, JSContextRef context, JSStringRef value) { CYUTF8String utf8(CYPoolUTF8String(pool, context, value)); _assert(memchr(utf8.data, '\0', utf8.size) == NULL); return utf8.data; } -const char *CYPoolCString(apr_pool_t *pool, JSContextRef context, JSValueRef value) { +const char *CYPoolCString(CYPool &pool, JSContextRef context, JSValueRef value) { return JSValueIsNull(context, value) ? NULL : CYPoolCString(pool, context, CYJSString(context, value)); } /* }}} */ /* Index Offsets {{{ */ -size_t CYGetIndex(apr_pool_t *pool, JSContextRef context, JSStringRef value) { +size_t CYGetIndex(CYPool &pool, JSContextRef context, JSStringRef value) { return CYGetIndex(CYPoolUTF8String(pool, context, value)); } /* }}} */ static JSClassRef All_; static JSClassRef Context_; -static JSClassRef Functor_; +JSClassRef Functor_; static JSClassRef Global_; static JSClassRef Pointer_; static JSClassRef Struct_; JSStringRef Array_s; JSStringRef cy_s; +JSStringRef cyi_s; JSStringRef length_s; JSStringRef message_s; JSStringRef name_s; @@ -149,19 +152,20 @@ JSStringRef toCYON_s; JSStringRef toJSON_s; JSStringRef toPointer_s; JSStringRef toString_s; +JSStringRef weak_s; static JSStringRef Result_; void CYFinalize(JSObjectRef object) { CYData *internal(reinterpret_cast(JSObjectGetPrivate(object))); + _assert(internal->count_ != _not(unsigned)); if (--internal->count_ == 0) delete internal; } -void Structor_(apr_pool_t *pool, sig::Type *&type) { +void Structor_(CYPool &pool, sig::Type *&type) { if ( type->primitive == sig::pointer_P && - type->data.data.type != NULL && type->data.data.type->primitive == sig::struct_P && type->data.data.type->name != NULL && strcmp(type->data.data.type->name, "_objc_class") == 0 @@ -219,7 +223,7 @@ struct Pointer : Pointer(void *value, JSContextRef context, JSObjectRef owner, size_t length, sig::Type *type) : CYOwned(value, context, owner), - type_(new(pool_) Type_privateData(type)), + type_(new(*pool_) Type_privateData(type)), length_(length) { } @@ -236,12 +240,9 @@ struct Struct_privateData : } }; -typedef std::map TypeMap; -static TypeMap Types_; - JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_type *ffi, JSObjectRef owner) { Struct_privateData *internal(new Struct_privateData(context, owner)); - apr_pool_t *pool(internal->pool_); + CYPool &pool(*internal->pool_); Type_privateData *typical(new(pool) Type_privateData(type, ffi)); internal->type_ = typical; @@ -249,7 +250,7 @@ JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_ internal->value_ = data; else { size_t size(typical->GetFFI()->size); - void *copy(apr_palloc(internal->pool_, size)); + void *copy(internal->pool_->malloc(size)); memcpy(copy, data, size); internal->value_ = copy; } @@ -257,6 +258,14 @@ JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_ return JSObjectMake(context, Struct_, internal); } +static void *CYCastSymbol(const char *name) { + for (CYHook *hook : GetHooks()) + if (hook->CastSymbol != NULL) + if (void *value = (*hook->CastSymbol)(name)) + return value; + return dlsym(RTLD_DEFAULT, name); +} + JSValueRef CYCastJSValue(JSContextRef context, bool value) { return JSValueMakeBoolean(context, value); } @@ -282,10 +291,7 @@ JSValueRef CYJSUndefined(JSContextRef context) { } double CYCastDouble(JSContextRef context, JSValueRef value) { - JSValueRef exception(NULL); - double number(JSValueToNumber(context, value, &exception)); - CYThrow(context, exception); - return number; + return _jsccall(JSValueToNumber, context, value); } bool CYCastBool(JSContextRef context, JSValueRef value) { @@ -305,48 +311,75 @@ JSValueRef CYCastJSValue(JSContextRef context, const char *value) { } JSObjectRef CYCastJSObject(JSContextRef context, JSValueRef value) { - JSValueRef exception(NULL); - JSObjectRef object(JSValueToObject(context, value, &exception)); - CYThrow(context, exception); - return object; + return _jsccall(JSValueToObject, context, value); } JSValueRef CYCallAsFunction(JSContextRef context, JSObjectRef function, JSObjectRef _this, size_t count, const JSValueRef arguments[]) { - JSValueRef exception(NULL); - JSValueRef value(JSObjectCallAsFunction(context, function, _this, count, arguments, &exception)); - CYThrow(context, exception); - return value; + return _jsccall(JSObjectCallAsFunction, context, function, _this, count, arguments); } bool CYIsCallable(JSContextRef context, JSValueRef value) { return value != NULL && JSValueIsObject(context, value) && JSObjectIsFunction(context, (JSObjectRef) value); } +bool CYIsEqual(JSContextRef context, JSValueRef lhs, JSValueRef rhs) { + return _jsccall(JSValueIsEqual, context, lhs, rhs); +} + +bool CYIsStrictEqual(JSContextRef context, JSValueRef lhs, JSValueRef rhs) { + return JSValueIsStrictEqual(context, lhs, rhs); +} + +size_t CYArrayLength(JSContextRef context, JSObjectRef array) { + return CYCastDouble(context, CYGetProperty(context, array, length_s)); +} + +JSValueRef CYArrayGet(JSContextRef context, JSObjectRef array, size_t index) { + return _jsccall(JSObjectGetPropertyAtIndex, context, array, index); +} + +void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) { + JSValueRef arguments[1]; + arguments[0] = value; + JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype"))); + _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, push_s)), array, 1, arguments); +} + static JSValueRef System_print(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + FILE *file(stdout); + if (count == 0) - printf("\n"); + fputc('\n', file); else { CYPool pool; - printf("%s\n", CYPoolCString(pool, context, arguments[0])); + CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0]))); + fwrite(string.data, string.size, 1, file); } + fflush(file); return CYJSUndefined(context); -} CYCatch } +} CYCatch(NULL) } -static size_t Nonce_(0); +static void (*JSSynchronousGarbageCollectForDebugging$)(JSContextRef); -static JSValueRef $cyq(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { - CYPool pool; - const char *name(apr_psprintf(pool, "%s%"APR_SIZE_T_FMT"", CYPoolCString(pool, context, arguments[0]), Nonce_++)); - return CYCastJSValue(context, name); +_visible void CYGarbageCollect(JSContextRef context) { + (JSSynchronousGarbageCollectForDebugging$ ?: &JSGarbageCollect)(context); } -static JSValueRef Cycript_gc_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { - JSGarbageCollect(context); +static JSValueRef Cycript_compile_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + CYPool pool; + CYUTF8String before(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0]))); + std::stringstream value(std::string(before.data, before.size)); + CYUTF8String after(CYPoolCode(pool, value)); + return CYCastJSValue(context, CYJSString(after)); +} CYCatch_(NULL, "SyntaxError") } + +static JSValueRef Cycript_gc_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + CYGarbageCollect(context); return CYJSUndefined(context); -} +} CYCatch(NULL) } -const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value, JSValueRef *exception) { CYTry { +const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSValueRef value, std::set &objects, JSValueRef *exception) { CYTry { switch (JSType type = JSValueGetType(context, value)) { case kJSTypeUndefined: return "undefined"; @@ -359,7 +392,7 @@ const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value std::ostringstream str; CYNumerify(str, CYCastDouble(context, value)); std::string value(str.str()); - return apr_pstrmemdup(pool, value.c_str(), value.size()); + return pool.strmemdup(value.c_str(), value.size()); } break; case kJSTypeString: { @@ -367,27 +400,35 @@ const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, value))); CYStringify(str, string.data, string.size); std::string value(str.str()); - return apr_pstrmemdup(pool, value.c_str(), value.size()); + return pool.strmemdup(value.c_str(), value.size()); } break; case kJSTypeObject: - return CYPoolCCYON(pool, context, (JSObjectRef) value); + return CYPoolCCYON(pool, context, (JSObjectRef) value, objects); default: throw CYJSError(context, "JSValueGetType() == 0x%x", type); } -} CYCatch } +} CYCatch(NULL) } -const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value) { - JSValueRef exception(NULL); - const char *cyon(CYPoolCCYON(pool, context, value, &exception)); - CYThrow(context, exception); - return cyon; +const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSValueRef value, std::set &objects) { + return _jsccall(CYPoolCCYON, pool, context, value, objects); +} + +const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSValueRef value, std::set *objects) { + if (objects != NULL) + return CYPoolCCYON(pool, context, value, *objects); + else { + std::set objects; + return CYPoolCCYON(pool, context, value, objects); + } } -const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSObjectRef object) { +const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object, std::set &objects) { JSValueRef toCYON(CYGetProperty(context, object, toCYON_s)); if (CYIsCallable(context, toCYON)) { - JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toCYON, object, 0, NULL)); + // XXX: this needs to be abstracted behind some kind of function + JSValueRef arguments[1] = {CYCastJSValue(context, reinterpret_cast(&objects))}; + JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toCYON, object, 1, arguments)); _assert(value != NULL); return CYPoolCString(pool, context, value); } @@ -395,10 +436,7 @@ const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSObjectRef obje JSValueRef toJSON(CYGetProperty(context, object, toJSON_s)); if (CYIsCallable(context, toJSON)) { JSValueRef arguments[1] = {CYCastJSValue(context, CYJSString(""))}; - JSValueRef exception(NULL); - const char *cyon(CYPoolCCYON(pool, context, CYCallAsFunction(context, (JSObjectRef) toJSON, object, 1, arguments), &exception)); - CYThrow(context, exception); - return cyon; + return _jsccall(CYPoolCCYON, pool, context, CYCallAsFunction(context, (JSObjectRef) toJSON, object, 1, arguments), objects); } if (JSObjectIsFunction(context, object)) { @@ -411,6 +449,8 @@ const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSObjectRef obje } } + _assert(objects.insert(object).second); + std::ostringstream str; str << '{'; @@ -421,32 +461,50 @@ const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSObjectRef obje bool comma(false); for (size_t index(0), count(JSPropertyNameArrayGetCount(names)); index != count; ++index) { - JSStringRef name(JSPropertyNameArrayGetNameAtIndex(names, index)); - JSValueRef value(CYGetProperty(context, object, name)); - if (comma) str << ','; else comma = true; + JSStringRef name(JSPropertyNameArrayGetNameAtIndex(names, index)); CYUTF8String string(CYPoolUTF8String(pool, context, name)); + if (CYIsKey(string)) str << string.data; else CYStringify(str, string.data, string.size); - str << ':' << CYPoolCCYON(pool, context, value); - } + str << ':'; - str << '}'; + try { + JSValueRef value(CYGetProperty(context, object, name)); + str << CYPoolCCYON(pool, context, value, objects); + } catch (const CYException &error) { + str << "@error"; + } + } JSPropertyNameArrayRelease(names); + str << '}'; + std::string string(str.str()); - return apr_pstrmemdup(pool, string.c_str(), string.size()); + return pool.strmemdup(string.c_str(), string.size()); +} + +std::set *CYCastObjects(JSContextRef context, JSObjectRef _this, size_t count, const JSValueRef arguments[]) { + if (count == 0) + return NULL; + return CYCastPointer *>(context, arguments[0]); } static JSValueRef Array_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + std::set *objects(CYCastObjects(context, _this, count, arguments)); + // XXX: this is horribly inefficient + std::set backup; + if (objects == NULL) + objects = &backup; + CYPool pool; std::ostringstream str; @@ -456,18 +514,21 @@ static JSValueRef Array_callAsFunction_toCYON(JSContextRef context, JSObjectRef bool comma(false); for (size_t index(0), count(CYCastDouble(context, length)); index != count; ++index) { - JSValueRef value(CYGetProperty(context, _this, index)); - if (comma) str << ','; else comma = true; - if (!JSValueIsUndefined(context, value)) - str << CYPoolCCYON(pool, context, value); - else { - str << ','; - comma = false; + try { + JSValueRef value(CYGetProperty(context, _this, index)); + if (!JSValueIsUndefined(context, value)) + str << CYPoolCCYON(pool, context, value, *objects); + else { + str << ','; + comma = false; + } + } catch (const CYException &error) { + str << "@error"; } } @@ -475,7 +536,22 @@ static JSValueRef Array_callAsFunction_toCYON(JSContextRef context, JSObjectRef std::string value(str.str()); return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size()))); -} CYCatch } +} CYCatch(NULL) } + +static JSValueRef Error_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + CYPool pool; + std::ostringstream str; + + str << "new " << CYPoolUTF8String(pool, context, CYJSString(context, CYGetProperty(context, _this, name_s))) << "("; + + CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, CYGetProperty(context, _this, message_s)))); + CYStringify(str, string.data, string.size); + + str << ")"; + + std::string value(str.str()); + return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size()))); +} CYCatch(NULL) } static JSValueRef String_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { CYPool pool; @@ -486,37 +562,42 @@ static JSValueRef String_callAsFunction_toCYON(JSContextRef context, JSObjectRef std::string value(str.str()); return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size()))); -} CYCatch } +} CYCatch(NULL) } JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, sig::Type *type, ffi_type *ffi, JSObjectRef owner) { Pointer *internal(new Pointer(pointer, context, owner, length, type)); return JSObjectMake(context, Pointer_, internal); } -static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const char *type, void **cache = NULL) { - cy::Functor *internal; +static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const sig::Signature &signature) { + return JSObjectMake(context, Functor_, new cy::Functor(signature, function)); +} - if (cache != NULL && *cache != NULL) { +static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *encoding, void **cache) { + cy::Functor *internal; + if (*cache != NULL) internal = reinterpret_cast(*cache); - ++internal->count_; - } else { - internal = new cy::Functor(type, function); + else { + void (*function)()(reinterpret_cast(CYCastSymbol(symbol))); + if (function == NULL) + return NULL; - if (cache != NULL) { - *cache = internal; - ++internal->count_; - } + internal = new cy::Functor(encoding, function); + *cache = internal; } + ++internal->count_; return JSObjectMake(context, Functor_, internal); } -static bool CYGetOffset(apr_pool_t *pool, JSContextRef context, JSStringRef value, ssize_t &index) { +static bool CYGetOffset(CYPool &pool, JSContextRef context, JSStringRef value, ssize_t &index) { return CYGetOffset(CYPoolCString(pool, context, value), index); } void *CYCastPointer_(JSContextRef context, JSValueRef value) { - switch (JSValueGetType(context, value)) { + if (value == NULL) + return NULL; + else switch (JSValueGetType(context, value)) { case kJSTypeNull: return NULL; case kJSTypeObject: { @@ -539,7 +620,7 @@ void *CYCastPointer_(JSContextRef context, JSValueRef value) { } } -void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { +void CYPoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { switch (type->primitive) { case sig::boolean_P: *reinterpret_cast(data) = JSValueToBoolean(context, value); @@ -589,7 +670,8 @@ void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type break; case sig::string_P: - *reinterpret_cast(data) = CYPoolCString(pool, context, value); + _assert(pool != NULL); + *reinterpret_cast(data) = CYPoolCString(*pool, context, value); break; case sig::struct_P: { @@ -624,9 +706,10 @@ void CYPoolFFI(apr_pool_t *pool, JSContextRef context, sig::Type *type, ffi_type break; default: - if (hooks_ != NULL && hooks_->PoolFFI != NULL) - if ((*hooks_->PoolFFI)(pool, context, type, ffi, data, value)) - return; + for (CYHook *hook : GetHooks()) + if (hook->PoolFFI != NULL) + if ((*hook->PoolFFI)(pool, context, type, ffi, data, value)) + return; CYThrow("unimplemented signature code: '%c''\n", type->primitive); } @@ -677,15 +760,16 @@ JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void null: return CYJSNull(context); default: - if (hooks_ != NULL && hooks_->FromFFI != NULL) - if (JSValueRef value = (*hooks_->FromFFI)(context, type, ffi, data, initialize, owner)) - return value; + for (CYHook *hook : GetHooks()) + if (hook->FromFFI != NULL) + if (JSValueRef value = (*hook->FromFFI)(context, type, ffi, data, initialize, owner)) + return value; CYThrow("unimplemented signature code: '%c''\n", type->primitive); } } -static void FunctionClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) { +void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg) { Closure_privateData *internal(reinterpret_cast(arg)); JSContextRef context(internal->context_); @@ -696,20 +780,24 @@ static void FunctionClosure_(ffi_cif *cif, void *result, void **arguments, void for (size_t index(0); index != count; ++index) values[index] = CYFromFFI(context, internal->signature_.elements[1 + index].type, internal->cif_.arg_types[index], arguments[index]); - JSValueRef value(CYCallAsFunction(context, internal->function_, NULL, count, values)); + JSValueRef value(internal->adapter_(context, count, values, internal->function_)); CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value); } -Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const char *type, void (*callback)(ffi_cif *, void *, void **, void *)) { +static JSValueRef FunctionAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) { + return CYCallAsFunction(context, function, NULL, count, values); +} + +Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const sig::Signature &signature, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef)) { // XXX: in case of exceptions this will leak // XXX: in point of fact, this may /need/ to leak :( - Closure_privateData *internal(new Closure_privateData(context, function, type)); + Closure_privateData *internal(new Closure_privateData(context, function, adapter, signature)); -#if defined(__APPLE__) && defined(__arm__) +#if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__)) void *executable; ffi_closure *writable(reinterpret_cast(ffi_closure_alloc(sizeof(ffi_closure), &executable))); - ffi_status status(ffi_prep_closure_loc(writable, &internal->cif_, callback, internal, executable)); + ffi_status status(ffi_prep_closure_loc(writable, &internal->cif_, &CYExecuteClosure, internal, executable)); _assert(status == FFI_OK); internal->value_ = executable; @@ -720,7 +808,7 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, -1, 0 ))); - ffi_status status(ffi_prep_closure(closure, &internal->cif_, callback, internal)); + ffi_status status(ffi_prep_closure(closure, &internal->cif_, &CYExecuteClosure, internal)); _assert(status == FFI_OK); _syscall(mprotect(closure, sizeof(*closure), PROT_READ | PROT_EXEC)); @@ -731,35 +819,36 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, return internal; } -static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const char *type) { - Closure_privateData *internal(CYMakeFunctor_(context, function, type, &FunctionClosure_)); +static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const sig::Signature &signature) { + Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &FunctionAdapter_)); JSObjectRef object(JSObjectMake(context, Functor_, internal)); // XXX: see above notes about needing to leak JSValueProtect(CYGetJSContext(context), object); return object; } +JSValueRef CYGetCachedValue(JSContextRef context, JSStringRef name) { + return CYGetProperty(context, CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s)), name); +} + JSObjectRef CYGetCachedObject(JSContextRef context, JSStringRef name) { - return CYCastJSObject(context, CYGetProperty(context, CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s)), name)); + return CYCastJSObject(context, CYGetCachedValue(context, name)); } -static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const char *type) { +static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const sig::Signature &signature) { JSObjectRef Function(CYGetCachedObject(context, CYJSString("Function"))); - JSValueRef exception(NULL); - bool function(JSValueIsInstanceOfConstructor(context, value, Function, &exception)); - CYThrow(context, exception); - + bool function(_jsccall(JSValueIsInstanceOfConstructor, context, value, Function)); if (function) { JSObjectRef function(CYCastJSObject(context, value)); - return CYMakeFunctor(context, function, type); + return CYMakeFunctor(context, function, signature); } else { void (*function)()(CYCastPointer(context, value)); - return CYMakeFunctor(context, function, type); + return CYMakeFunctor(context, function, signature); } } -static bool Index_(apr_pool_t *pool, JSContextRef context, Struct_privateData *internal, JSStringRef property, ssize_t &index, uint8_t *&base) { +static bool Index_(CYPool &pool, JSContextRef context, Struct_privateData *internal, JSStringRef property, ssize_t &index, uint8_t *&base) { Type_privateData *typical(internal->type_); sig::Type *type(typical->type_); if (type == NULL) @@ -810,9 +899,9 @@ static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, return internal->length_ == _not(size_t) ? CYJSUndefined(context) : CYCastJSValue(context, internal->length_); Type_privateData *typical(internal->type_); - if (typical->type_ == NULL) return NULL; + sig::Type &type(*typical->type_); ssize_t offset; if (JSStringIsEqualToUTF8CString(property, "$cyi")) @@ -820,14 +909,17 @@ static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, else if (!CYGetOffset(pool, context, property, offset)) return NULL; + if (type.primitive == sig::function_P) + return CYMakeFunctor(context, reinterpret_cast(internal->value_), type.data.signature); + ffi_type *ffi(typical->GetFFI()); uint8_t *base(reinterpret_cast(internal->value_)); base += ffi->size * offset; JSObjectRef owner(internal->GetOwner() ?: object); - return CYFromFFI(context, typical->type_, ffi, base, false, owner); -} CYCatch } + return CYFromFFI(context, &type, ffi, base, false, owner); +} CYCatch(NULL) } static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { CYPool pool; @@ -835,13 +927,13 @@ static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStri Type_privateData *typical(internal->type_); if (typical->type_ == NULL) - return NULL; + return false; ssize_t offset; if (JSStringIsEqualToUTF8CString(property, "$cyi")) offset = 0; else if (!CYGetOffset(pool, context, property, offset)) - return NULL; + return false; ffi_type *ffi(typical->GetFFI()); @@ -850,13 +942,13 @@ static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStri CYPoolFFI(NULL, context, typical->type_, ffi, base, value); return true; -} CYCatch } +} CYCatch(false) } -static JSValueRef Struct_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { +static JSValueRef Struct_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { Struct_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); Type_privateData *typical(internal->type_); return CYMakePointer(context, internal->value_, _not(size_t), typical->type_, typical->ffi_, _this); -} +} CYCatch(NULL) } static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { CYPool pool; @@ -872,7 +964,7 @@ static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, J JSObjectRef owner(internal->GetOwner() ?: object); return CYFromFFI(context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, false, owner); -} CYCatch } +} CYCatch(NULL) } static bool Struct_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { CYPool pool; @@ -887,7 +979,7 @@ static bool Struct_setProperty(JSContextRef context, JSObjectRef object, JSStrin CYPoolFFI(NULL, context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, value); return true; -} CYCatch } +} CYCatch(false) } static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { Struct_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); @@ -915,7 +1007,11 @@ static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JS } } -JSValueRef CYCallFunction(apr_pool_t *pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, JSValueRef *exception, sig::Signature *signature, ffi_cif *cif, void (*function)()) { CYTry { +void CYCallFunction(CYPool &pool, JSContextRef context, ffi_cif *cif, void (*function)(), void *value, void **values) { + ffi_call(cif, function, value, values); +} + +JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, sig::Signature *signature, ffi_cif *cif, void (*function)()) { if (setups + count != signature->count - 1) throw CYJSError(context, "incorrect number of arguments to ffi function"); @@ -928,37 +1024,75 @@ JSValueRef CYCallFunction(apr_pool_t *pool, JSContextRef context, size_t setups, ffi_type *ffi(cif->arg_types[index]); // XXX: alignment? values[index] = new(pool) uint8_t[ffi->size]; - CYPoolFFI(pool, context, element->type, ffi, values[index], arguments[index - setups]); + CYPoolFFI(&pool, context, element->type, ffi, values[index], arguments[index - setups]); } uint8_t value[cif->rtype->size]; - if (hooks_ != NULL && hooks_->CallFunction != NULL) - (*hooks_->CallFunction)(context, cif, function, value, values); - else - ffi_call(cif, function, value, values); + void (*call)(CYPool &, JSContextRef, ffi_cif *, void (*)(), void *, void **) = &CYCallFunction; + // XXX: this only supports one hook, but it is a bad idea anyway + for (CYHook *hook : GetHooks()) + if (hook->CallFunction != NULL) + call = hook->CallFunction; + call(pool, context, cif, function, value, values); return CYFromFFI(context, signature->elements[0].type, cif->rtype, value, initialize); -} CYCatch } +} -static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { +static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { CYPool pool; cy::Functor *internal(reinterpret_cast(JSObjectGetPrivate(object))); - return CYCallFunction(pool, context, 0, NULL, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue()); -} + return CYCallFunction(pool, context, 0, NULL, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue()); +} CYCatch(NULL) } -static JSObjectRef CYMakeType(JSContextRef context, const char *type) { - Type_privateData *internal(new Type_privateData(type)); +JSObjectRef CYMakeType(JSContextRef context, const char *encoding) { + Type_privateData *internal(new Type_privateData(encoding)); return JSObjectMake(context, Type_privateData::Class_, internal); } -static JSObjectRef CYMakeType(JSContextRef context, sig::Type *type) { +JSObjectRef CYMakeType(JSContextRef context, sig::Type *type) { Type_privateData *internal(new Type_privateData(type)); return JSObjectMake(context, Type_privateData::Class_, internal); } -static void *CYCastSymbol(const char *name) { - return dlsym(RTLD_DEFAULT, name); +JSObjectRef CYMakeType(JSContextRef context, sig::Signature *signature) { + CYPool pool; + + sig::Type type; + type.name = NULL; + type.flags = 0; + + type.primitive = sig::function_P; + sig::Copy(pool, type.data.signature, *signature); + + return CYMakeType(context, &type); +} + +static bool All_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { + JSObjectRef global(CYGetGlobalObject(context)); + JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript")))); + JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls")))); + + for (size_t i(0), count(CYArrayLength(context, alls)); i != count; ++i) + if (JSObjectRef space = CYCastJSObject(context, CYArrayGet(context, alls, count - i - 1))) + if (CYHasProperty(context, space, property)) + return true; + + CYPool pool; + CYUTF8String name(CYPoolUTF8String(pool, context, property)); + + size_t length(name.size); + char keyed[length + 2]; + memcpy(keyed + 1, name.data, length + 1); + + static const char *modes = "0124"; + for (size_t i(0); i != 4; ++i) { + keyed[0] = modes[i]; + if (CYBridgeHash(keyed, length + 1) != NULL) + return true; + } + + return false; } static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { @@ -990,9 +1124,7 @@ static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSSt return JSEvaluateScript(CYGetJSContext(context), CYJSString(entry->value_), NULL, NULL, 0, NULL); case '1': - if (void (*symbol)() = reinterpret_cast(CYCastSymbol(name.data))) - return CYMakeFunctor(context, symbol, entry->value_, &entry->cache_); - else return NULL; + return CYMakeFunctor(context, name.data, entry->value_, &entry->cache_); case '2': if (void *symbol = CYCastSymbol(name.data)) { @@ -1011,7 +1143,7 @@ static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSSt } return NULL; -} CYCatch } +} CYCatch(NULL) } static void All_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { JSObjectRef global(CYGetGlobalObject(context)); @@ -1040,7 +1172,7 @@ static JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t sig::Parse(pool, &signature, type, &Structor_); return CYMakePointer(context, value, _not(size_t), signature.elements[0].type, NULL, NULL); -} CYCatch } +} CYCatch(NULL) } static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 1) @@ -1048,50 +1180,207 @@ static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t cou CYPool pool; const char *type(CYPoolCString(pool, context, arguments[0])); return CYMakeType(context, type); -} CYCatch } +} CYCatch(NULL) } -static JSValueRef Type_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { - Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); +static JSValueRef Type_callAsFunction_$With(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], sig::Primitive primitive, JSValueRef *exception) { CYTry { + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + + CYPool pool; sig::Type type; + type.name = NULL; + type.flags = 0; - if (JSStringIsEqualToUTF8CString(property, "$cyi")) { - type.primitive = sig::pointer_P; - type.data.data.size = 0; - } else { - CYPool pool; - size_t index(CYGetIndex(pool, context, property)); - if (index == _not(size_t)) - return NULL; - type.primitive = sig::array_P; - type.data.data.size = index; + type.primitive = primitive; + type.data.signature.elements = new(pool) sig::Element[1 + count]; + type.data.signature.count = 1 + count; + + type.data.signature.elements[0].name = NULL; + type.data.signature.elements[0].type = internal->type_; + type.data.signature.elements[0].offset = _not(size_t); + + for (size_t i(0); i != count; ++i) { + sig::Element &element(type.data.signature.elements[i + 1]); + element.name = NULL; + element.offset = _not(size_t); + + JSObjectRef object(CYCastJSObject(context, arguments[i])); + _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_)); + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); + + element.type = internal->type_; } + return CYMakeType(context, &type); +} CYCatch(NULL) } + +static JSValueRef Type_callAsFunction_arrayOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 1) + throw CYJSError(context, "incorrect number of arguments to Type.arrayOf"); + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + + CYPool pool; + size_t index(CYGetIndex(pool, context, CYJSString(context, arguments[0]))); + if (index == _not(size_t)) + throw CYJSError(context, "invalid array size used with Type.arrayOf"); + + sig::Type type; type.name = NULL; type.flags = 0; + type.primitive = sig::array_P; type.data.data.type = internal->type_; + type.data.data.size = index; return CYMakeType(context, &type); -} CYCatch } +} CYCatch(NULL) } -static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); +static JSValueRef Type_callAsFunction_blockWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { + return Type_callAsFunction_$With(context, object, _this, count, arguments, sig::block_P, exception); +} + +static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 0) + throw CYJSError(context, "incorrect number of arguments to Type.constant"); + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + + sig::Type type(*internal->type_); + type.flags |= JOC_TYPE_CONST; + return CYMakeType(context, &type); +} CYCatch(NULL) } +static JSValueRef Type_callAsFunction_long(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 0) + throw CYJSError(context, "incorrect number of arguments to Type.long"); + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + + sig::Type type(*internal->type_); + + switch (type.primitive) { + case sig::short_P: type.primitive = sig::int_P; break; + case sig::int_P: type.primitive = sig::long_P; break; + case sig::long_P: type.primitive = sig::longlong_P; break; + default: throw CYJSError(context, "invalid type argument to Type.long"); + } + + return CYMakeType(context, &type); +} CYCatch(NULL) } + +static JSValueRef Type_callAsFunction_short(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 0) + throw CYJSError(context, "incorrect number of arguments to Type.short"); + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + + sig::Type type(*internal->type_); + + switch (type.primitive) { + case sig::int_P: type.primitive = sig::short_P; break; + case sig::long_P: type.primitive = sig::int_P; break; + case sig::longlong_P: type.primitive = sig::long_P; break; + default: throw CYJSError(context, "invalid type argument to Type.short"); + } + + return CYMakeType(context, &type); +} CYCatch(NULL) } + +static JSValueRef Type_callAsFunction_signed(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 0) + throw CYJSError(context, "incorrect number of arguments to Type.signed"); + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + + sig::Type type(*internal->type_); + + switch (type.primitive) { + case sig::char_P: case sig::uchar_P: type.primitive = sig::char_P; break; + case sig::short_P: case sig::ushort_P: type.primitive = sig::short_P; break; + case sig::int_P: case sig::uint_P: type.primitive = sig::int_P; break; + case sig::long_P: case sig::ulong_P: type.primitive = sig::long_P; break; + case sig::longlong_P: case sig::ulonglong_P: type.primitive = sig::longlong_P; break; + default: throw CYJSError(context, "invalid type argument to Type.signed"); + } + + return CYMakeType(context, &type); +} CYCatch(NULL) } + +static JSValueRef Type_callAsFunction_unsigned(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 0) + throw CYJSError(context, "incorrect number of arguments to Type.unsigned"); + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + + sig::Type type(*internal->type_); + + switch (type.primitive) { + case sig::char_P: case sig::uchar_P: type.primitive = sig::uchar_P; break; + case sig::short_P: case sig::ushort_P: type.primitive = sig::ushort_P; break; + case sig::int_P: case sig::uint_P: type.primitive = sig::uint_P; break; + case sig::long_P: case sig::ulong_P: type.primitive = sig::ulong_P; break; + case sig::longlong_P: case sig::ulonglong_P: type.primitive = sig::ulonglong_P; break; + default: throw CYJSError(context, "invalid type argument to Type.unsigned"); + } + + return CYMakeType(context, &type); +} CYCatch(NULL) } + +static JSValueRef Type_callAsFunction_functionWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { + return Type_callAsFunction_$With(context, object, _this, count, arguments, sig::function_P, exception); +} + +static JSValueRef Type_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 0) + throw CYJSError(context, "incorrect number of arguments to Type.pointerTo"); + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + + sig::Type type; + type.name = NULL; + + if (internal->type_->primitive == sig::char_P) { + type.flags = internal->type_->flags; + type.primitive = sig::string_P; + type.data.data.type = NULL; + type.data.data.size = 0; + } else { + type.flags = 0; + type.primitive = sig::pointer_P; + type.data.data.type = internal->type_; + type.data.data.size = 0; + } + + return CYMakeType(context, &type); +} CYCatch(NULL) } + +static JSValueRef Type_callAsFunction_withName(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 1) + throw CYJSError(context, "incorrect number of arguments to Type.withName"); + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + + CYPool pool; + const char *name(CYPoolCString(pool, context, arguments[0])); + + sig::Type type(*internal->type_); + type.name = name; + return CYMakeType(context, &type); +} CYCatch(NULL) } + +static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 1) throw CYJSError(context, "incorrect number of arguments to type cast function"); + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); + + if (internal->type_->primitive == sig::function_P) + return CYMakeFunctor(context, arguments[0], internal->type_->data.signature); + sig::Type *type(internal->type_); ffi_type *ffi(internal->GetFFI()); // XXX: alignment? uint8_t value[ffi->size]; CYPool pool; - CYPoolFFI(pool, context, type, ffi, value, arguments[0]); + CYPoolFFI(&pool, context, type, ffi, value, arguments[0]); return CYFromFFI(context, type, ffi, value); -} CYCatch } +} CYCatch(NULL) } static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 0) - throw CYJSError(context, "incorrect number of arguments to type cast function"); + throw CYJSError(context, "incorrect number of arguments to Type allocator"); Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); sig::Type *type(internal->type_); @@ -1104,22 +1393,24 @@ static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef obje type = type->data.data.type; } - void *value(malloc(internal->GetFFI()->size)); + void *value(calloc(1, internal->GetFFI()->size)); return CYMakePointer(context, value, length, type, NULL, NULL); -} CYCatch } +} CYCatch(NULL) } static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 2) throw CYJSError(context, "incorrect number of arguments to Functor constructor"); CYPool pool; - const char *type(CYPoolCString(pool, context, arguments[1])); - return CYMakeFunctor(context, arguments[0], type); -} CYCatch } + const char *encoding(CYPoolCString(pool, context, arguments[1])); + sig::Signature signature; + sig::Parse(pool, &signature, encoding, &Structor_); + return CYMakeFunctor(context, arguments[0], signature); +} CYCatch(NULL) } static JSValueRef CYValue_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { CYValue *internal(reinterpret_cast(JSObjectGetPrivate(_this))); return CYCastJSValue(context, reinterpret_cast(internal->value_)); -} CYCatch } +} CYCatch(NULL) } static JSValueRef CYValue_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { return CYValue_callAsFunction_valueOf(context, object, _this, count, arguments, exception); @@ -1130,51 +1421,72 @@ static JSValueRef CYValue_callAsFunction_toCYON(JSContextRef context, JSObjectRe char string[32]; sprintf(string, "%p", internal->value_); return CYCastJSValue(context, string); -} CYCatch } +} CYCatch(NULL) } static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + std::set *objects(CYCastObjects(context, _this, count, arguments)); + Pointer *internal(reinterpret_cast(JSObjectGetPrivate(_this))); if (internal->length_ != _not(size_t)) { - JSObjectRef Array(CYGetCachedObject(context, Array_s)); + JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype"))); JSObjectRef toCYON(CYCastJSObject(context, CYGetProperty(context, Array, toCYON_s))); return CYCallAsFunction(context, toCYON, _this, count, arguments); - } else { + } else if (internal->type_->type_ == NULL) pointer: { char string[32]; sprintf(string, "%p", internal->value_); return CYCastJSValue(context, string); + } try { + JSValueRef value(CYGetProperty(context, _this, cyi_s)); + if (JSValueIsUndefined(context, value)) + goto pointer; + CYPool pool; + return CYCastJSValue(context, pool.strcat("&", CYPoolCCYON(pool, context, value, objects), NULL)); + } catch (const CYException &e) { + goto pointer; } -} CYCatch } +} CYCatch(NULL) } -static JSValueRef Type_getProperty_alignment(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { +static JSValueRef Pointer_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + Pointer *internal(reinterpret_cast(JSObjectGetPrivate(object))); + return CYMakeType(context, internal->type_->type_); +} CYCatch(NULL) } + +static JSValueRef Functor_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + cy::Functor *internal(reinterpret_cast(JSObjectGetPrivate(object))); + return CYMakeType(context, &internal->signature_); +} CYCatch(NULL) } + +static JSValueRef Type_getProperty_alignment(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); return CYCastJSValue(context, internal->GetFFI()->alignment); -} +} CYCatch(NULL) } -static JSValueRef Type_getProperty_size(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { +static JSValueRef Type_getProperty_name(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); + return CYCastJSValue(context, internal->type_->name); +} CYCatch(NULL) } + +static JSValueRef Type_getProperty_size(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); return CYCastJSValue(context, internal->GetFFI()->size); -} +} CYCatch(NULL) } static JSValueRef Type_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); CYPool pool; const char *type(sig::Unparse(pool, internal->type_)); return CYCastJSValue(context, CYJSString(type)); -} CYCatch } +} CYCatch(NULL) } static JSValueRef Type_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - CYPool pool; - const char *type(sig::Unparse(pool, internal->type_)); - size_t size(strlen(type)); - char *cyon(new(pool) char[12 + size + 1]); - memcpy(cyon, "new Type(\"", 10); - cyon[12 + size] = '\0'; - cyon[12 + size - 2] = '"'; - cyon[12 + size - 1] = ')'; - memcpy(cyon + 10, type, size); - return CYCastJSValue(context, CYJSString(cyon)); -} CYCatch } + CYLocalPool pool; + std::stringbuf out; + CYOptions options; + CYOutput output(out, options); + (new(pool) CYTypeExpression(Decode(pool, internal->type_)))->Output(output, CYNoFlags); + return CYCastJSValue(context, CYJSString(out.str().c_str())); +} CYCatch(NULL) } static JSValueRef Type_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { return Type_callAsFunction_toString(context, object, _this, count, arguments, exception); @@ -1187,6 +1499,11 @@ static JSStaticFunction Pointer_staticFunctions[4] = { {NULL, NULL, 0} }; +static JSStaticValue Pointer_staticValues[2] = { + {"type", &Pointer_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, NULL, 0} +}; + static JSStaticFunction Struct_staticFunctions[2] = { {"$cya", &Struct_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} @@ -1203,33 +1520,51 @@ namespace cy { JSStaticFunction const * const Functor::StaticFunctions = Functor_staticFunctions; } -static JSStaticValue Type_staticValues[3] = { +static JSStaticValue Functor_staticValues[2] = { + {"type", &Functor_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, NULL, 0} +}; + +namespace cy { + JSStaticValue const * const Functor::StaticValues = Functor_staticValues; +} + +static JSStaticValue Type_staticValues[4] = { {"alignment", &Type_getProperty_alignment, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"name", &Type_getProperty_name, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"size", &Type_getProperty_size, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, NULL, 0} }; -static JSStaticFunction Type_staticFunctions[4] = { +static JSStaticFunction Type_staticFunctions[14] = { + {"arrayOf", &Type_callAsFunction_arrayOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"blockWith", &Type_callAsFunction_blockWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"constant", &Type_callAsFunction_constant, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"functionWith", &Type_callAsFunction_functionWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"long", &Type_callAsFunction_long, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"pointerTo", &Type_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"short", &Type_callAsFunction_short, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"signed", &Type_callAsFunction_signed, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"withName", &Type_callAsFunction_withName, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toCYON", &Type_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toJSON", &Type_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toString", &Type_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"unsigned", &Type_callAsFunction_unsigned, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} }; static JSObjectRef (*JSObjectMakeArray$)(JSContextRef, size_t, const JSValueRef[], JSValueRef *); -void CYSetArgs(int argc, const char *argv[]) { +_visible void CYSetArgs(int argc, const char *argv[]) { JSContextRef context(CYGetJSContext()); JSValueRef args[argc]; for (int i(0); i != argc; ++i) args[i] = CYCastJSValue(context, argv[i]); JSObjectRef array; - if (JSObjectMakeArray$ != NULL) { - JSValueRef exception(NULL); - array = (*JSObjectMakeArray$)(context, argc, args, &exception); - CYThrow(context, exception); - } else { + if (JSObjectMakeArray$ != NULL) + array = _jsccall(*JSObjectMakeArray$, context, argc, args); + else { JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array"))); JSValueRef value(CYCallAsFunction(context, Array, NULL, argc, args)); array = CYCastJSObject(context, value); @@ -1243,48 +1578,65 @@ JSObjectRef CYGetGlobalObject(JSContextRef context) { return JSContextGetGlobalObject(context); } -const char *CYExecute(apr_pool_t *pool, CYUTF8String code) { - JSContextRef context(CYGetJSContext()); - JSValueRef exception(NULL), result; - - void *handle; - if (hooks_ != NULL && hooks_->ExecuteStart != NULL) - handle = (*hooks_->ExecuteStart)(context); - else - handle = NULL; +// XXX: this is neither exceptin safe nor even terribly sane +class ExecutionHandle { + private: + JSContextRef context_; + std::vector handles_; - const char *json; + public: + ExecutionHandle(JSContextRef context) : + context_(context) + { + handles_.resize(GetHooks().size()); + for (size_t i(0); i != GetHooks().size(); ++i) { + CYHook *hook(GetHooks()[i]); + if (hook->ExecuteStart != NULL) + handles_[i] = (*hook->ExecuteStart)(context_); + else + handles_[i] = NULL; + } + } - try { - result = JSEvaluateScript(context, CYJSString(code), NULL, NULL, 0, &exception); - } catch (const char *error) { - return error; + ~ExecutionHandle() { + for (size_t i(GetHooks().size()); i != 0; --i) { + CYHook *hook(GetHooks()[i-1]); + if (hook->ExecuteEnd != NULL) + (*hook->ExecuteEnd)(context_, handles_[i-1]); + } } +}; - if (exception != NULL) error: - return CYPoolCString(pool, context, CYJSString(context, exception)); +static volatile bool cancel_; - if (JSValueIsUndefined(context, result)) - return NULL; +static bool CYShouldTerminate(JSContextRef context, void *arg) { + return cancel_; +} - try { - json = CYPoolCCYON(pool, context, result, &exception); - } catch (const char *error) { - return error; - } +_visible const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code) { + ExecutionHandle handle(context); + + cancel_ = false; + if (&JSContextGroupSetExecutionTimeLimit != NULL) + JSContextGroupSetExecutionTimeLimit(JSContextGetGroup(context), 0.5, &CYShouldTerminate, NULL); - if (exception != NULL) - goto error; + try { + JSValueRef result(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0)); + if (JSValueIsUndefined(context, result)) + return NULL; - CYSetProperty(context, CYGetGlobalObject(context), Result_, result); + std::set objects; + const char *json(_jsccall(CYPoolCCYON, pool, context, result, objects)); + CYSetProperty(context, CYGetGlobalObject(context), Result_, result); - if (hooks_ != NULL && hooks_->ExecuteEnd != NULL) - (*hooks_->ExecuteEnd)(context, handle); - return json; + return json; + } catch (const CYException &error) { + return pool.strcat("throw ", error.PoolCString(pool), NULL); + } } -extern "C" void CydgetSetupContext(JSGlobalContextRef context) { - CYSetupContext(context); +_visible void CYCancel() { + cancel_ = true; } static bool initialized_ = false; @@ -1294,14 +1646,14 @@ void CYInitializeDynamic() { initialized_ = true; else return; - CYInitializeStatic(); - JSObjectMakeArray$ = reinterpret_cast(dlsym(RTLD_DEFAULT, "JSObjectMakeArray")); + JSSynchronousGarbageCollectForDebugging$ = reinterpret_cast(dlsym(RTLD_DEFAULT, "JSSynchronousGarbageCollectForDebugging")); JSClassDefinition definition; definition = kJSClassDefinitionEmpty; definition.className = "All"; + definition.hasProperty = &All_hasProperty; definition.getProperty = &All_getProperty; definition.getPropertyNames = &All_getPropertyNames; All_ = JSClassCreate(&definition); @@ -1314,6 +1666,7 @@ void CYInitializeDynamic() { definition = kJSClassDefinitionEmpty; definition.className = "Functor"; definition.staticFunctions = cy::Functor::StaticFunctions; + definition.staticValues = Functor_staticValues; definition.callAsFunction = &Functor_callAsFunction; definition.finalize = &CYFinalize; Functor_ = JSClassCreate(&definition); @@ -1321,6 +1674,7 @@ void CYInitializeDynamic() { definition = kJSClassDefinitionEmpty; definition.className = "Pointer"; definition.staticFunctions = Pointer_staticFunctions; + definition.staticValues = Pointer_staticValues; definition.getProperty = &Pointer_getProperty; definition.setProperty = &Pointer_setProperty; definition.finalize = &CYFinalize; @@ -1339,7 +1693,6 @@ void CYInitializeDynamic() { definition.className = "Type"; definition.staticValues = Type_staticValues; definition.staticFunctions = Type_staticFunctions; - definition.getProperty = &Type_getProperty; definition.callAsFunction = &Type_callAsFunction; definition.callAsConstructor = &Type_callAsConstructor; definition.finalize = &CYFinalize; @@ -1352,6 +1705,7 @@ void CYInitializeDynamic() { Array_s = JSStringCreateWithUTF8CString("Array"); cy_s = JSStringCreateWithUTF8CString("$cy"); + cyi_s = JSStringCreateWithUTF8CString("$cyi"); length_s = JSStringCreateWithUTF8CString("length"); message_s = JSStringCreateWithUTF8CString("message"); name_s = JSStringCreateWithUTF8CString("name"); @@ -1363,11 +1717,13 @@ void CYInitializeDynamic() { toJSON_s = JSStringCreateWithUTF8CString("toJSON"); toPointer_s = JSStringCreateWithUTF8CString("toPointer"); toString_s = JSStringCreateWithUTF8CString("toString"); + weak_s = JSStringCreateWithUTF8CString("weak"); Result_ = JSStringCreateWithUTF8CString("_"); - if (hooks_ != NULL && hooks_->Initialize != NULL) - (*hooks_->Initialize)(); + for (CYHook *hook : GetHooks()) + if (hook->Initialize != NULL) + (*hook->Initialize)(); } void CYThrow(JSContextRef context, JSValueRef value) { @@ -1375,30 +1731,25 @@ void CYThrow(JSContextRef context, JSValueRef value) { throw CYJSError(context, value); } -const char *CYJSError::PoolCString(apr_pool_t *pool) const { +const char *CYJSError::PoolCString(CYPool &pool) const { + std::set objects; // XXX: this used to be CYPoolCString - return CYPoolCCYON(pool, context_, value_); + return CYPoolCCYON(pool, context_, value_, objects); } -JSValueRef CYJSError::CastJSValue(JSContextRef context) const { - // XXX: what if the context is different? +JSValueRef CYJSError::CastJSValue(JSContextRef context, const char *name) const { + // XXX: what if the context is different? or the name? I dunno. ("epic" :/) return value_; } -JSValueRef CYCastJSError(JSContextRef context, const char *message) { - JSObjectRef Error(CYGetCachedObject(context, CYJSString("Error"))); - +JSValueRef CYCastJSError(JSContextRef context, const char *name, const char *message) { + JSObjectRef Error(CYGetCachedObject(context, CYJSString(name))); JSValueRef arguments[1] = {CYCastJSValue(context, message)}; - - JSValueRef exception(NULL); - JSValueRef value(JSObjectCallAsConstructor(context, Error, 1, arguments, &exception)); - CYThrow(context, exception); - - return value; + return _jsccall(JSObjectCallAsConstructor, context, Error, 1, arguments); } -JSValueRef CYPoolError::CastJSValue(JSContextRef context) const { - return CYCastJSError(context, message_); +JSValueRef CYPoolError::CastJSValue(JSContextRef context, const char *name) const { + return CYCastJSError(context, name, message_); } CYJSError::CYJSError(JSContextRef context, const char *format, ...) { @@ -1408,19 +1759,99 @@ CYJSError::CYJSError(JSContextRef context, const char *format, ...) { va_list args; va_start(args, format); - const char *message(apr_pvsprintf(pool, format, args)); + // XXX: there might be a beter way to think about this + const char *message(pool.vsprintf(64, format, args)); va_end(args); - value_ = CYCastJSError(context, message); + value_ = CYCastJSError(context, "Error", message); } JSGlobalContextRef CYGetJSContext(JSContextRef context) { return reinterpret_cast(JSObjectGetPrivate(CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s))))->context_; } -extern "C" void CYSetupContext(JSGlobalContextRef context) { - JSValueRef exception(NULL); +void *CYMapFile(const char *path, size_t *psize) { + int fd(_syscall_(open(path, O_RDONLY), 1, ENOENT)); + if (fd == -1) + return NULL; + + struct stat stat; + _syscall(fstat(fd, &stat)); + size_t size(stat.st_size); + + *psize = size; + + void *base; + _syscall(base = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0)); + + _syscall(close(fd)); + return base; +} + +static JSValueRef require(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + _assert(count == 1); + CYPool pool; + + Dl_info addr; + _assert(dladdr(reinterpret_cast(&require), &addr) != 0); + char *lib(pool.strdup(addr.dli_fname)); + + char *slash(strrchr(lib, '/')); + _assert(slash != NULL); + *slash = '\0'; + + CYJSString property("exports"); + JSObjectRef module; + + const char *name(CYPoolCString(pool, context, arguments[0])); + const char *path(pool.strcat(lib, "/cycript0.9/", name, ".cy", NULL)); + + CYJSString key(path); + JSObjectRef modules(CYGetCachedObject(context, CYJSString("modules"))); + JSValueRef cache(CYGetProperty(context, modules, key)); + + if (!JSValueIsUndefined(context, cache)) + module = CYCastJSObject(context, cache); + else { + CYUTF8String code; + code.data = reinterpret_cast(CYMapFile(path, &code.size)); + + if (code.data == NULL) { + if (strchr(name, '/') == NULL && ( +#ifdef __APPLE__ + dlopen(pool.strcat("/System/Library/Frameworks/", name, ".framework/", name, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL || + dlopen(pool.strcat("/System/Library/PrivateFrameworks/", name, ".framework/", name, NULL), RTLD_LAZY | RTLD_GLOBAL) != NULL || +#endif + false)) + return CYJSUndefined(NULL); + + CYThrow("Can't find module: %s", name); + } + + module = JSObjectMake(context, NULL, NULL); + CYSetProperty(context, modules, key, module); + + JSObjectRef exports(JSObjectMake(context, NULL, NULL)); + CYSetProperty(context, module, property, exports); + + std::stringstream wrap; + wrap << "(function (exports, require, module) { " << code << "\n});"; + code = CYPoolCode(pool, wrap); + + JSValueRef value(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0)); + JSObjectRef function(CYCastJSObject(context, value)); + + JSValueRef arguments[3] = { exports, JSObjectMakeFunctionWithCallback(context, CYJSString("require"), &require), module }; + CYCallAsFunction(context, function, NULL, 3, arguments); + } + + return CYGetProperty(context, module, property); +} CYCatch(NULL) } + +extern "C" void CYDestroyWeak(JSWeakObjectMapRef weak, void *data) { +} +extern "C" void CYSetupContext(JSGlobalContextRef context) { CYInitializeDynamic(); JSObjectRef global(CYGetGlobalObject(context)); @@ -1435,15 +1866,30 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { JSObjectRef Array_prototype(CYCastJSObject(context, CYGetProperty(context, Array, prototype_s))); CYSetProperty(context, cy, CYJSString("Array_prototype"), Array_prototype); + JSObjectRef Boolean(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Boolean")))); + CYSetProperty(context, cy, CYJSString("Boolean"), Boolean); + + JSObjectRef Boolean_prototype(CYCastJSObject(context, CYGetProperty(context, Boolean, prototype_s))); + CYSetProperty(context, cy, CYJSString("Boolean_prototype"), Boolean_prototype); + JSObjectRef Error(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Error")))); CYSetProperty(context, cy, CYJSString("Error"), Error); + JSObjectRef Error_prototype(CYCastJSObject(context, CYGetProperty(context, Error, prototype_s))); + CYSetProperty(context, cy, CYJSString("Error_prototype"), Error_prototype); + JSObjectRef Function(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Function")))); CYSetProperty(context, cy, CYJSString("Function"), Function); JSObjectRef Function_prototype(CYCastJSObject(context, CYGetProperty(context, Function, prototype_s))); CYSetProperty(context, cy, CYJSString("Function_prototype"), Function_prototype); + JSObjectRef Number(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Number")))); + CYSetProperty(context, cy, CYJSString("Number"), Number); + + JSObjectRef Number_prototype(CYCastJSObject(context, CYGetProperty(context, Number, prototype_s))); + CYSetProperty(context, cy, CYJSString("Number_prototype"), Number_prototype); + JSObjectRef Object(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Object")))); CYSetProperty(context, cy, CYJSString("Object"), Object); @@ -1455,32 +1901,34 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { JSObjectRef String_prototype(CYCastJSObject(context, CYGetProperty(context, String, prototype_s))); CYSetProperty(context, cy, CYJSString("String_prototype"), String_prototype); + + JSObjectRef SyntaxError(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("SyntaxError")))); + CYSetProperty(context, cy, CYJSString("SyntaxError"), SyntaxError); /* }}} */ CYSetProperty(context, Array_prototype, toCYON_s, &Array_callAsFunction_toCYON, kJSPropertyAttributeDontEnum); + CYSetProperty(context, Error_prototype, toCYON_s, &Error_callAsFunction_toCYON, kJSPropertyAttributeDontEnum); CYSetProperty(context, String_prototype, toCYON_s, &String_callAsFunction_toCYON, kJSPropertyAttributeDontEnum); JSObjectRef cycript(JSObjectMake(context, NULL, NULL)); CYSetProperty(context, global, CYJSString("Cycript"), cycript); + CYSetProperty(context, cycript, CYJSString("compile"), &Cycript_compile_callAsFunction); CYSetProperty(context, cycript, CYJSString("gc"), &Cycript_gc_callAsFunction); JSObjectRef Functor(JSObjectMakeConstructor(context, Functor_, &Functor_new)); - JSObjectSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)), Function_prototype); + CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, Functor, prototype_s)), Function_prototype); CYSetProperty(context, cycript, CYJSString("Functor"), Functor); CYSetProperty(context, cycript, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer_, &Pointer_new)); + CYSetProperty(context, cycript, CYJSString("Type"), JSObjectMakeConstructor(context, Type_privateData::Class_, &Type_new)); - JSObjectRef Type(JSObjectMakeConstructor(context, Type_privateData::Class_, &Type_new)); - CYSetProperty(context, cycript, CYJSString("Type"), Type); - - JSObjectRef Type_prototype(CYCastJSObject(context, CYGetProperty(context, Type, prototype_s))); - CYSetProperty(context, cy, CYJSString("Type_prototype"), Type_prototype); + JSObjectRef modules(JSObjectMake(context, NULL, NULL)); + CYSetProperty(context, cy, CYJSString("modules"), modules); JSObjectRef all(JSObjectMake(context, All_, NULL)); CYSetProperty(context, cycript, CYJSString("all"), all); - JSObjectRef alls(JSObjectCallAsConstructor(context, Array, 0, NULL, &exception)); - CYThrow(context, exception); + JSObjectRef alls(_jsccall(JSObjectCallAsConstructor, context, Array, 0, NULL)); CYSetProperty(context, cycript, CYJSString("alls"), alls); if (true) { @@ -1495,29 +1943,40 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { next = JSObjectGetPrototype(context, curr); } - JSObjectSetPrototype(context, last, all); + CYSetPrototype(context, last, all); } - CYSetProperty(context, global, CYJSString("$cyq"), &$cyq, kJSPropertyAttributeDontEnum); - JSObjectRef System(JSObjectMake(context, NULL, NULL)); CYSetProperty(context, cy, CYJSString("System"), System); + CYSetProperty(context, all, CYJSString("require"), &require, kJSPropertyAttributeDontEnum); + CYSetProperty(context, global, CYJSString("system"), System); CYSetProperty(context, System, CYJSString("args"), CYJSNull(context)); //CYSetProperty(context, System, CYJSString("global"), global); CYSetProperty(context, System, CYJSString("print"), &System_print); - if (hooks_ != NULL && hooks_->SetupContext != NULL) - (*hooks_->SetupContext)(context); +#ifdef __APPLE__ + if (&JSWeakObjectMapCreate != NULL) { + JSWeakObjectMapRef weak(JSWeakObjectMapCreate(context, NULL, &CYDestroyWeak)); + CYSetProperty(context, cy, weak_s, CYCastJSValue(context, reinterpret_cast(weak))); + } +#endif + + if (CYBridgeEntry *entry = CYBridgeHash("1dlerror", 8)) + entry->cache_ = new cy::Functor(entry->value_, reinterpret_cast(&dlerror)); + + for (CYHook *hook : GetHooks()) + if (hook->SetupContext != NULL) + (*hook->SetupContext)(context); CYArrayPush(context, alls, cycript); } -JSGlobalContextRef CYGetJSContext() { - CYInitializeDynamic(); +static JSGlobalContextRef context_; - static JSGlobalContextRef context_; +_visible JSGlobalContextRef CYGetJSContext() { + CYInitializeDynamic(); if (context_ == NULL) { context_ = JSGlobalContextCreate(Global_); @@ -1526,3 +1985,10 @@ JSGlobalContextRef CYGetJSContext() { return context_; } + +_visible void CYDestroyContext() { + if (context_ == NULL) + return; + JSGlobalContextRelease(context_); + context_ = NULL; +}