X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/14ec9e00ac4903521e92002604eb56ed7cde036d..309b053540b80defe4313836161c68ea9112d56d:/Execute.cpp?ds=sidebyside diff --git a/Execute.cpp b/Execute.cpp index 1382769..806fd39 100644 --- a/Execute.cpp +++ b/Execute.cpp @@ -37,8 +37,6 @@ */ /* }}} */ -#include - #include "Internal.hpp" #include @@ -50,6 +48,7 @@ #include "sig/ffi_type.hpp" #include "Pooling.hpp" +#include "Execute.hpp" #include @@ -68,12 +67,6 @@ #include "JavaScript.hpp" #include "String.hpp" -char *sqlite3_column_pooled(apr_pool_t *pool, sqlite3_stmt *stmt, int n) { - if (const unsigned char *value = sqlite3_column_text(stmt, n)) - return apr_pstrdup(pool, (const char *) value); - else return NULL; -} - struct CYHooks *hooks_; /* JavaScript Properties {{{ */ @@ -175,10 +168,10 @@ JSStringRef toJSON_s; static JSStringRef Result_; -sqlite3 *Bridge_; - void CYFinalize(JSObjectRef object) { - delete reinterpret_cast(JSObjectGetPrivate(object)); + CYData *internal(reinterpret_cast(JSObjectGetPrivate(object))); + if (--internal->count_ == 0) + delete internal; } void Structor_(apr_pool_t *pool, sig::Type *&type) { @@ -186,6 +179,7 @@ void Structor_(apr_pool_t *pool, sig::Type *&type) { 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 ) { type->primitive = sig::typename_P; @@ -196,49 +190,27 @@ void Structor_(apr_pool_t *pool, sig::Type *&type) { if (type->primitive != sig::struct_P || type->name == NULL) return; - sqlite3_stmt *statement; - - _sqlcall(sqlite3_prepare(Bridge_, - "select " - "\"bridge\".\"mode\", " - "\"bridge\".\"value\" " - "from \"bridge\" " - "where" - " \"bridge\".\"mode\" in (3, 4) and" - " \"bridge\".\"name\" = ?" - " limit 1" - , -1, &statement, NULL)); - - _sqlcall(sqlite3_bind_text(statement, 1, type->name, -1, SQLITE_STATIC)); - - int mode; - const char *value; - - if (_sqlcall(sqlite3_step(statement)) == SQLITE_DONE) { - mode = -1; - value = NULL; - } else { - mode = sqlite3_column_int(statement, 0); - value = sqlite3_column_pooled(pool, statement, 1); - } - - _sqlcall(sqlite3_finalize(statement)); - - switch (mode) { - default: - _assert(false); - case -1: - break; - - case 3: { - sig::Parse(pool, &type->data.signature, value, &Structor_); - } break; - - case 4: { - sig::Signature signature; - sig::Parse(pool, &signature, value, &Structor_); - type = signature.elements[0].type; - } break; + 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; + } } } @@ -516,8 +488,21 @@ JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, si return JSObjectMake(context, Pointer_, internal); } -static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const char *type) { - cy::Functor *internal(new cy::Functor(type, function)); +static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const char *type, void **cache = NULL) { + cy::Functor *internal; + + if (cache != NULL && *cache != NULL) { + internal = reinterpret_cast(*cache); + ++internal->count_; + } else { + internal = new cy::Functor(type, function); + + if (cache != NULL) { + *cache = internal; + ++internal->count_; + } + } + return JSObjectMake(context, Functor_, internal); } @@ -968,61 +953,42 @@ static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSSt if (JSValueRef value = (*hooks_->RuntimeProperty)(context, name)) return value; - sqlite3_stmt *statement; - - _sqlcall(sqlite3_prepare(Bridge_, - "select " - "\"bridge\".\"mode\", " - "\"bridge\".\"value\" " - "from \"bridge\" " - "where" - " \"bridge\".\"name\" = ?" - " limit 1" - , -1, &statement, NULL)); - - _sqlcall(sqlite3_bind_text(statement, 1, name.data, name.size, SQLITE_STATIC)); - - int mode; - const char *value; - - if (_sqlcall(sqlite3_step(statement)) == SQLITE_DONE) { - mode = -1; - value = NULL; - } else { - mode = sqlite3_column_int(statement, 0); - value = sqlite3_column_pooled(pool, statement, 1); + 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': + if (void (*symbol)() = reinterpret_cast(CYCastSymbol(name.data))) + return CYMakeFunctor(context, symbol, entry->value_, &entry->cache_); + else return NULL; + + 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_); + } } - _sqlcall(sqlite3_finalize(statement)); - - switch (mode) { - default: - CYThrow("invalid mode from bridge table: %d", mode); - case -1: - return NULL; - - case 0: - return JSEvaluateScript(CYGetJSContext(context), CYJSString(value), NULL, NULL, 0, NULL); - - case 1: - if (void (*symbol)() = reinterpret_cast(CYCastSymbol(name.data))) - return CYMakeFunctor(context, symbol, value); - else return NULL; - - case 2: - if (void *symbol = CYCastSymbol(name.data)) { - // XXX: this is horrendously inefficient - sig::Signature signature; - sig::Parse(pool, &signature, 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, value); - } + return NULL; } CYCatch } static JSObjectRef Pointer_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry { @@ -1280,8 +1246,6 @@ void CYInitializeDynamic() { CYInitializeStatic(); - _sqlcall(sqlite3_open("/usr/lib/libcycript.db", &Bridge_)); - JSObjectMakeArray$ = reinterpret_cast(dlsym(RTLD_DEFAULT, "JSObjectMakeArray")); JSClassDefinition definition;