X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/077756a45fcee049b33e31dcb21575573768aef8..bf76f58056b53ca590b619a7488a1648e554fcb4:/Execute.cpp diff --git a/Execute.cpp b/Execute.cpp index f21d6da..be05f7b 100644 --- a/Execute.cpp +++ b/Execute.cpp @@ -496,15 +496,11 @@ JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, si return JSObjectMake(context, Pointer_, internal); } -static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const char *encoding) { - return JSObjectMake(context, Functor_, new cy::Functor(encoding, function)); -} - -static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), sig::Signature &signature) { +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 *type, void **cache) { +static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *encoding, void **cache) { cy::Functor *internal; if (*cache != NULL) internal = reinterpret_cast(*cache); @@ -513,7 +509,7 @@ static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const if (function == NULL) return NULL; - internal = new cy::Functor(type, function); + internal = new cy::Functor(encoding, function); *cache = internal; } @@ -719,12 +715,12 @@ static void FunctionClosure_(ffi_cif *cif, void *result, void **arguments, void CYExecuteClosure(cif, result, arguments, arg, &FunctionAdapter_); } -Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const char *type, void (*callback)(ffi_cif *, void *, void **, void *)) { +Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const sig::Signature &signature, 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)); + Closure_privateData *internal(new Closure_privateData(context, function, signature)); -#if defined(__APPLE__) && defined(__arm__) +#if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__)) void *executable; ffi_closure *writable(reinterpret_cast(ffi_closure_alloc(sizeof(ffi_closure), &executable))); @@ -750,8 +746,8 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, return internal; } -static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const char *type) { - Closure_privateData *internal(CYMakeFunctor_(context, function, type, &FunctionClosure_)); +static JSObjectRef CYMakeFunctor(JSContextRef context, JSObjectRef function, const sig::Signature &signature) { + Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &FunctionClosure_)); JSObjectRef object(JSObjectMake(context, Functor_, internal)); // XXX: see above notes about needing to leak JSValueProtect(CYGetJSContext(context), object); @@ -762,16 +758,16 @@ JSObjectRef CYGetCachedObject(JSContextRef context, JSStringRef name) { return CYCastJSObject(context, CYGetProperty(context, CYCastJSObject(context, CYGetProperty(context, CYGetGlobalObject(context), cy_s)), name)); } -static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const char *type) { +static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const sig::Signature &signature) { JSObjectRef Function(CYGetCachedObject(context, CYJSString("Function"))); bool function(_jsccall(JSValueIsInstanceOfConstructor, context, value, Function)); if (function) { JSObjectRef function(CYCastJSObject(context, value)); - return CYMakeFunctor(context, function, type); + return CYMakeFunctor(context, function, signature); } else { void (*function)()(CYCastPointer(context, value)); - return CYMakeFunctor(context, function, type); + return CYMakeFunctor(context, function, signature); } } @@ -1073,6 +1069,38 @@ static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t cou return CYMakeType(context, type); } 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 { + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); + + CYPool pool; + + sig::Type type; + type.name = NULL; + type.flags = 0; + + type.primitive = primitive; + type.data.signature.elements = new(pool) sig::Element[1 + count]; + type.data.signature.count = 1 + count; + + type.data.signature.elements[0].name = NULL; + type.data.signature.elements[0].type = internal->type_; + type.data.signature.elements[0].offset = _not(size_t); + + for (size_t i(0); i != count; ++i) { + sig::Element &element(type.data.signature.elements[i + 1]); + element.name = NULL; + element.offset = _not(size_t); + + JSObjectRef object(CYCastJSObject(context, arguments[i])); + _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_)); + Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); + + element.type = internal->type_; + } + + return CYMakeType(context, &type); +} CYCatch(NULL) } + static JSValueRef Type_callAsFunction_arrayOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 1) throw CYJSError(context, "incorrect number of arguments to Type.arrayOf"); @@ -1094,6 +1122,10 @@ static JSValueRef Type_callAsFunction_arrayOf(JSContextRef context, JSObjectRef return CYMakeType(context, &type); } CYCatch(NULL) } +static JSValueRef Type_callAsFunction_blockWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { + return Type_callAsFunction_$With(context, object, _this, count, arguments, sig::block_P, exception); +} + static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 0) throw CYJSError(context, "incorrect number of arguments to Type.constant"); @@ -1104,37 +1136,9 @@ static JSValueRef Type_callAsFunction_constant(JSContextRef context, JSObjectRef 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) { CYTry { - Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this))); - - CYPool pool; - - sig::Type type; - type.name = NULL; - type.flags = 0; - - type.primitive = sig::function_P; - type.data.signature.elements = new(pool) sig::Element[1 + count]; - type.data.signature.count = 1 + count; - - type.data.signature.elements[0].name = NULL; - type.data.signature.elements[0].type = internal->type_; - type.data.signature.elements[0].offset = _not(size_t); - - for (size_t i(0); i != count; ++i) { - sig::Element &element(type.data.signature.elements[i + 1]); - element.name = NULL; - element.offset = _not(size_t); - - JSObjectRef object(CYCastJSObject(context, arguments[i])); - _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_)); - Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); - - element.type = internal->type_; - } - - return CYMakeType(context, &type); -} CYCatch(NULL) } +static JSValueRef Type_callAsFunction_functionWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { + return Type_callAsFunction_$With(context, object, _this, count, arguments, sig::function_P, exception); +} static JSValueRef Type_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 0) @@ -1178,7 +1182,7 @@ static JSValueRef Type_callAsFunction(JSContextRef context, JSObjectRef object, Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); if (internal->type_->primitive == sig::function_P) - return CYMakeFunctor(context, reinterpret_cast(static_cast(CYCastDouble(context, arguments[0]))), internal->type_->data.signature); + return CYMakeFunctor(context, arguments[0], internal->type_->data.signature); sig::Type *type(internal->type_); ffi_type *ffi(internal->GetFFI()); @@ -1204,7 +1208,7 @@ static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef obje type = type->data.data.type; } - void *value(malloc(internal->GetFFI()->size)); + void *value(calloc(1, internal->GetFFI()->size)); return CYMakePointer(context, value, length, type, NULL, NULL); } CYCatch(NULL) } @@ -1212,8 +1216,10 @@ static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t if (count != 2) throw CYJSError(context, "incorrect number of arguments to Functor constructor"); CYPool pool; - const char *type(CYPoolCString(pool, context, arguments[1])); - return CYMakeFunctor(context, arguments[0], type); + const char *encoding(CYPoolCString(pool, context, arguments[1])); + sig::Signature signature; + sig::Parse(pool, &signature, encoding, &Structor_); + return CYMakeFunctor(context, arguments[0], signature); } CYCatch(NULL) } static JSValueRef CYValue_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1321,8 +1327,9 @@ static JSStaticValue Type_staticValues[4] = { {NULL, NULL, NULL, 0} }; -static JSStaticFunction Type_staticFunctions[9] = { +static JSStaticFunction Type_staticFunctions[10] = { {"arrayOf", &Type_callAsFunction_arrayOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, + {"blockWith", &Type_callAsFunction_blockWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"constant", &Type_callAsFunction_constant, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"functionWith", &Type_callAsFunction_functionWith, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, {"pointerTo", &Type_callAsFunction_pointerTo, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete}, @@ -1403,10 +1410,6 @@ const char *CYExecute(JSContextRef context, CYPool &pool, CYUTF8String code) { } } -extern "C" void CydgetSetupContext(JSGlobalContextRef context) { - CYSetupContext(context); -} - static bool initialized_ = false; void CYInitializeDynamic() { @@ -1583,14 +1586,61 @@ static void CYRunSetups(JSContextRef context) { CYUTF16String utf16(CYPoolUTF16String(pool, utf8)); munmap(const_cast(utf8.data), utf8.size); - if (CydgetMemoryParse(&utf16.data, &utf16.size)) - CYExecute(context, pool, CYPoolUTF8String(pool, utf16)); + // XXX: this should not be used + CydgetMemoryParse(&utf16.data, &utf16.size); + + CYExecute(context, pool, CYPoolUTF8String(pool, utf16)); free(const_cast(utf16.data)); } _syscall(closedir(setups)); } +static JSValueRef require(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + _assert(count == 1); + CYPool pool; + + Dl_info addr; + _assert(dladdr(reinterpret_cast(&require), &addr) != 0); + char *lib(pool.strdup(addr.dli_fname)); + + char *slash(strrchr(lib, '/')); + _assert(slash != NULL); + *slash = '\0'; + + CYJSString property("exports"); + JSObjectRef module; + + const char *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)); + + if (!JSValueIsUndefined(context, cache)) + module = CYCastJSObject(context, cache); + else { + CYUTF8String code; + code.data = reinterpret_cast(CYMapFile(path, &code.size)); + + std::stringstream wrap; + wrap << "(function (exports, require, module) { " << code << "\n});"; + code = CYPoolCode(pool, wrap.str().c_str()); + + JSValueRef value(_jsccall(JSEvaluateScript, context, CYJSString(code), NULL, NULL, 0)); + JSObjectRef function(CYCastJSObject(context, value)); + + module = JSObjectMake(context, NULL, NULL); + JSObjectRef exports(JSObjectMake(context, NULL, NULL)); + CYSetProperty(context, module, property, exports); + + JSValueRef arguments[3] = { exports, JSObjectMakeFunctionWithCallback(context, CYJSString("require"), &require), module }; + CYCallAsFunction(context, function, NULL, 3, arguments); + CYSetProperty(context, modules, key, module); + } + + return CYGetProperty(context, module, property); +} CYCatch(NULL) } + extern "C" void CYSetupContext(JSGlobalContextRef context) { CYInitializeDynamic(); @@ -1642,6 +1692,9 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { CYSetProperty(context, cycript, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer_, &Pointer_new)); CYSetProperty(context, cycript, CYJSString("Type"), JSObjectMakeConstructor(context, Type_privateData::Class_, &Type_new)); + JSObjectRef modules(JSObjectMake(context, NULL, NULL)); + CYSetProperty(context, cy, CYJSString("modules"), modules); + JSObjectRef all(JSObjectMake(context, All_, NULL)); CYSetProperty(context, cycript, CYJSString("all"), all); @@ -1668,6 +1721,8 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { JSObjectRef System(JSObjectMake(context, NULL, NULL)); CYSetProperty(context, cy, CYJSString("System"), System); + CYSetProperty(context, all, CYJSString("require"), &require, kJSPropertyAttributeDontEnum); + CYSetProperty(context, global, CYJSString("system"), System); CYSetProperty(context, System, CYJSString("args"), CYJSNull(context)); //CYSetProperty(context, System, CYJSString("global"), global);