X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/5b4dabb2071e2e09cd70a156beed03b12bec477a..554cd08dc5f6226ffd3eac34786b2c63bf17d9ad:/Execute.cpp diff --git a/Execute.cpp b/Execute.cpp index 310ddf6..ac2fac1 100644 --- a/Execute.cpp +++ b/Execute.cpp @@ -227,7 +227,7 @@ sig::Type *Structor_(CYPool &pool, sig::Aggregate *aggregate) { } struct Context : - CYPrivate + CYRoot { JSGlobalContextRef context_; @@ -238,14 +238,15 @@ struct Context : }; struct CArray : - CYValue + CYRoot { + void *value_; CYProtect owner_; Type_privateData *type_; size_t length_; CArray(void *value, size_t length, const sig::Type &type, ffi_type *ffi, JSContextRef context, JSObjectRef owner) : - CYValue(value), + value_(value), owner_(context, owner), type_(new(*pool_) Type_privateData(type, ffi)), length_(length) @@ -260,12 +261,13 @@ struct CArray : }; struct CString : - CYValue + CYRoot { + char *value_; CYProtect owner_; CString(char *value, JSContextRef context, JSObjectRef owner) : - CYValue(value), + value_(value), owner_(context, owner) { if (owner == NULL) @@ -274,20 +276,21 @@ struct CString : }; struct Pointer : - CYValue + CYRoot { + void *value_; CYProtect owner_; Type_privateData *type_; Pointer(void *value, const sig::Type &type, JSContextRef context, JSObjectRef owner) : - CYValue(value), + value_(value), owner_(context, owner), type_(new(*pool_) Type_privateData(type)) { } Pointer(void *value, const char *encoding, JSContextRef context, JSObjectRef owner) : - CYValue(value), + value_(value), owner_(context, owner), type_(new(*pool_) Type_privateData(encoding)) { @@ -295,13 +298,14 @@ struct Pointer : }; struct Struct_privateData : - CYValue + CYRoot { + void *value_; CYProtect owner_; Type_privateData *type_; Struct_privateData(void *value, const sig::Type &type, ffi_type *ffi, JSContextRef context, JSObjectRef owner) : - CYValue(value), + value_(value), owner_(context, owner), type_(new(*pool_) Type_privateData(type, ffi)) { @@ -426,6 +430,22 @@ static JSValueRef System_print(JSContextRef context, JSObjectRef object, JSObjec return CYJSUndefined(context); } CYCatch(NULL) } +static JSValueRef Global_print(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { + FILE *file(stdout); + CYPool pool; + + for (size_t i(0); i != count; ++i) { + if (i != 0) + fputc(' ', file); + CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, arguments[i]))); + fwrite(string.data, string.size, 1, file); + } + + fputc('\n', file); + fflush(file); + return CYJSUndefined(context); +} CYCatch(NULL) } + static void (*JSSynchronousGarbageCollectForDebugging$)(JSContextRef); _visible void CYGarbageCollect(JSContextRef context) { @@ -463,7 +483,7 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSValueRef value, st case kJSTypeString: { std::ostringstream str; CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, value))); - CYStringify(str, string.data, string.size); + CYStringify(str, string.data, string.size, CYStringifyModeCycript); std::string value(str.str()); return pool.strmemdup(value.c_str(), value.size()); } break; @@ -553,7 +573,7 @@ const char *CYPoolCCYON(CYPool &pool, JSContextRef context, JSObjectRef object, if (CYIsKey(string)) str << string.data; else - CYStringify(str, string.data, string.size); + CYStringify(str, string.data, string.size, CYStringifyModeLegacy); str << ':'; @@ -624,20 +644,23 @@ static JSValueRef String_callAsFunction_toCYON(JSContextRef context, JSObjectRef std::ostringstream str; CYUTF8String string(CYPoolUTF8String(pool, context, CYJSString(context, _this))); - CYStringify(str, string.data, string.size); + CYStringify(str, string.data, string.size, CYStringifyModeCycript); std::string value(str.str()); return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size()))); } CYCatch(NULL) } JSObjectRef CYMakePointer(JSContextRef context, void *pointer, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) { - return Pointer::Make(context, pointer, type, context, owner); + return CYPrivate::Make(context, pointer, type, context, owner); } -static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), bool variadic, const sig::Signature &signature) { +static JSValueRef CYMakeFunctor(JSContextRef context, void (*function)(), bool variadic, const sig::Signature &signature) { + if (function == NULL) + return CYJSNull(context); return JSObjectMake(context, Functor_, new cy::Functor(function, variadic, signature)); } +// XXX: remove this, as it is really stupid static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *encoding) { void (*function)()(reinterpret_cast(CYCastSymbol(symbol))); if (function == NULL) @@ -660,7 +683,7 @@ void *CYCastPointer_(JSContextRef context, JSValueRef value, bool *guess) { return NULL; case kJSTypeObject: { JSObjectRef object((JSObjectRef) value); - if (JSValueIsObjectOfClass(context, value, Pointer::Class_)) { + if (JSValueIsObjectOfClass(context, value, CYPrivate::Class_)) { Pointer *internal(reinterpret_cast(JSObjectGetPrivate(object))); return internal->value_; } @@ -855,7 +878,7 @@ JSValueRef Unknown::FromFFI(JSContextRef context, ffi_type *ffi, void *data, boo JSValueRef String::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { if (char *value = *reinterpret_cast(data)) - return CString::Make(context, value, context, owner); + return CYPrivate::Make(context, value, context, owner); return CYJSNull(context); } @@ -870,7 +893,7 @@ JSValueRef Pointer::FromFFI(JSContextRef context, ffi_type *ffi, void *data, boo } JSValueRef Array::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { - return CArray::Make(context, data, size, type, ffi->elements[0], context, owner); + return CYPrivate::Make(context, data, size, type, ffi->elements[0], context, owner); } JSValueRef Enum::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { @@ -880,7 +903,7 @@ JSValueRef Enum::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool i JSValueRef Aggregate::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { _assert(!overlap); _assert(signature.count != _not(size_t)); - return Struct_privateData::Make(context, data, *this, ffi, context, owner); + return CYPrivate::Make(context, data, *this, ffi, context, owner); } JSValueRef Function::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const { @@ -967,7 +990,7 @@ JSObjectRef CYGetCachedObject(JSContextRef context, JSStringRef name) { return CYCastJSObject(context, CYGetCachedValue(context, name)); } -static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, bool variadic, const sig::Signature &signature) { +static JSValueRef CYMakeFunctor(JSContextRef context, JSValueRef value, bool variadic, const sig::Signature &signature) { JSObjectRef Function(CYGetCachedObject(context, CYJSString("Function"))); bool function(_jsccall(JSValueIsInstanceOfConstructor, context, value, Function)); @@ -985,7 +1008,9 @@ static JSValueRef CString_getProperty(JSContextRef context, JSObjectRef object, CString *internal(reinterpret_cast(JSObjectGetPrivate(object))); ssize_t offset; - if (!CYGetOffset(pool, context, property, offset)) + if (JSStringIsEqualToUTF8CString(property, "$cyi")) + offset = 0; + else if (!CYGetOffset(pool, context, property, offset)) return NULL; return CYCastJSValue(context, CYJSString(CYUTF8String(&internal->value_[offset], 1))); @@ -996,7 +1021,9 @@ static bool CString_setProperty(JSContextRef context, JSObjectRef object, JSStri CString *internal(reinterpret_cast(JSObjectGetPrivate(object))); ssize_t offset; - if (!CYGetOffset(pool, context, property, offset)) + if (JSStringIsEqualToUTF8CString(property, "$cyi")) + offset = 0; + else if (!CYGetOffset(pool, context, property, offset)) return false; const char *data(CYPoolCString(pool, context, value)); @@ -1195,7 +1222,7 @@ static sig::Type *CYGetType(CYPool &pool, JSContextRef context, JSValueRef value return &PointerToVoid_; JSObjectRef object(CYCastJSObject(context, value)); JSObjectRef type(CYCastJSObject(context, CYGetProperty(context, object, cyt_s))); - _assert(JSValueIsObjectOfClass(context, type, Type_privateData::Class_)); + _assert(JSValueIsObjectOfClass(context, type, CYPrivate::Class_)); Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(type))); return internal->type_; } @@ -1272,7 +1299,7 @@ static JSValueRef Pointer_callAsFunction(JSContextRef context, JSObjectRef objec } CYCatch(NULL) } JSObjectRef CYMakeType(JSContextRef context, const sig::Type &type) { - return Type_privateData::Make(context, type); + return CYPrivate::Make(context, type); } extern "C" bool CYBridgeHash(CYPool &pool, CYUTF8String name, const char *&code, unsigned &flags) { @@ -1389,7 +1416,7 @@ static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSSt } 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); + _assert(count == 1 || count == 2); CYPool pool; CYUTF8String prefix(CYPoolUTF8String(pool, context, CYJSString(context, arguments[0]))); @@ -1502,7 +1529,7 @@ static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t cou element.name = CYPoolCString(pool, context, name); JSObjectRef object(CYCastJSObject(context, CYArrayGet(context, types, i))); - _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_)); + _assert(JSValueIsObjectOfClass(context, object, CYPrivate::Class_)); Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); element.type = internal->type_; _assert(element.type != NULL); @@ -1532,7 +1559,7 @@ static JSValueRef Type_callAsFunction_$With(JSContextRef context, JSObjectRef ob element.offset = _not(size_t); JSObjectRef object(CYCastJSObject(context, arguments[i])); - _assert(JSValueIsObjectOfClass(context, object, Type_privateData::Class_)); + _assert(JSValueIsObjectOfClass(context, object, CYPrivate::Class_)); Type_privateData *internal(reinterpret_cast(JSObjectGetPrivate(object))); element.type = internal->type_; @@ -1678,6 +1705,7 @@ static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef obje return pointer; } CYCatch(NULL) } +// XXX: I don't even think the user should be allowed to do this static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { if (count != 2) throw CYJSError(context, "incorrect number of arguments to Functor constructor"); @@ -1685,7 +1713,8 @@ static JSObjectRef Functor_new(JSContextRef context, JSObjectRef object, size_t const char *encoding(CYPoolCString(pool, context, arguments[1])); sig::Signature signature; sig::Parse(pool, &signature, encoding, &Structor_); - return CYMakeFunctor(context, arguments[0], false, signature); + // XXX: this can try to return null, and I guess then it just fails + return CYCastJSObject(context, CYMakeFunctor(context, arguments[0], false, signature)); } CYCatch(NULL) } static JSValueRef CArray_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1732,29 +1761,28 @@ static JSValueRef Functor_callAsFunction_valueOf(JSContextRef context, JSObjectR static JSValueRef Functor_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { cy::Functor *internal(reinterpret_cast(JSObjectGetPrivate(_this))); uint8_t *value(reinterpret_cast(internal->value_)); + _assert(value != NULL); CYLocalPool pool; sig::Function function(internal->variadic_); sig::Copy(pool, function.signature, internal->signature_); - CYString *name; + CYPropertyName *name; auto typed(CYDecodeType(pool, &function)); { std::ostringstream str; Dl_info info; - if (internal->value_ == NULL) - str << "NULL"; - else if (dladdr(value, &info) == 0) - str << internal->value_; - else { + if (dladdr(value, &info) == 0) { + str << (void *) value; + name = new(pool) CYNumber(reinterpret_cast(value)); + } else { str << info.dli_sname; off_t offset(value - reinterpret_cast(info.dli_saddr)); if (offset != 0) str << "+0x" << std::hex << offset; + name = new(pool) CYString(pool.strdup(str.str().c_str())); } - - name = new(pool) CYString(pool.strdup(str.str().c_str())); } std::ostringstream str; @@ -1823,7 +1851,7 @@ static JSValueRef CString_callAsFunction_toCYON(JSContextRef context, JSObjectRe str << "NULL"; else { str << "&"; - CYStringify(str, string, strlen(string), true); + CYStringify(str, string, strlen(string), CYStringifyModeNative); } std::string value(str.str()); return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size()))); @@ -1967,15 +1995,24 @@ static JSStaticFunction Type_staticFunctions[10] = { {NULL, NULL, 0} }; -_visible void CYSetArgs(int argc, const char *argv[]) { +_visible void CYSetArgs(const char *argv0, const char *script, int argc, const char *argv[]) { JSContextRef context(CYGetJSContext()); - JSValueRef args[argc]; + JSValueRef args[argc + 2]; for (int i(0); i != argc; ++i) - args[i] = CYCastJSValue(context, argv[i]); + args[i + 2] = CYCastJSValue(context, argv[i]); + + size_t offset; + if (script == NULL) + offset = 1; + else { + offset = 0; + args[1] = CYCastJSValue(context, CYJSString(script)); + } + + args[offset] = CYCastJSValue(context, CYJSString(argv0)); - JSObjectRef array(CYObjectMakeArray(context, argc, args)); - JSObjectRef System(CYGetCachedObject(context, CYJSString("System"))); - CYSetProperty(context, System, CYJSString("args"), array); + CYSetProperty(context, CYGetCachedObject(context, CYJSString("System")), CYJSString("args"), CYObjectMakeArray(context, argc, args + 2)); + CYSetProperty(context, CYGetCachedObject(context, CYJSString("process")), CYJSString("argv"), CYObjectMakeArray(context, argc + 2 - offset, args + offset)); } JSObjectRef CYGetGlobalObject(JSContextRef context) { @@ -2078,7 +2115,7 @@ void CYInitializeDynamic() { definition = kJSClassDefinitionEmpty; definition.className = "Context"; definition.finalize = &CYFinalize; - Context::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "CArray"; @@ -2087,7 +2124,7 @@ void CYInitializeDynamic() { definition.getProperty = &CArray_getProperty; definition.setProperty = &CArray_setProperty; definition.finalize = &CYFinalize; - CArray::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "CString"; @@ -2096,7 +2133,7 @@ void CYInitializeDynamic() { definition.getProperty = &CString_getProperty; definition.setProperty = &CString_setProperty; definition.finalize = &CYFinalize; - CString::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "Functor"; @@ -2114,7 +2151,7 @@ void CYInitializeDynamic() { definition.getProperty = &Pointer_getProperty; definition.setProperty = &Pointer_setProperty; definition.finalize = &CYFinalize; - Pointer::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "Struct"; @@ -2124,7 +2161,7 @@ void CYInitializeDynamic() { definition.setProperty = &Struct_setProperty; definition.getPropertyNames = &Struct_getPropertyNames; definition.finalize = &CYFinalize; - Struct_privateData::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "Type"; @@ -2133,7 +2170,7 @@ void CYInitializeDynamic() { definition.callAsFunction = &Type_callAsFunction; definition.callAsConstructor = &Type_callAsConstructor; definition.finalize = &CYFinalize; - Type_privateData::Class_ = JSClassCreate(&definition); + CYPrivate::Class_ = JSClassCreate(&definition); definition = kJSClassDefinitionEmpty; definition.className = "Global"; @@ -2359,7 +2396,7 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { JSObjectRef global(CYGetGlobalObject(context)); - JSObjectRef cy(Context::Make(context, context)); + JSObjectRef cy(CYPrivate::Make(context, context)); CYSetProperty(context, global, cy_s, cy, kJSPropertyAttributeDontEnum); /* Cache Globals {{{ */ @@ -2417,11 +2454,11 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { CYSetProperty(context, cycript, CYJSString("compile"), &Cycript_compile_callAsFunction); CYSetProperty(context, cycript, CYJSString("gc"), &Cycript_gc_callAsFunction); - JSObjectRef CArray(JSObjectMakeConstructor(context, CArray::Class_, &CArray_new)); + JSObjectRef CArray(JSObjectMakeConstructor(context, CYPrivate<::CArray>::Class_, &CArray_new)); CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CArray, prototype_s)), Array_prototype); CYSetProperty(context, cycript, CYJSString("CArray"), CArray); - JSObjectRef CString(JSObjectMakeConstructor(context, CString::Class_, &CString_new)); + JSObjectRef CString(JSObjectMakeConstructor(context, CYPrivate<::CString>::Class_, &CString_new)); CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CString, prototype_s)), String_prototype); CYSetProperty(context, cycript, CYJSString("CString"), CString); @@ -2429,8 +2466,8 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { 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::Class_, &Pointer_new)); - CYSetProperty(context, cycript, CYJSString("Type"), JSObjectMakeConstructor(context, Type_privateData::Class_, &Type_new)); + CYSetProperty(context, cycript, CYJSString("Pointer"), JSObjectMakeConstructor(context, CYPrivate::Class_, &Pointer_new)); + CYSetProperty(context, cycript, CYJSString("Type"), JSObjectMakeConstructor(context, CYPrivate::Class_, &Type_new)); JSObjectRef modules(JSObjectMake(context, NULL, NULL)); CYSetProperty(context, cy, CYJSString("modules"), modules); @@ -2460,17 +2497,6 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { CYSetPrototype(context, last, cache); } - JSObjectRef System(JSObjectMake(context, NULL, NULL)); - CYSetProperty(context, cy, CYJSString("System"), System); - - 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("print"), &System_print); - - CYSetProperty(context, global, CYJSString("global"), global); - #ifdef __APPLE__ if (&JSWeakObjectMapCreate != NULL) { JSWeakObjectMapRef weak(JSWeakObjectMapCreate(context, NULL, &CYDestroyWeak)); @@ -2509,6 +2535,23 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) { CYSetProperty(context, cache, CYJSString("float"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); CYSetProperty(context, cache, CYJSString("double"), CYMakeType(context, sig::Primitive()), kJSPropertyAttributeDontEnum); + CYSetProperty(context, global, CYJSString("require"), &require_callAsFunction, kJSPropertyAttributeDontEnum); + + JSObjectRef System(JSObjectMake(context, NULL, NULL)); + CYSetProperty(context, all, CYJSString("system"), System); + System = CYCastJSObject(context, CYGetProperty(context, global, CYJSString("system"))); + CYSetProperty(context, cy, CYJSString("System"), System); + + JSObjectRef process(JSObjectMake(context, NULL, NULL)); + CYSetProperty(context, global, CYJSString("process"), process); + CYSetProperty(context, cy, CYJSString("process"), process); + + CYSetProperty(context, System, CYJSString("args"), CYJSNull(context)); + CYSetProperty(context, System, CYJSString("print"), &System_print); + + CYSetProperty(context, global, CYJSString("global"), global); + CYSetProperty(context, global, CYJSString("print"), &Global_print); + for (CYHook *hook : GetHooks()) if (hook->SetupContext != NULL) (*hook->SetupContext)(context);