X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/9cea6cabbaf7998ce70303ab0db4b54a056ac92e..fddfdb6f5afd415d4f8b9b6f74aad2cd1180094a:/Execute.cpp diff --git a/Execute.cpp b/Execute.cpp index 241ba32..d27183c 100644 --- a/Execute.cpp +++ b/Execute.cpp @@ -1,59 +1,79 @@ /* 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 -#include "Parser.hpp" +#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_; +const char *sqlite3_column_string(sqlite3_stmt *stmt, int n) { + return reinterpret_cast(sqlite3_column_text(stmt, n)); +} + +char *sqlite3_column_pooled(CYPool &pool, sqlite3_stmt *stmt, int n) { + if (const char *value = sqlite3_column_string(stmt, n)) + return pool.strdup(value); + else return NULL; +} + +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) { return _jsccall(JSObjectGetPropertyAtIndex, context, object, index); } @@ -73,6 +93,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) { @@ -84,8 +109,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) { @@ -118,8 +154,21 @@ size_t CYGetIndex(CYPool &pool, JSContextRef context, JSStringRef value) { } /* }}} */ +static JSObjectRef (*JSObjectMakeArray$)(JSContextRef, size_t, const JSValueRef[], JSValueRef *); + +static JSObjectRef CYObjectMakeArray(JSContextRef context, size_t length, const JSValueRef values[]) { + if (JSObjectMakeArray$ != NULL) + return _jsccall(*JSObjectMakeArray$, context, length, values); + else { + JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array"))); + JSValueRef value(CYCallAsFunction(context, Array, NULL, length, values)); + return CYCastJSObject(context, value); + } +} + static JSClassRef All_; static JSClassRef Context_; +static JSClassRef CString_; JSClassRef Functor_; static JSClassRef Global_; static JSClassRef Pointer_; @@ -139,6 +188,9 @@ JSStringRef toCYON_s; JSStringRef toJSON_s; JSStringRef toPointer_s; JSStringRef toString_s; +JSStringRef weak_s; + +static sqlite3 *database_; static JSStringRef Result_; @@ -152,7 +204,6 @@ void CYFinalize(JSObjectRef object) { 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 @@ -165,28 +216,7 @@ void Structor_(CYPool &pool, sig::Type *&type) { if (type->primitive != sig::struct_P || type->name == NULL) return; - size_t length(strlen(type->name)); - char keyed[length + 2]; - memcpy(keyed + 1, type->name, length + 1); - - static const char *modes = "34"; - for (size_t i(0); i != 2; ++i) { - char mode(modes[i]); - keyed[0] = mode; - - if (CYBridgeEntry *entry = CYBridgeHash(keyed, length + 1)) - switch (mode) { - case '3': - sig::Parse(pool, &type->data.signature, entry->value_, &Structor_); - break; - - case '4': { - sig::Signature signature; - sig::Parse(pool, &signature, entry->value_, &Structor_); - type = signature.elements[0].type; - } break; - } - } + //_assert(false); } JSClassRef Type_privateData::Class_; @@ -202,6 +232,15 @@ struct Context : } }; +struct CString : + CYOwned +{ + CString(char *value, JSContextRef context, JSObjectRef owner) : + CYOwned(value, context, owner) + { + } +}; + struct Pointer : CYOwned { @@ -214,6 +253,13 @@ struct Pointer : length_(length) { } + + Pointer(void *value, JSContextRef context, JSObjectRef owner, size_t length, const char *encoding) : + CYOwned(value, context, owner), + type_(new(*pool_) Type_privateData(encoding)), + length_(length) + { + } }; struct Struct_privateData : @@ -227,9 +273,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_); @@ -249,6 +292,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); } @@ -262,6 +309,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)); \ } @@ -308,6 +356,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)); } @@ -316,38 +372,87 @@ 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; +void CYArrayPush(JSContextRef context, JSObjectRef array, size_t length, const JSValueRef arguments[]) { JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype"))); - _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, push_s)), array, 1, arguments); + _jsccall(JSObjectCallAsFunction, context, CYCastJSObject(context, CYGetProperty(context, Array, push_s)), array, length, arguments); } +void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) { + return CYArrayPush(context, array, 1, &value); +} + +template +class CYArrayBuilder { + private: + JSContextRef context_; + JSObjectRef &array_; + size_t size_; + JSValueRef values_[Size_]; + + void flush() { + if (array_ == NULL) + array_ = CYObjectMakeArray(context_, size_, values_); + else + CYArrayPush(context_, array_, size_, values_); + } + + public: + CYArrayBuilder(JSContextRef context, JSObjectRef &array) : + context_(context), + array_(array), + size_(0) + { + } + + ~CYArrayBuilder() { + flush(); + } + + void operator ()(JSValueRef value) { + if (size_ == Size_) { + flush(); + size_ = 0; + } + + values_[size_++] = 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 void (*JSSynchronousGarbageCollectForDebugging$)(JSContextRef); -static JSValueRef $cyq(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { +_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; - const char *name(pool.strcat(CYPoolCString(pool, context, arguments[0]), pool.itoa(Nonce_++), NULL)); - return CYCastJSValue(context, name); -} CYCatch(NULL) } + 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 { - JSGarbageCollect(context); + 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"; @@ -372,20 +477,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, JSObjectRef object) { +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, 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); } @@ -393,7 +509,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)) { @@ -406,6 +522,8 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object) } } + _assert(objects.insert(object).second); + std::ostringstream str; str << '{'; @@ -433,7 +551,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"; } @@ -447,7 +565,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; @@ -465,7 +595,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; @@ -497,23 +627,26 @@ JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, si return JSObjectMake(context, Pointer_, internal); } +JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, const char *encoding, JSObjectRef owner) { + Pointer *internal(new Pointer(pointer, context, owner, length, encoding)); + 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)); } -static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *encoding, void **cache) { - cy::Functor *internal; - if (*cache != NULL) - internal = reinterpret_cast(*cache); - else { - void (*function)()(reinterpret_cast(CYCastSymbol(symbol))); - if (function == NULL) - return NULL; - - internal = new cy::Functor(encoding, function); - *cache = internal; - } +static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *encoding) { + void (*function)()(reinterpret_cast(CYCastSymbol(symbol))); + if (function == NULL) + return NULL; + cy::Functor *internal(new cy::Functor(encoding, function)); ++internal->count_; return JSObjectMake(context, Functor_, internal); } @@ -522,8 +655,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: { @@ -536,13 +671,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; + } } } @@ -558,7 +701,7 @@ void CYPoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ff break; CYPoolFFI_(uchar, unsigned char) - CYPoolFFI_(char, char) + CYPoolFFI_(schar, signed char) CYPoolFFI_(ushort, unsigned short) CYPoolFFI_(short, short) CYPoolFFI_(ulong, unsigned long) @@ -595,10 +738,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)); @@ -631,10 +776,14 @@ void CYPoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ff case sig::void_P: break; + // XXX: implement a conversion from a single character string? + CYPoolFFI_(char, char) + 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); } @@ -650,7 +799,7 @@ JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void return CYCastJSValue(context, *reinterpret_cast(data)); \ CYFromFFI_(uchar, unsigned char) - CYFromFFI_(char, char) + CYFromFFI_(schar, signed char) CYFromFFI_(ushort, unsigned short) CYFromFFI_(short, short) CYFromFFI_(ulong, unsigned long) @@ -673,8 +822,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: @@ -682,18 +831,21 @@ JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void case sig::void_P: return CYJSUndefined(context); + CYFromFFI_(char, char) + 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_); @@ -704,7 +856,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); } @@ -712,20 +864,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; @@ -736,7 +884,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)); @@ -748,15 +896,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) { @@ -772,6 +924,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_); @@ -808,10 +986,13 @@ static bool Index_(CYPool &pool, JSContextRef context, Struct_privateData *inter base: ffi_type **elements(typical->GetFFI()->elements); - base = reinterpret_cast(internal->value_); - for (ssize_t local(0); local != index; ++local) - base += elements[local]->size; + size_t offset(0); + for (ssize_t local(0); local != index; ++local) { + offset += elements[local]->size; + CYAlign(offset, elements[local + 1]->alignment); + } + base = reinterpret_cast(internal->value_) + offset; return true; } @@ -823,9 +1004,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")) @@ -833,13 +1014,16 @@ 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); + 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 { @@ -928,6 +1112,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"); @@ -946,11 +1134,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); } @@ -960,8 +1150,16 @@ 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) } -JSObjectRef CYMakeType(JSContextRef context, const char *encoding) { - Type_privateData *internal(new Type_privateData(encoding)); +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, sig::Primitive primitive) { + Type_privateData *internal(new Type_privateData(primitive)); return JSObjectMake(context, Type_privateData::Class_, internal); } @@ -983,7 +1181,61 @@ JSObjectRef CYMakeType(JSContextRef context, sig::Signature *signature) { return CYMakeType(context, &type); } +extern "C" bool CYBridgeHash(CYPool &pool, CYUTF8String name, const char *&code, unsigned &flags) { + sqlite3_stmt *statement; + + _sqlcall(sqlite3_prepare(database_, + "select " + "\"cache\".\"code\", " + "\"cache\".\"flags\" " + "from \"cache\" " + "where" + " \"cache\".\"system\" & " CY_SYSTEM " == " CY_SYSTEM " and" + " \"cache\".\"name\" = ?" + " limit 1" + , -1, &statement, NULL)); + + _sqlcall(sqlite3_bind_text(statement, 1, name.data, name.size, SQLITE_STATIC)); + + bool success; + if (_sqlcall(sqlite3_step(statement)) == SQLITE_DONE) + success = false; + else { + success = true; + code = sqlite3_column_pooled(pool, statement, 0); + flags = sqlite3_column_int(statement, 1); + } + + _sqlcall(sqlite3_finalize(statement)); + return success; +} + +static bool All_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) { + if (JSStringIsEqualToUTF8CString(property, "errno")) + return true; + + 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; + const char *code; + unsigned flags; + if (CYBridgeHash(pool, CYPoolUTF8String(pool, context, property), code, flags)) + return true; + + return false; +} + static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { + if (JSStringIsEqualToUTF8CString(property, "errno")) + return CYCastJSValue(context, errno); + JSObjectRef global(CYGetGlobalObject(context)); JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript")))); JSObjectRef alls(CYCastJSObject(context, CYGetProperty(context, cycript, CYJSString("alls")))); @@ -995,44 +1247,76 @@ static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSSt return value; 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) { - char mode(modes[i]); - keyed[0] = mode; - - if (CYBridgeEntry *entry = CYBridgeHash(keyed, length + 1)) - switch (mode) { - case '0': - return JSEvaluateScript(CYGetJSContext(context), CYJSString(entry->value_), NULL, NULL, 0, NULL); - - case '1': - return CYMakeFunctor(context, name.data, entry->value_, &entry->cache_); - - case '2': - if (void *symbol = CYCastSymbol(name.data)) { - // XXX: this is horrendously inefficient - sig::Signature signature; - sig::Parse(pool, &signature, entry->value_, &Structor_); - ffi_cif cif; - sig::sig_ffi_cif(pool, &sig::ObjectiveC, &signature, &cif); - return CYFromFFI(context, signature.elements[0].type, cif.rtype, symbol); - } else return NULL; - - // XXX: implement case 3 - case '4': - return CYMakeType(context, entry->value_); - } + const char *code; + unsigned flags; + if (CYBridgeHash(pool, CYPoolUTF8String(pool, context, property), code, flags)) { + CYUTF8String parsed; + + try { + parsed = CYPoolCode(pool, code); + } catch (const CYException &error) { + CYThrow("%s", pool.strcat("error caching ", CYPoolCString(pool, context, property), ": ", error.PoolCString(pool), NULL)); + } + + JSValueRef result(_jsccall(JSEvaluateScript, context, CYJSString(parsed), NULL, NULL, 0)); + + if (flags == 0) { + JSObjectRef cache(CYGetCachedObject(context, CYJSString("cache"))); + CYSetProperty(context, cache, property, result); + } + + return result; } return NULL; } CYCatch(NULL) } +static JSValueRef All_complete_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + _assert(count == 1); + CYPool pool; + CYUTF8String prefix(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0]))); + + JSObjectRef array(NULL); + + { + CYArrayBuilder<1024> values(context, array); + + sqlite3_stmt *statement; + + if (prefix.size == 0) + _sqlcall(sqlite3_prepare(database_, + "select " + "\"cache\".\"name\" " + "from \"cache\" " + "where" + " \"cache\".\"system\" & " CY_SYSTEM " == " CY_SYSTEM + , -1, &statement, NULL)); + else { + _sqlcall(sqlite3_prepare(database_, + "select " + "\"cache\".\"name\" " + "from \"cache\" " + "where" + " \"cache\".\"name\" >= ? and \"cache\".\"name\" < ? and " + " \"cache\".\"system\" & " CY_SYSTEM " == " CY_SYSTEM + , -1, &statement, NULL)); + + _sqlcall(sqlite3_bind_text(statement, 1, prefix.data, prefix.size, SQLITE_STATIC)); + + char *after(pool.strndup(prefix.data, prefix.size)); + ++after[prefix.size - 1]; + _sqlcall(sqlite3_bind_text(statement, 2, after, prefix.size, SQLITE_STATIC)); + } + + while (_sqlcall(sqlite3_step(statement)) != SQLITE_DONE) + values(CYCastJSValue(context, CYJSString(sqlite3_column_string(statement, 0)))); + + _sqlcall(sqlite3_finalize(statement)); + } + + return array; +} CYCatch(NULL) } + static void All_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { JSObjectRef global(CYGetGlobalObject(context)); JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript")))); @@ -1047,6 +1331,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"); @@ -1063,11 +1354,48 @@ 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 *encoding(CYPoolCString(pool, context, arguments[0])); + sig::Signature signature; + sig::Parse(pool, &signature, encoding, &Structor_); + return CYMakeType(context, signature.elements[0].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 { @@ -1137,6 +1465,78 @@ static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef 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::schar_P: case sig::uchar_P: type.primitive = sig::schar_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::schar_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); } @@ -1209,8 +1609,11 @@ static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef obje type = type->data.data.type; } - void *value(calloc(1, internal->GetFFI()->size)); - return CYMakePointer(context, value, length, type, NULL, NULL); + JSObjectRef pointer(CYMakePointer(context, NULL, length, type, NULL, NULL)); + Pointer *value(reinterpret_cast(JSObjectGetPrivate(pointer))); + value->value_ = value->pool_->malloc(internal->GetFFI()->size); + memset(value->value_, 0, internal->GetFFI()->size); + return pointer; } CYCatch(NULL) } static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1223,6 +1626,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_)); @@ -1234,32 +1669,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: { + 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, CYGetProperty(context, _this, cyi_s)), NULL)); + return CYCastJSValue(context, pool.strcat("&", CYPoolCCYON(pool, context, value, objects), NULL)); } catch (const CYException &e) { - char string[32]; - sprintf(string, "%p", internal->value_); - return CYCastJSValue(context, string); + 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_); @@ -1290,10 +1792,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) } @@ -1301,9 +1803,30 @@ 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 All_staticFunctions[2] = { + {"cy$complete", &All_complete_callAsFunction, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, 0} +}; + +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} }; @@ -1318,7 +1841,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}, @@ -1334,6 +1858,10 @@ static JSStaticValue Functor_staticValues[2] = { {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}, @@ -1341,36 +1869,30 @@ static JSStaticValue Type_staticValues[4] = { {NULL, NULL, NULL, 0} }; -static JSStaticFunction Type_staticFunctions[10] = { +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) - 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); - } - + JSObjectRef array(CYObjectMakeArray(context, argc, args)); JSObjectRef System(CYGetCachedObject(context, CYJSString("System"))); CYSetProperty(context, System, CYJSString("args"), array); } @@ -1379,51 +1901,69 @@ JSObjectRef CYGetGlobalObject(JSContextRef context) { return JSContextGetGlobalObject(context); } -const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code) { - JSValueRef exception(NULL); - - 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_; - try { + 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; + } + } - JSValueRef result; - 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_; +} - const char *json; - 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); - if (exception != NULL) - goto error; + cancel_ = false; + if (&JSContextGroupSetExecutionTimeLimit != NULL) + JSContextGroupSetExecutionTimeLimit(JSContextGetGroup(context), 0.5, &CYShouldTerminate, NULL); - CYSetProperty(context, CYGetGlobalObject(context), Result_, result); + try { + JSValueRef result(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0)); + if (JSValueIsUndefined(context, result)) + return NULL; - return json; + std::set objects; + const char *json(_jsccall(CYPoolCCYON, pool, context, result, objects)); + CYSetProperty(context, CYGetGlobalObject(context), Result_, result); - } catch (...) { - if (hooks_ != NULL && hooks_->ExecuteEnd != NULL) - (*hooks_->ExecuteEnd)(context, handle); - throw; + return json; + } catch (const CYException &error) { + return pool.strcat("throw ", error.PoolCString(pool), NULL); } } +_visible void CYCancel() { + cancel_ = true; +} + +static const char *CYPoolLibraryPath(CYPool &pool); + static bool initialized_ = false; void CYInitializeDynamic() { @@ -1431,12 +1971,19 @@ void CYInitializeDynamic() { initialized_ = true; else return; + CYPool pool; + const char *db(pool.strcat(CYPoolLibraryPath(pool), "/libcycript.db", NULL)); + _sqlcall(sqlite3_open_v2(db, &database_, SQLITE_OPEN_READONLY, NULL)); + JSObjectMakeArray$ = reinterpret_cast(dlsym(RTLD_DEFAULT, "JSObjectMakeArray")); + JSSynchronousGarbageCollectForDebugging$ = reinterpret_cast(dlsym(RTLD_DEFAULT, "JSSynchronousGarbageCollectForDebugging")); JSClassDefinition definition; definition = kJSClassDefinitionEmpty; definition.className = "All"; + definition.staticFunctions = All_staticFunctions; + definition.hasProperty = &All_hasProperty; definition.getProperty = &All_getProperty; definition.getPropertyNames = &All_getPropertyNames; All_ = JSClassCreate(&definition); @@ -1446,6 +1993,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; @@ -1458,6 +2014,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; @@ -1500,11 +2057,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) { @@ -1513,23 +2072,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, ...) { @@ -1543,119 +2103,100 @@ 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); - -void *CYMapFile(const char *path, size_t *psize) { - int fd; - _syscall(fd = open(path, O_RDONLY)); - - 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 void CYRunSetups(JSContextRef context) { - std::string folder("/etc/cycript/setup.d"); - DIR *setups(opendir(folder.c_str())); - if (setups == NULL) - return; - - for (;;) { - dirent setup; - dirent *result; - _syscall(readdir_r(setups, &setup, &result)); - - if (result == NULL) - break; - _assert(result == &setup); - - const char *name(setup.d_name); - size_t length(strlen(name)); - if (length < 4) - continue; - - if (name[0] == '.') - continue; - if (memcmp(name + length - 3, ".cy", 3) != 0) - continue; - - std::string script(folder + "/" + name); - CYUTF8String utf8; - utf8.data = reinterpret_cast(CYMapFile(script.c_str(), &utf8.size)); - - CYPool pool; - CYUTF16String utf16(CYPoolUTF16String(pool, utf8)); - munmap(const_cast(utf8.data), utf8.size); +static const char *CYPoolLibraryPath(CYPool &pool) { + Dl_info addr; + _assert(dladdr(reinterpret_cast(&CYPoolLibraryPath), &addr) != 0); + char *lib(pool.strdup(addr.dli_fname)); - // XXX: this should not be used - CydgetMemoryParse(&utf16.data, &utf16.size); + char *slash(strrchr(lib, '/')); + _assert(slash != NULL); + *slash = '\0'; - CYExecute(context, pool, CYPoolUTF8String(pool, utf16)); - free(const_cast(utf16.data)); - } + slash = strrchr(lib, '/'); + if (slash != NULL && strcmp(slash, "/.libs") == 0) + *slash = '\0'; - _syscall(closedir(setups)); + return lib; } -static JSValueRef require(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { +static JSValueRef require_callAsFunction(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)); + const char *name(CYPoolCString(pool, context, arguments[0])); + 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(context); - char *slash(strrchr(lib, '/')); - _assert(slash != NULL); - *slash = '\0'; + JSObjectRef resolve(CYCastJSObject(context, CYGetProperty(context, object, CYJSString("resolve")))); + CYJSString path(context, CYCallAsFunction(context, resolve, NULL, 1, arguments)); CYJSString property("exports"); - JSObjectRef module; - const char *path(pool.strcat(lib, "/cycript/", CYPoolCString(pool, context, arguments[0]), ".cy", NULL)); - CYJSString key(path); JSObjectRef modules(CYGetCachedObject(context, CYJSString("modules"))); - JSValueRef cache(CYGetProperty(context, modules, key)); + JSValueRef cache(CYGetProperty(context, modules, path)); - if (!JSValueIsUndefined(context, cache)) - module = CYCastJSObject(context, cache); - else { - CYUTF8String code; - code.data = reinterpret_cast(CYMapFile(path, &code.size)); + JSValueRef result; + if (!JSValueIsUndefined(context, cache)) { + JSObjectRef module(CYCastJSObject(context, cache)); + result = CYGetProperty(context, module, property); + } else { + CYUTF8String code(CYPoolFileUTF8String(pool, CYPoolCString(pool, context, path))); + _assert(code.data != NULL); - std::stringstream wrap; - wrap << "(function (exports, require, module) { " << code << "\n});"; - code = CYPoolCode(pool, wrap.str().c_str()); + size_t length(strlen(name)); + if (length >= 5 && strcmp(name + length - 5, ".json") == 0) { + JSObjectRef JSON(CYGetCachedObject(context, CYJSString("JSON"))); + JSObjectRef parse(CYCastJSObject(context, CYGetProperty(context, JSON, CYJSString("parse")))); + JSValueRef arguments[1] = { CYCastJSValue(context, CYJSString(code)) }; + result = CYCallAsFunction(context, parse, JSON, 1, arguments); + } else { + JSObjectRef module(JSObjectMake(context, NULL, NULL)); + CYSetProperty(context, modules, path, module); + + JSObjectRef exports(JSObjectMake(context, NULL, NULL)); + CYSetProperty(context, module, property, exports); + + std::stringstream wrap; + wrap << "(function (exports, require, module, __filename) { " << code << "\n});"; + code = CYPoolCode(pool, *wrap.rdbuf()); + + JSValueRef value(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0)); + JSObjectRef function(CYCastJSObject(context, value)); + + JSValueRef arguments[4] = { exports, object, module, CYCastJSValue(context, path) }; + CYCallAsFunction(context, function, NULL, 4, arguments); + result = CYGetProperty(context, module, property); + } + } - JSValueRef value(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0)); - JSObjectRef function(CYCastJSObject(context, value)); + return result; +} CYCatch(NULL) } - module = JSObjectMake(context, NULL, NULL); - JSObjectRef exports(JSObjectMake(context, NULL, NULL)); - CYSetProperty(context, module, property, exports); +static bool CYRunScript(JSGlobalContextRef context, const char *path) { + CYPool pool; + CYUTF8String code(CYPoolFileUTF8String(pool, pool.strcat(CYPoolLibraryPath(pool), path, NULL))); + if (code.data == NULL) + return false; - JSValueRef arguments[3] = { exports, JSObjectMakeFunctionWithCallback(context, CYJSString("require"), &require), module }; - CYCallAsFunction(context, function, NULL, 3, arguments); - CYSetProperty(context, modules, key, module); - } + code = CYPoolCode(pool, code); + _jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0); + return true; +} - return CYGetProperty(context, module, property); -} CYCatch(NULL) } +extern "C" void CYDestroyWeak(JSWeakObjectMapRef weak, void *data) { +} extern "C" void CYSetupContext(JSGlobalContextRef context) { CYInitializeDynamic(); @@ -1672,6 +2213,12 @@ 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); @@ -1681,6 +2228,15 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { JSObjectRef Function_prototype(CYCastJSObject(context, CYGetProperty(context, Function, prototype_s))); CYSetProperty(context, cy, CYJSString("Function_prototype"), Function_prototype); + JSObjectRef JSON(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("JSON")))); + CYSetProperty(context, cy, CYJSString("JSON"), JSON); + + 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); @@ -1692,6 +2248,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); @@ -1699,10 +2258,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)); @@ -1714,6 +2278,10 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { JSObjectRef all(JSObjectMake(context, All_, NULL)); CYSetProperty(context, cycript, CYJSString("all"), all); + JSObjectRef cache(JSObjectMake(context, NULL, NULL)); + CYSetProperty(context, cy, CYJSString("cache"), cache); + CYSetPrototype(context, cache, all); + JSObjectRef alls(_jsccall(JSObjectCallAsConstructor, context, Array, 0, NULL)); CYSetProperty(context, cycript, CYJSString("alls"), alls); @@ -1729,36 +2297,54 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { next = JSObjectGetPrototype(context, curr); } - JSObjectSetPrototype(context, last, all); + CYSetPrototype(context, last, cache); } - 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("require"), &require_callAsFunction, 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 (CYBridgeEntry *entry = CYBridgeHash("1dlerror", 8)) - entry->cache_ = new cy::Functor(entry->value_, reinterpret_cast(&dlerror)); + CYSetProperty(context, global, CYJSString("global"), global); + +#ifdef __APPLE__ + if (&JSWeakObjectMapCreate != NULL) { + JSWeakObjectMapRef weak(JSWeakObjectMapCreate(context, NULL, &CYDestroyWeak)); + CYSetProperty(context, cy, weak_s, CYCastJSValue(context, reinterpret_cast(weak))); + } +#endif + + CYSetProperty(context, cache, CYJSString("dlerror"), CYMakeFunctor(context, "dlerror", "*"), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("RTLD_DEFAULT"), CYCastJSValue(context, reinterpret_cast(RTLD_DEFAULT)), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("dlsym"), CYMakeFunctor(context, "dlsym", "^v^v*"), kJSPropertyAttributeDontEnum); + + CYSetProperty(context, cache, CYJSString("NULL"), CYJSNull(context), kJSPropertyAttributeDontEnum); - if (hooks_ != NULL && hooks_->SetupContext != NULL) - (*hooks_->SetupContext)(context); + CYSetProperty(context, cache, CYJSString("bool"), CYMakeType(context, sig::boolean_P), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("char"), CYMakeType(context, sig::char_P), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("short"), CYMakeType(context, sig::short_P), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("int"), CYMakeType(context, sig::int_P), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("long"), CYMakeType(context, sig::long_P), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("float"), CYMakeType(context, sig::float_P), kJSPropertyAttributeDontEnum); + CYSetProperty(context, cache, CYJSString("double"), CYMakeType(context, sig::double_P), kJSPropertyAttributeDontEnum); + + for (CYHook *hook : GetHooks()) + if (hook->SetupContext != NULL) + (*hook->SetupContext)(context); CYArrayPush(context, alls, cycript); - CYRunSetups(context); + CYRunScript(context, "/libcycript.cy"); } -JSGlobalContextRef CYGetJSContext() { - CYInitializeDynamic(); +static JSGlobalContextRef context_; - static JSGlobalContextRef context_; +_visible JSGlobalContextRef CYGetJSContext() { + CYInitializeDynamic(); if (context_ == NULL) { context_ = JSGlobalContextCreate(Global_); @@ -1767,3 +2353,10 @@ JSGlobalContextRef CYGetJSContext() { return context_; } + +_visible void CYDestroyContext() { + if (context_ == NULL) + return; + JSGlobalContextRelease(context_); + context_ = NULL; +}