X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/20ded97a3fd17e970ee44a9a2ae273098e27c3cb..6dc7eb4f27d6bc2d188d7c6a27695a493244a33a:/Execute.cpp diff --git a/Execute.cpp b/Execute.cpp index 8ac1b14..b2fe08a 100644 --- a/Execute.cpp +++ b/Execute.cpp @@ -1,40 +1,22 @@ -/* Cycript - Inlining/Optimizing JavaScript Compiler - * Copyright (C) 2009 Jay Freeman (saurik) +/* Cycript - Optimizing JavaScript Compiler/Runtime + * Copyright (C) 2009-2013 Jay Freeman (saurik) */ -/* Modified BSD License {{{ */ +/* GNU General Public License, Version 3 {{{ */ /* - * Redistribution and use in source and binary - * forms, with or without modification, are permitted - * provided that the following conditions are met: + * 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. * - * 1. Redistributions of source code must retain the - * above copyright notice, this list of conditions - * and the following disclaimer. - * 2. Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the - * distribution. - * 3. The name of the author may not be used to endorse - * or promote products derived from this software - * without specific prior written permission. + * Cycript is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ + * You should have received a copy of the GNU General Public License + * along with Cycript. If not, see <http://www.gnu.org/licenses/>. +**/ /* }}} */ #include "Internal.hpp" @@ -149,7 +131,7 @@ size_t CYGetIndex(apr_pool_t *pool, JSContextRef context, JSStringRef value) { static JSClassRef All_; static JSClassRef Context_; -static JSClassRef Functor_; +JSClassRef Functor_; static JSClassRef Global_; static JSClassRef Pointer_; static JSClassRef Struct_; @@ -166,6 +148,7 @@ JSStringRef splice_s; JSStringRef toCYON_s; JSStringRef toJSON_s; JSStringRef toPointer_s; +JSStringRef toString_s; static JSStringRef Result_; @@ -274,6 +257,10 @@ JSObjectRef CYMakeStruct(JSContextRef context, void *data, sig::Type *type, ffi_ return JSObjectMake(context, Struct_, internal); } +static void *CYCastSymbol(const char *name) { + return dlsym(RTLD_DEFAULT, name); +} + JSValueRef CYCastJSValue(JSContextRef context, bool value) { return JSValueMakeBoolean(context, value); } @@ -348,7 +335,7 @@ static JSValueRef System_print(JSContextRef context, JSObjectRef object, JSObjec } return CYJSUndefined(context); -} CYCatch } +} CYCatch(NULL) } static size_t Nonce_(0); @@ -392,7 +379,7 @@ const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value default: throw CYJSError(context, "JSValueGetType() == 0x%x", type); } -} CYCatch } +} CYCatch(NULL) } const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSValueRef value) { JSValueRef exception(NULL); @@ -418,6 +405,16 @@ const char *CYPoolCCYON(apr_pool_t *pool, JSContextRef context, JSObjectRef obje return cyon; } + if (JSObjectIsFunction(context, object)) { + JSValueRef toString(CYGetProperty(context, object, toString_s)); + if (CYIsCallable(context, toString)) { + JSValueRef arguments[1] = {CYCastJSValue(context, CYJSString(""))}; + JSValueRef value(CYCallAsFunction(context, (JSObjectRef) toString, object, 1, arguments)); + _assert(value != NULL); + return CYPoolCString(pool, context, value); + } + } + std::ostringstream str; str << '{'; @@ -482,28 +479,42 @@ static JSValueRef Array_callAsFunction_toCYON(JSContextRef context, JSObjectRef std::string value(str.str()); return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size()))); -} CYCatch } +} CYCatch(NULL) } + +static JSValueRef String_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + CYPool pool; + std::ostringstream str; + + CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, _this))); + CYStringify(str, string.data, string.size); + + std::string value(str.str()); + return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size()))); +} CYCatch(NULL) } JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, sig::Type *type, ffi_type *ffi, JSObjectRef owner) { Pointer *internal(new Pointer(pointer, context, owner, length, type)); return JSObjectMake(context, Pointer_, internal); } -static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const char *type, void **cache = NULL) { - cy::Functor *internal; +static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const char *type) { + return JSObjectMake(context, Functor_, new cy::Functor(type, function)); +} - if (cache != NULL && *cache != NULL) { +static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *type, void **cache) { + cy::Functor *internal; + if (*cache != NULL) internal = reinterpret_cast<cy::Functor *>(*cache); - ++internal->count_; - } else { - internal = new cy::Functor(type, function); + else { + void (*function)()(reinterpret_cast<void (*)()>(CYCastSymbol(symbol))); + if (function == NULL) + return NULL; - if (cache != NULL) { - *cache = internal; - ++internal->count_; - } + internal = new cy::Functor(type, function); + *cache = internal; } + ++internal->count_; return JSObjectMake(context, Functor_, internal); } @@ -681,7 +692,7 @@ JSValueRef CYFromFFI(JSContextRef context, sig::Type *type, ffi_type *ffi, void } } -static void FunctionClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) { +void CYExecuteClosure(ffi_cif *cif, void *result, void **arguments, void *arg, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef)) { Closure_privateData *internal(reinterpret_cast<Closure_privateData *>(arg)); JSContextRef context(internal->context_); @@ -692,15 +703,32 @@ static void FunctionClosure_(ffi_cif *cif, void *result, void **arguments, void for (size_t index(0); index != count; ++index) values[index] = CYFromFFI(context, internal->signature_.elements[1 + index].type, internal->cif_.arg_types[index], arguments[index]); - JSValueRef value(CYCallAsFunction(context, internal->function_, NULL, count, values)); + JSValueRef value(adapter(context, count, values, internal->function_)); CYPoolFFI(NULL, context, internal->signature_.elements[0].type, internal->cif_.rtype, result, value); } +static JSValueRef FunctionAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) { + 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 char *type, void (*callback)(ffi_cif *, void *, void **, void *)) { // XXX: in case of exceptions this will leak // XXX: in point of fact, this may /need/ to leak :( Closure_privateData *internal(new Closure_privateData(context, function, type)); +#if defined(__APPLE__) && defined(__arm__) + void *executable; + ffi_closure *writable(reinterpret_cast<ffi_closure *>(ffi_closure_alloc(sizeof(ffi_closure), &executable))); + + ffi_status status(ffi_prep_closure_loc(writable, &internal->cif_, callback, internal, executable)); + _assert(status == FFI_OK); + + internal->value_ = executable; +#else ffi_closure *closure((ffi_closure *) _syscall(mmap( NULL, sizeof(ffi_closure), PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, @@ -713,6 +741,7 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, _syscall(mprotect(closure, sizeof(*closure), PROT_READ | PROT_EXEC)); internal->value_ = closure; +#endif return internal; } @@ -813,7 +842,7 @@ static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, JSObjectRef owner(internal->GetOwner() ?: object); return CYFromFFI(context, typical->type_, ffi, base, false, owner); -} CYCatch } +} CYCatch(NULL) } static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { CYPool pool; @@ -821,13 +850,13 @@ static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStri Type_privateData *typical(internal->type_); if (typical->type_ == NULL) - return NULL; + return false; ssize_t offset; if (JSStringIsEqualToUTF8CString(property, "$cyi")) offset = 0; else if (!CYGetOffset(pool, context, property, offset)) - return NULL; + return false; ffi_type *ffi(typical->GetFFI()); @@ -836,7 +865,7 @@ static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStri CYPoolFFI(NULL, context, typical->type_, ffi, base, value); return true; -} CYCatch } +} CYCatch(false) } static JSValueRef Struct_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(_this))); @@ -858,7 +887,7 @@ static JSValueRef Struct_getProperty(JSContextRef context, JSObjectRef object, J JSObjectRef owner(internal->GetOwner() ?: object); return CYFromFFI(context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, false, owner); -} CYCatch } +} CYCatch(NULL) } static bool Struct_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry { CYPool pool; @@ -873,7 +902,7 @@ static bool Struct_setProperty(JSContextRef context, JSObjectRef object, JSStrin CYPoolFFI(NULL, context, typical->type_->data.signature.elements[index].type, typical->GetFFI()->elements[index], base, value); return true; -} CYCatch } +} CYCatch(false) } static void Struct_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object))); @@ -925,7 +954,7 @@ JSValueRef CYCallFunction(apr_pool_t *pool, JSContextRef context, size_t setups, ffi_call(cif, function, value, values); return CYFromFFI(context, signature->elements[0].type, cif->rtype, value, initialize); -} CYCatch } +} CYCatch(NULL) } static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYPool pool; @@ -933,34 +962,30 @@ static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef objec return CYCallFunction(pool, context, 0, NULL, count, arguments, false, exception, &internal->signature_, &internal->cif_, internal->GetValue()); } -static JSObjectRef CYMakeType(JSContextRef context, const char *type) { +JSObjectRef CYMakeType(JSContextRef context, const char *type) { Type_privateData *internal(new Type_privateData(type)); return JSObjectMake(context, Type_privateData::Class_, internal); } -static JSObjectRef CYMakeType(JSContextRef context, sig::Type *type) { +JSObjectRef CYMakeType(JSContextRef context, sig::Type *type) { Type_privateData *internal(new Type_privateData(type)); return JSObjectMake(context, Type_privateData::Class_, internal); } -static void *CYCastSymbol(const char *name) { - return dlsym(RTLD_DEFAULT, name); -} - static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { JSObjectRef global(CYGetGlobalObject(context)); JSObjectRef cycript(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("Cycript")))); - if (JSValueRef value = CYGetProperty(context, cycript, property)) - if (!JSValueIsUndefined(context, value)) - return value; + 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 (JSValueRef value = CYGetProperty(context, space, property)) + if (!JSValueIsUndefined(context, value)) + return value; CYPool pool; CYUTF8String name(CYPoolUTF8String(pool, context, property)); - if (hooks_ != NULL && hooks_->RuntimeProperty != NULL) - if (JSValueRef value = (*hooks_->RuntimeProperty)(context, name)) - return value; - size_t length(name.size); char keyed[length + 2]; memcpy(keyed + 1, name.data, length + 1); @@ -976,9 +1001,7 @@ static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSSt return JSEvaluateScript(CYGetJSContext(context), CYJSString(entry->value_), NULL, NULL, 0, NULL); case '1': - if (void (*symbol)() = reinterpret_cast<void (*)()>(CYCastSymbol(name.data))) - return CYMakeFunctor(context, symbol, entry->value_, &entry->cache_); - else return NULL; + return CYMakeFunctor(context, name.data, entry->value_, &entry->cache_); case '2': if (void *symbol = CYCastSymbol(name.data)) { @@ -997,11 +1020,25 @@ static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSSt } return NULL; -} CYCatch } +} CYCatch(NULL) } + +static void All_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) { + JSObjectRef global(CYGetGlobalObject(context)); + 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))) { + JSPropertyNameArrayRef subset(JSObjectCopyPropertyNames(context, space)); + for (size_t index(0), count(JSPropertyNameArrayGetCount(subset)); index != count; ++index) + JSPropertyNameAccumulatorAddName(names, JSPropertyNameArrayGetNameAtIndex(subset, index)); + JSPropertyNameArrayRelease(subset); + } +} 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 Functor constructor"); + throw CYJSError(context, "incorrect number of arguments to Pointer constructor"); CYPool pool; @@ -1012,7 +1049,7 @@ static JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t sig::Parse(pool, &signature, type, &Structor_); return CYMakePointer(context, value, _not(size_t), signature.elements[0].type, NULL, NULL); -} CYCatch } +} CYCatch(NULL) } static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 1) @@ -1020,38 +1057,73 @@ static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t cou CYPool pool; const char *type(CYPoolCString(pool, context, arguments[0])); return CYMakeType(context, type); -} CYCatch } +} CYCatch(NULL) } -static JSValueRef Type_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry { - Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object))); +static JSValueRef Type_callAsFunction_arrayOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 1) + throw CYJSError(context, "incorrect number of arguments to Type.arrayOf"); + Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this))); + + CYPool pool; + size_t index(CYGetIndex(pool, context, CYJSString(context, arguments[0]))); + if (index == _not(size_t)) + throw CYJSError(context, "invalid array size used with Type.arrayOf"); sig::Type type; + type.name = NULL; + type.flags = 0; - if (JSStringIsEqualToUTF8CString(property, "$cyi")) { - type.primitive = sig::pointer_P; - type.data.data.size = 0; - } else { - CYPool pool; - size_t index(CYGetIndex(pool, context, property)); - if (index == _not(size_t)) - return NULL; - type.primitive = sig::array_P; - type.data.data.size = index; - } + type.primitive = sig::array_P; + type.data.data.type = internal->type_; + type.data.data.size = index; + + return CYMakeType(context, &type); +} CYCatch(NULL) } + +static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 0) + throw CYJSError(context, "incorrect number of arguments to Type.constant"); + Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this))); + + sig::Type type(*internal->type_); + type.flags |= JOC_TYPE_CONST; + return CYMakeType(context, &type); +} CYCatch(NULL) } + +static JSValueRef Type_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 0) + throw CYJSError(context, "incorrect number of arguments to Type.pointerTo"); + Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this))); + sig::Type type; type.name = NULL; type.flags = 0; + type.primitive = sig::pointer_P; type.data.data.type = internal->type_; + type.data.data.size = 0; return CYMakeType(context, &type); -} CYCatch } +} CYCatch(NULL) } -static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { - Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object))); +static JSValueRef Type_callAsFunction_withName(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + if (count != 1) + throw CYJSError(context, "incorrect number of arguments to Type.withName"); + Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this))); + + CYPool pool; + const char *name(CYPoolCString(pool, context, arguments[0])); + sig::Type type(*internal->type_); + type.name = name; + return CYMakeType(context, &type); +} CYCatch(NULL) } + +static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 1) throw CYJSError(context, "incorrect number of arguments to type cast function"); + Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object))); + sig::Type *type(internal->type_); ffi_type *ffi(internal->GetFFI()); // XXX: alignment? @@ -1059,11 +1131,11 @@ static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object, CYPool pool; CYPoolFFI(pool, context, type, ffi, value, arguments[0]); return CYFromFFI(context, type, ffi, value); -} CYCatch } +} CYCatch(NULL) } static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 0) - throw CYJSError(context, "incorrect number of arguments to type cast function"); + throw CYJSError(context, "incorrect number of arguments to Type allocator"); Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object))); sig::Type *type(internal->type_); @@ -1078,7 +1150,7 @@ static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef obje void *value(malloc(internal->GetFFI()->size)); return CYMakePointer(context, value, length, type, NULL, NULL); -} CYCatch } +} CYCatch(NULL) } static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 2) @@ -1086,12 +1158,12 @@ static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t CYPool pool; const char *type(CYPoolCString(pool, context, arguments[1])); return CYMakeFunctor(context, arguments[0], type); -} CYCatch } +} 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<CYValue *>(JSObjectGetPrivate(_this))); return CYCastJSValue(context, reinterpret_cast<uintptr_t>(internal->value_)); -} CYCatch } +} CYCatch(NULL) } static JSValueRef CYValue_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { return CYValue_callAsFunction_valueOf(context, object, _this, count, arguments, exception); @@ -1102,12 +1174,12 @@ static JSValueRef CYValue_callAsFunction_toCYON(JSContextRef context, JSObjectRe char string[32]; sprintf(string, "%p", internal->value_); return CYCastJSValue(context, string); -} CYCatch } +} CYCatch(NULL) } static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(_this))); if (internal->length_ != _not(size_t)) { - JSObjectRef Array(CYGetCachedObject(context, Array_s)); + JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype"))); JSObjectRef toCYON(CYCastJSObject(context, CYGetProperty(context, Array, toCYON_s))); return CYCallAsFunction(context, toCYON, _this, count, arguments); } else { @@ -1115,28 +1187,39 @@ static JSValueRef Pointer_callAsFunction_toCYON(JSContextRef context, JSObjectRe sprintf(string, "%p", internal->value_); return CYCastJSValue(context, string); } -} CYCatch } +} CYCatch(NULL) } + +static JSValueRef Type_getProperty_alignment(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { + Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object))); + return CYCastJSValue(context, internal->GetFFI()->alignment); +} + +static JSValueRef Type_getProperty_name(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { + Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object))); + return CYCastJSValue(context, internal->type_->name); +} + +static JSValueRef Type_getProperty_size(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { + Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object))); + return CYCastJSValue(context, internal->GetFFI()->size); +} static JSValueRef Type_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this))); CYPool pool; const char *type(sig::Unparse(pool, internal->type_)); return CYCastJSValue(context, CYJSString(type)); -} CYCatch } +} CYCatch(NULL) } static JSValueRef Type_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(_this))); CYPool pool; const char *type(sig::Unparse(pool, internal->type_)); - size_t size(strlen(type)); - char *cyon(new(pool) char[12 + size + 1]); - memcpy(cyon, "new Type(\"", 10); - cyon[12 + size] = '\0'; - cyon[12 + size - 2] = '"'; - cyon[12 + size - 1] = ')'; - memcpy(cyon + 10, type, size); + std::ostringstream str; + CYStringify(str, type, strlen(type)); + char *cyon(apr_pstrcat(pool, "new Type(", str.str().c_str(), ")", NULL)); return CYCastJSValue(context, CYJSString(cyon)); -} CYCatch } +} CYCatch(NULL) } static JSValueRef Type_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { return Type_callAsFunction_toString(context, object, _this, count, arguments, exception); @@ -1165,7 +1248,18 @@ namespace cy { JSStaticFunction const * const Functor::StaticFunctions = Functor_staticFunctions; } -static JSStaticFunction Type_staticFunctions[4] = { +static JSStaticValue Type_staticValues[4] = { + {"alignment", &Type_getProperty_alignment, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"name", &Type_getProperty_name, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"size", &Type_getProperty_size, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {NULL, NULL, NULL, 0} +}; + +static JSStaticFunction Type_staticFunctions[8] = { + {"arrayOf", &Type_callAsFunction_arrayOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"constant", &Type_callAsFunction_constant, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"pointerTo", &Type_callAsFunction_pointerTo, 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}, @@ -1199,7 +1293,7 @@ JSObjectRef CYGetGlobalObject(JSContextRef context) { return JSContextGetGlobalObject(context); } -const char *CYExecute(apr_pool_t *pool, const char *code) { +const char *CYExecute(apr_pool_t *pool, CYUTF8String code) { JSContextRef context(CYGetJSContext()); JSValueRef exception(NULL), result; @@ -1217,10 +1311,8 @@ const char *CYExecute(apr_pool_t *pool, const char *code) { return error; } - if (exception != NULL) { error: - result = exception; - exception = NULL; - } + if (exception != NULL) error: + return CYPoolCString(pool, context, CYJSString(context, exception)); if (JSValueIsUndefined(context, result)) return NULL; @@ -1261,6 +1353,7 @@ void CYInitializeDynamic() { definition = kJSClassDefinitionEmpty; definition.className = "All"; definition.getProperty = &All_getProperty; + definition.getPropertyNames = &All_getPropertyNames; All_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; @@ -1294,14 +1387,15 @@ void CYInitializeDynamic() { definition = kJSClassDefinitionEmpty; definition.className = "Type"; + definition.staticValues = Type_staticValues; definition.staticFunctions = Type_staticFunctions; - definition.getProperty = &Type_getProperty; definition.callAsFunction = &Type_callAsFunction; definition.callAsConstructor = &Type_callAsConstructor; definition.finalize = &CYFinalize; Type_privateData::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; + definition.className = "Global"; //definition.getProperty = &Global_getProperty; Global_ = JSClassCreate(&definition); @@ -1317,6 +1411,7 @@ void CYInitializeDynamic() { toCYON_s = JSStringCreateWithUTF8CString("toCYON"); toJSON_s = JSStringCreateWithUTF8CString("toJSON"); toPointer_s = JSStringCreateWithUTF8CString("toPointer"); + toString_s = JSStringCreateWithUTF8CString("toString"); Result_ = JSStringCreateWithUTF8CString("_"); @@ -1373,6 +1468,8 @@ JSGlobalContextRef CYGetJSContext(JSContextRef context) { } extern "C" void CYSetupContext(JSGlobalContextRef context) { + JSValueRef exception(NULL); + CYInitializeDynamic(); JSObjectRef global(CYGetGlobalObject(context)); @@ -1404,9 +1501,13 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { JSObjectRef String(CYCastJSObject(context, CYGetProperty(context, global, CYJSString("String")))); CYSetProperty(context, cy, CYJSString("String"), String); + + JSObjectRef String_prototype(CYCastJSObject(context, CYGetProperty(context, String, prototype_s))); + CYSetProperty(context, cy, CYJSString("String_prototype"), String_prototype); /* }}} */ CYSetProperty(context, Array_prototype, toCYON_s, &Array_callAsFunction_toCYON, kJSPropertyAttributeDontEnum); + CYSetProperty(context, String_prototype, toCYON_s, &String_callAsFunction_toCYON, kJSPropertyAttributeDontEnum); JSObjectRef cycript(JSObjectMake(context, NULL, NULL)); CYSetProperty(context, global, CYJSString("Cycript"), cycript); @@ -1422,20 +1523,26 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { JSObjectRef all(JSObjectMake(context, All_, NULL)); CYSetProperty(context, cycript, CYJSString("all"), all); - JSObjectRef last(NULL), curr(global); + JSObjectRef alls(JSObjectCallAsConstructor(context, Array, 0, NULL, &exception)); + CYThrow(context, exception); + CYSetProperty(context, cycript, CYJSString("alls"), alls); - goto next; for (JSValueRef next;;) { - if (JSValueIsNull(context, next)) - break; - last = curr; - curr = CYCastJSObject(context, next); - next: - next = JSObjectGetPrototype(context, curr); - } + if (true) { + JSObjectRef last(NULL), curr(global); - JSObjectSetPrototype(context, last, all); + goto next; for (JSValueRef next;;) { + if (JSValueIsNull(context, next)) + break; + last = curr; + curr = CYCastJSObject(context, next); + next: + next = JSObjectGetPrototype(context, curr); + } + + JSObjectSetPrototype(context, last, all); + } - CYSetProperty(context, global, CYJSString("$cyq"), &$cyq); + CYSetProperty(context, global, CYJSString("$cyq"), &$cyq, kJSPropertyAttributeDontEnum); JSObjectRef System(JSObjectMake(context, NULL, NULL)); CYSetProperty(context, cy, CYJSString("System"), System); @@ -1445,8 +1552,13 @@ extern "C" void CYSetupContext(JSGlobalContextRef 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<void (*)()>(&dlerror)); + if (hooks_ != NULL && hooks_->SetupContext != NULL) (*hooks_->SetupContext)(context); + + CYArrayPush(context, alls, cycript); } JSGlobalContextRef CYGetJSContext() {