X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/3f7f8d1112c3bdfd3cb684a0497e789bc352d7c7..90dd6ff11965499c5a211e2b78755baa3ab2e09c:/Execute.cpp?ds=inline diff --git a/Execute.cpp b/Execute.cpp index a145ee0..c6812a2 100644 --- a/Execute.cpp +++ b/Execute.cpp @@ -1,56 +1,61 @@ /* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2013 Jay Freeman (saurik) + * Copyright (C) 2009-2015 Jay Freeman (saurik) */ -/* GNU 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 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 + * 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Cycript. If not, see . + * 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 "cycript.hpp" + +#include +#include +#include +#include +#include +#include #include #include #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 "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) { @@ -76,6 +81,11 @@ void CYSetProperty(JSContextRef context, JSObjectRef object, JSStringRef name, J 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) { @@ -87,8 +97,19 @@ JSStringRef CYCopyJSString(JSStringRef value) { } JSStringRef CYCopyJSString(CYUTF8String value) { - // XXX: this is very wrong; it needs to convert to UTF16 and then create from there - return CYCopyJSString(value.data); + if (memchr(value.data, '\0', value.size) != NULL) { + CYPool pool; + return CYCopyJSString(pool.memdup(value.data, value.size)); + } else if (value.data[value.size] != '\0') { + CYPool pool; + return CYCopyJSString(CYPoolUTF16String(pool, value)); + } else { + return CYCopyJSString(value.data); + } +} + +JSStringRef CYCopyJSString(CYUTF16String value) { + return JSStringCreateWithCharacters(value.data, value.size); } JSStringRef CYCopyJSString(JSContextRef context, JSValueRef value) { @@ -123,6 +144,7 @@ size_t CYGetIndex(CYPool &pool, JSContextRef context, JSStringRef value) { static JSClassRef All_; static JSClassRef Context_; +static JSClassRef CString_; JSClassRef Functor_; static JSClassRef Global_; static JSClassRef Pointer_; @@ -142,6 +164,7 @@ JSStringRef toCYON_s; JSStringRef toJSON_s; JSStringRef toPointer_s; JSStringRef toString_s; +JSStringRef weak_s; static JSStringRef Result_; @@ -204,6 +227,15 @@ struct Context : } }; +struct CString : + CYOwned +{ + CString(char *value, JSContextRef context, JSObjectRef owner) : + CYOwned(value, context, owner) + { + } +}; + struct Pointer : CYOwned { @@ -229,9 +261,6 @@ 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)); CYPool &pool(*internal->pool_); @@ -251,6 +280,10 @@ JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_ } 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); } @@ -264,6 +297,7 @@ JSValueRef CYCastJSValue(JSContextRef context, double value) { #define CYCastJSValue_(Type_) \ JSValueRef CYCastJSValue(JSContextRef context, Type_ value) { \ + _assert(static_cast(static_cast(value)) == value); \ return JSValueMakeNumber(context, static_cast(value)); \ } @@ -310,6 +344,14 @@ 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)); } @@ -326,36 +368,40 @@ void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) { } 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(NULL) } -static size_t Nonce_(0); - -static JSValueRef $cyq(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - CYPool pool; - const char *name(pool.strcat(CYPoolCString(pool, context, arguments[0]), pool.itoa(Nonce_++), NULL)); - return CYCastJSValue(context, name); -} CYCatch(NULL) } - static void (*JSSynchronousGarbageCollectForDebugging$)(JSContextRef); -void CYGarbageCollect(JSContextRef context) { +_visible void CYGarbageCollect(JSContextRef context) { (JSSynchronousGarbageCollectForDebugging$ ?: &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::stringbuf 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(CYPool &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"; @@ -380,20 +426,31 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSValueRef value, JS } 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(NULL) } -const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSValueRef value) { - return _jsccall(CYPoolCCYON, pool, context, value); +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(CYPool &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); } @@ -401,7 +458,7 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object) JSValueRef toJSON(CYGetProperty(context, object, toJSON_s)); if (CYIsCallable(context, toJSON)) { JSValueRef arguments[1] = {CYCastJSValue(context, CYJSString(""))}; - return _jsccall(CYPoolCCYON, pool, context, CYCallAsFunction(context, (JSObjectRef) toJSON, object, 1, arguments)); + return _jsccall(CYPoolCCYON, pool, context, CYCallAsFunction(context, (JSObjectRef) toJSON, object, 1, arguments), objects); } if (JSObjectIsFunction(context, object)) { @@ -414,6 +471,8 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object) } } + _assert(objects.insert(object).second); + std::ostringstream str; str << '{'; @@ -441,7 +500,7 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object) try { JSValueRef value(CYGetProperty(context, object, name)); - str << CYPoolCCYON(pool, context, value); + str << CYPoolCCYON(pool, context, value, objects); } catch (const CYException &error) { str << "@error"; } @@ -455,7 +514,19 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object) 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; @@ -473,7 +544,7 @@ static JSValueRef Array_callAsFunction_toCYON(JSContextRef context, JSObjectRef try { JSValueRef value(CYGetProperty(context, _this, index)); if (!JSValueIsUndefined(context, value)) - str << CYPoolCCYON(pool, context, value); + str << CYPoolCCYON(pool, context, value, *objects); else { str << ','; comma = false; @@ -505,6 +576,11 @@ JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, si return JSObjectMake(context, Pointer_, internal); } +JSObjectRef CYMakeCString(JSContextRef context, char *pointer, JSObjectRef owner) { + CString *internal(new CString(pointer, context, owner)); + return JSObjectMake(context, CString_, internal); +} + static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const sig::Signature &signature) { return JSObjectMake(context, Functor_, new cy::Functor(signature, function)); } @@ -530,8 +606,10 @@ static bool CYGetOffset(CYPool &pool, JSContextRef context, JSStringRef value, s return CYGetOffset(CYPoolCString(pool, context, value), index); } -void *CYCastPointer_(JSContextRef context, JSValueRef value) { - switch (JSValueGetType(context, value)) { +void *CYCastPointer_(JSContextRef context, JSValueRef value, bool *guess) { + if (value == NULL) + return NULL; + else switch (JSValueGetType(context, value)) { case kJSTypeNull: return NULL; case kJSTypeObject: { @@ -544,13 +622,21 @@ void *CYCastPointer_(JSContextRef context, JSValueRef value) { if (CYIsCallable(context, toPointer)) { JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toPointer, object, 0, NULL)); _assert(value != NULL); - return CYCastPointer_(context, value); + return CYCastPointer_(context, value, guess); } } default: + if (guess != NULL) + *guess = true; + case kJSTypeNumber: double number(CYCastDouble(context, value)); - if (std::isnan(number)) + if (!std::isnan(number)) + return reinterpret_cast(static_cast(static_cast(number))); + if (guess == NULL) throw CYJSError(context, "cannot convert value to pointer"); - return reinterpret_cast(static_cast(static_cast(number))); + else { + *guess = true; + return NULL; + } } } @@ -603,10 +689,12 @@ void CYPoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ff *reinterpret_cast(data) = CYCastPointer(context, value); break; - case sig::string_P: - _assert(pool != NULL); - *reinterpret_cast(data) = CYPoolCString(*pool, context, value); - break; + case sig::string_P: { + bool guess(false); + *reinterpret_cast(data) = CYCastPointer(context, value, &guess); + if (guess && pool != NULL) + *reinterpret_cast(data) = CYPoolCString(*pool, context, value); + } break; case sig::struct_P: { uint8_t *base(reinterpret_cast(data)); @@ -640,9 +728,10 @@ void CYPoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ff 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); } @@ -681,8 +770,8 @@ JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void else goto null; case sig::string_P: - if (char *utf8 = *reinterpret_cast(data)) - return CYCastJSValue(context, utf8); + if (char *pointer = *reinterpret_cast(data)) + return CYMakeCString(context, pointer, owner); else goto null; case sig::struct_P: @@ -693,15 +782,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); } } -void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef)) { +void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg) { Closure_privateData *internal(reinterpret_cast(arg)); JSContextRef context(internal->context_); @@ -712,7 +802,7 @@ void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg, J 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(adapter(context, count, values, internal->function_)); + JSValueRef value(internal->adapter_(context, count, values, internal->function_)); CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value); } @@ -720,20 +810,16 @@ static JSValueRef FunctionAdapter_(JSContextRef context, size_t count, JSValueRe return CYCallAsFunction(context, function, NULL, count, values); } -static void FunctionClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) { - CYExecuteClosure(cif, result, arguments, arg, &FunctionAdapter_); -} - -Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const sig::Signature &signature, void (*callback)(ffi_cif *, void *, void **, void *)) { +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, signature)); + Closure_privateData *internal(new Closure_privateData(context, function, adapter, signature)); #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; @@ -744,7 +830,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)); @@ -756,15 +842,19 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, } static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const sig::Signature &signature) { - Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &FunctionClosure_)); + 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 sig::Signature &signature) { @@ -780,6 +870,32 @@ static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const s } } +static JSValueRef CString_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + CYPool pool; + CString *internal(reinterpret_cast(JSObjectGetPrivate(object))); + char *string(static_cast(internal->value_)); + + ssize_t offset; + if (!CYGetOffset(pool, context, property, offset)) + return NULL; + + return CYCastJSValue(context, CYJSString(CYUTF8String(&string[offset], 1))); +} CYCatch(NULL) } + +static bool CString_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { + CYPool pool; + CString *internal(reinterpret_cast(JSObjectGetPrivate(object))); + char *string(static_cast(internal->value_)); + + ssize_t offset; + if (!CYGetOffset(pool, context, property, offset)) + return false; + + const char *data(CYPoolCString(pool, context, value)); + string[offset] = *data; + return true; +} CYCatch(false) } + 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_); @@ -939,6 +1055,10 @@ static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JS } } +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"); @@ -957,11 +1077,13 @@ JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, voi 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); } @@ -971,6 +1093,14 @@ static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef objec return CYCallFunction(pool, context, 0, NULL, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue()); } CYCatch(NULL) } +static JSValueRef Pointer_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + Pointer *internal(reinterpret_cast(JSObjectGetPrivate(object))); + if (internal->type_->type_->primitive != sig::function_P) + throw CYJSError(context, "cannot call a pointer to non-function"); + JSObjectRef functor(CYCastJSObject(context, CYGetProperty(context, object, cyi_s))); + return CYCallAsFunction(context, functor, _this, count, arguments); +} CYCatch(NULL) } + JSObjectRef CYMakeType(JSContextRef context, const char *encoding) { Type_privateData *internal(new Type_privateData(encoding)); return JSObjectMake(context, Type_privateData::Class_, internal); @@ -1085,6 +1215,13 @@ static void All_getPropertyNames(JSContextRef context, JSObjectRef object, JSPro } } +static JSObjectRef CString_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 1) + throw CYJSError(context, "incorrect number of arguments to CString constructor"); + char *value(CYCastPointer(context, arguments[0])); + return CYMakeCString(context, value, NULL); +} CYCatch(NULL) } + static JSObjectRef Pointer_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 Pointer constructor"); @@ -1101,11 +1238,46 @@ static JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t } CYCatch(NULL) } static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - if (count != 1) - throw CYJSError(context, "incorrect number of arguments to Type constructor"); CYPool pool; - const char *type(CYPoolCString(pool, context, arguments[0])); - return CYMakeType(context, type); + + if (false) { + } else if (count == 1) { + const char *type(CYPoolCString(pool, context, arguments[0])); + return CYMakeType(context, type); + } else if (count == 2) { + JSObjectRef types(CYCastJSObject(context, arguments[0])); + size_t count(CYArrayLength(context, types)); + + JSObjectRef names(CYCastJSObject(context, arguments[1])); + + sig::Type type; + type.name = NULL; + type.flags = 0; + + type.primitive = sig::struct_P; + type.data.signature.elements = new(pool) sig::Element[count]; + type.data.signature.count = count; + + for (size_t i(0); i != count; ++i) { + sig::Element &element(type.data.signature.elements[i]); + element.offset = _not(size_t); + + JSValueRef name(CYArrayGet(context, names, i)); + if (JSValueIsUndefined(context, name)) + element.name = NULL; + else + element.name = CYPoolCString(pool, context, name); + + JSObjectRef object(CYCastJSObject(context, CYArrayGet(context, types, i))); + _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_)); + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); + element.type = internal->type_; + } + + return CYMakeType(context, &type); + } else { + throw CYJSError(context, "incorrect number of arguments to Type constructor"); + } } CYCatch(NULL) } static JSValueRef Type_callAsFunction_$With(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], sig::Primitive primitive, JSValueRef *exception) { CYTry { @@ -1333,6 +1505,38 @@ static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t return CYMakeFunctor(context, arguments[0], signature); } CYCatch(NULL) } +static JSValueRef CString_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + CString *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + + sig::Type type; + type.name = NULL; + type.flags = 0; + + type.primitive = sig::char_P; + type.data.data.type = NULL; + type.data.data.size = 0; + + return CYMakePointer(context, internal->value_, _not(size_t), &type, NULL, NULL); +} CYCatch(NULL) } + +static JSValueRef Functor_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + CYPool pool; + cy::Functor *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + + sig::Type type; + type.name = NULL; + type.flags = 0; + + type.primitive = sig::function_P; + sig::Copy(pool, type.data.signature, internal->signature_); + + return CYMakePointer(context, internal->value_, _not(size_t), &type, NULL, NULL); +} CYCatch(NULL) } + +static JSValueRef Pointer_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + return _this; +} 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_)); @@ -1344,37 +1548,99 @@ static JSValueRef CYValue_callAsFunction_toJSON(JSContextRef context, JSObjectRe static JSValueRef CYValue_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { CYValue *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - char string[32]; - sprintf(string, "%p", internal->value_); - return CYCastJSValue(context, string); + std::ostringstream str; + Dl_info info; + if (internal->value_ == NULL) + str << "NULL"; + else if (dladdr(internal->value_, &info) == 0) + str << internal->value_; + else { + str << info.dli_sname; + off_t offset(static_cast(internal->value_) - static_cast(info.dli_saddr)); + if (offset != 0) + str << "+0x" << std::hex << offset; + } + std::string value(str.str()); + return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size()))); } 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, CYJSString("Array_prototype"))); JSObjectRef toCYON(CYCastJSObject(context, CYGetProperty(context, Array, toCYON_s))); return CYCallAsFunction(context, toCYON, _this, count, arguments); } else if (internal->type_->type_ == NULL) pointer: { - char string[32]; - sprintf(string, "%p", internal->value_); - return CYCastJSValue(context, string); - } try { + CYLocalPool pool; + std::ostringstream str; + + sig::Type type; + type.name = NULL; + type.flags = 0; + + type.primitive = sig::pointer_P; + type.data.data.type = internal->type_->type_; + type.data.data.size = 0; + + CYOptions options; + CYOutput output(*str.rdbuf(), options); + (new(pool) CYTypeExpression(Decode(pool, &type)))->Output(output, CYNoFlags); + + str << "(" << internal->value_ << ")"; + std::string value(str.str()); + return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size()))); + } else 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), NULL)); + return CYCastJSValue(context, pool.strcat("&", CYPoolCCYON(pool, context, value, objects), NULL)); } catch (const CYException &e) { goto pointer; } } CYCatch(NULL) } +static JSValueRef CString_getProperty_length(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + CString *internal(reinterpret_cast(JSObjectGetPrivate(object))); + char *string(static_cast(internal->value_)); + return CYCastJSValue(context, strlen(string)); +} CYCatch(NULL) } + +static JSValueRef CString_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + sig::Type type; + type.name = NULL; + type.flags = 0; + + type.primitive = sig::char_P; + type.data.data.type = NULL; + type.data.data.size = 0; + + return CYMakeType(context, &type); +} CYCatch(NULL) } + 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 CString_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + Pointer *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + const char *string(static_cast(internal->value_)); + std::ostringstream str; + str << "&"; + CYStringify(str, string, strlen(string), true); + std::string value(str.str()); + return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size()))); +} CYCatch(NULL) } + +static JSValueRef CString_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + Pointer *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + const char *string(static_cast(internal->value_)); + return CYCastJSValue(context, string); +} 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_); @@ -1405,10 +1671,10 @@ static JSValueRef Type_callAsFunction_toString(JSContextRef context, JSObjectRef 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))); CYLocalPool pool; - std::ostringstream out; + std::stringbuf out; CYOptions options; CYOutput output(out, options); - (new(pool) CYEncodedType(Decode(pool, internal->type_)))->Output(output, CYNoFlags); + (new(pool) CYTypeExpression(Decode(pool, internal->type_)))->Output(output, CYNoFlags); return CYCastJSValue(context, CYJSString(out.str().c_str())); } CYCatch(NULL) } @@ -1416,9 +1682,25 @@ static JSValueRef Type_callAsFunction_toJSON(JSContextRef context, JSObjectRef o return Type_callAsFunction_toString(context, object, _this, count, arguments, exception); } -static JSStaticFunction Pointer_staticFunctions[4] = { +static JSStaticFunction CString_staticFunctions[6] = { + {"toCYON", &CString_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"toPointer", &CString_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"toString", &CString_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"valueOf", &CString_callAsFunction_toString, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, 0} +}; + +static JSStaticValue CString_staticValues[3] = { + {"length", &CString_getProperty_length, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"type", &CString_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, NULL, 0} +}; + +static JSStaticFunction Pointer_staticFunctions[5] = { {"toCYON", &Pointer_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"toPointer", &Pointer_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {NULL, NULL, 0} }; @@ -1433,7 +1715,8 @@ static JSStaticFunction Struct_staticFunctions[2] = { {NULL, NULL, 0} }; -static JSStaticFunction Functor_staticFunctions[4] = { +static JSStaticFunction Functor_staticFunctions[5] = { + {"$cya", &Functor_callAsFunction_$cya, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toCYON", &CYValue_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, @@ -1479,7 +1762,7 @@ static JSStaticFunction Type_staticFunctions[14] = { 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) @@ -1502,56 +1785,65 @@ JSObjectRef CYGetGlobalObject(JSContextRef context) { return JSContextGetGlobalObject(context); } +// XXX: this is neither exceptin safe nor even terribly sane class ExecutionHandle { private: JSContextRef context_; - void *handle_; + std::vector handles_; public: ExecutionHandle(JSContextRef context) : context_(context) { - if (hooks_ != NULL && hooks_->ExecuteStart != NULL) - handle_ = (*hooks_->ExecuteStart)(context_); - else - handle_ = NULL; + 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; + } } ~ExecutionHandle() { - if (hooks_ != NULL && hooks_->ExecuteEnd != NULL) - (*hooks_->ExecuteEnd)(context_, handle_); + for (size_t i(GetHooks().size()); i != 0; --i) { + CYHook *hook(GetHooks()[i-1]); + if (hook->ExecuteEnd != NULL) + (*hook->ExecuteEnd)(context_, handles_[i-1]); + } } }; -const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code) { - JSValueRef exception(NULL); +static volatile bool cancel_; + +static bool CYShouldTerminate(JSContextRef context, void *arg) { + return cancel_; +} +_visible const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code) { ExecutionHandle handle(context); - JSValueRef result; try { - result = JSEvaluateScript(context, CYJSString(code), NULL, NULL, 0, &exception); - } catch (const char *error) { - return error; - } + cancel_ = false; + if (&JSContextGroupSetExecutionTimeLimit != NULL) + JSContextGroupSetExecutionTimeLimit(JSContextGetGroup(context), 0.5, &CYShouldTerminate, NULL); - if (exception != NULL) error: - return CYPoolCString(pool, context, CYJSString(context, exception)); + try { + JSValueRef result(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0)); + if (JSValueIsUndefined(context, result)) + return NULL; - if (JSValueIsUndefined(context, result)) - return NULL; + std::set objects; + const char *json(_jsccall(CYPoolCCYON, pool, context, result, objects)); + CYSetProperty(context, CYGetGlobalObject(context), Result_, result); - const char *json; try { - json = CYPoolCCYON(pool, context, result, &exception); - } catch (const char *error) { - return error; + return json; + } catch (const CYException &error) { + return pool.strcat("throw ", error.PoolCString(pool), NULL); } +} - if (exception != NULL) - goto error; - - CYSetProperty(context, CYGetGlobalObject(context), Result_, result); - - return json; +_visible void CYCancel() { + cancel_ = true; } static bool initialized_ = false; @@ -1578,6 +1870,15 @@ void CYInitializeDynamic() { definition.finalize = &CYFinalize; Context_ = JSClassCreate(&definition); + definition = kJSClassDefinitionEmpty; + definition.className = "CString"; + definition.staticFunctions = CString_staticFunctions; + definition.staticValues = CString_staticValues; + definition.getProperty = &CString_getProperty; + definition.setProperty = &CString_setProperty; + definition.finalize = &CYFinalize; + CString_ = JSClassCreate(&definition); + definition = kJSClassDefinitionEmpty; definition.className = "Functor"; definition.staticFunctions = cy::Functor::StaticFunctions; @@ -1590,6 +1891,7 @@ void CYInitializeDynamic() { definition.className = "Pointer"; definition.staticFunctions = Pointer_staticFunctions; definition.staticValues = Pointer_staticValues; + definition.callAsFunction = &Pointer_callAsFunction; definition.getProperty = &Pointer_getProperty; definition.setProperty = &Pointer_setProperty; definition.finalize = &CYFinalize; @@ -1632,11 +1934,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) { @@ -1645,23 +1949,24 @@ void CYThrow(JSContextRef context, JSValueRef value) { } 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)}; 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, ...) { @@ -1675,17 +1980,31 @@ CYJSError::CYJSError(JSContextRef context, const char *format, ...) { 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" bool CydgetMemoryParse(const uint16_t **data, size_t *size); +struct CYFile { + void *data_; + size_t size_; + + CYFile(void *data, size_t size) : + data_(data), + size_(size) + { + } +}; -void *CYMapFile(const char *path, size_t *psize) { - int fd(_syscall_(open(path, O_RDONLY), 1, {ENOENT})); +static void CYFileExit(void *data) { + CYFile *file(reinterpret_cast(data)); + _syscall(munmap(file->data_, file->size_)); +} + +static void *CYPoolFile(CYPool &pool, const char *path, size_t *psize) { + int fd(_syscall_(open(path, O_RDONLY), 1, ENOENT)); if (fd == -1) return NULL; @@ -1698,22 +2017,37 @@ void *CYMapFile(const char *path, size_t *psize) { void *base; _syscall(base = mmap(NULL, size, PROT_READ, MAP_SHARED, fd, 0)); + CYFile *file(new (pool) CYFile(base, size)); + pool.atexit(&CYFileExit, file); + _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; +static CYUTF8String CYPoolFileUTF8String(CYPool &pool, const char *path) { + CYUTF8String data; + data.data = reinterpret_cast(CYPoolFile(pool, path, &data.size)); + return data; +} +static const char *CYPoolLibraryPath(CYPool &pool) { Dl_info addr; - _assert(dladdr(reinterpret_cast(&require), &addr) != 0); + _assert(dladdr(reinterpret_cast(&CYPoolLibraryPath), &addr) != 0); char *lib(pool.strdup(addr.dli_fname)); char *slash(strrchr(lib, '/')); _assert(slash != NULL); *slash = '\0'; + return lib; +} + +static JSValueRef require(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + _assert(count == 1); + CYPool pool; + + const char *lib(CYPoolLibraryPath(pool)); + CYJSString property("exports"); JSObjectRef module; @@ -1727,13 +2061,14 @@ static JSValueRef require(JSContextRef context, JSObjectRef object, JSObjectRef if (!JSValueIsUndefined(context, cache)) module = CYCastJSObject(context, cache); else { - CYUTF8String code; - code.data = reinterpret_cast(CYMapFile(path, &code.size)); + CYUTF8String code(CYPoolFileUTF8String(pool, path)); 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); @@ -1748,7 +2083,7 @@ static JSValueRef require(JSContextRef context, JSObjectRef object, JSObjectRef std::stringstream wrap; wrap << "(function (exports, require, module) { " << code << "\n});"; - code = CYPoolCode(pool, wrap); + code = CYPoolCode(pool, *wrap.rdbuf()); JSValueRef value(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0)); JSObjectRef function(CYCastJSObject(context, value)); @@ -1757,9 +2092,30 @@ static JSValueRef require(JSContextRef context, JSObjectRef object, JSObjectRef CYCallAsFunction(context, function, NULL, 3, arguments); } - return CYGetProperty(context, module, property); + JSObjectRef exports(CYCastJSObject(context, CYGetProperty(context, module, property))); + + CYJSString _default("default"); + if (JSValueIsUndefined(context, CYGetProperty(context, exports, _default))) + CYSetProperty(context, exports, _default, exports, kJSPropertyAttributeDontEnum); + + return exports; } CYCatch(NULL) } +static bool CYRunScript(JSGlobalContextRef context, const char *path) { + CYPool pool; + CYUTF8String code(CYPoolFileUTF8String(pool, path)); + if (code.data == NULL) + return false; + + CYStream stream(code.data, code.data + code.size); + code = CYPoolCode(pool, stream); + _jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0); + return true; +} + +extern "C" void CYDestroyWeak(JSWeakObjectMapRef weak, void *data) { +} + extern "C" void CYSetupContext(JSGlobalContextRef context) { CYInitializeDynamic(); @@ -1807,6 +2163,9 @@ 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); @@ -1814,10 +2173,15 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { 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 CString(JSObjectMakeConstructor(context, CString_, &CString_new)); + CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CString, prototype_s)), String_prototype); + CYSetProperty(context, cycript, CYJSString("CString"), CString); + 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)); @@ -1844,11 +2208,9 @@ 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); @@ -1859,18 +2221,28 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { //CYSetProperty(context, System, CYJSString("global"), global); CYSetProperty(context, System, CYJSString("print"), &System_print); +#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)); - if (hooks_ != NULL && hooks_->SetupContext != NULL) - (*hooks_->SetupContext)(context); + CYRunScript(context, "libcycript.cy"); + + for (CYHook *hook : GetHooks()) + if (hook->SetupContext != NULL) + (*hook->SetupContext)(context); CYArrayPush(context, alls, cycript); } static JSGlobalContextRef context_; -JSGlobalContextRef CYGetJSContext() { +_visible JSGlobalContextRef CYGetJSContext() { CYInitializeDynamic(); if (context_ == NULL) { @@ -1881,7 +2253,7 @@ JSGlobalContextRef CYGetJSContext() { return context_; } -void CYDestroyContext() { +_visible void CYDestroyContext() { if (context_ == NULL) return; JSGlobalContextRelease(context_);