X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/56a66df3a7e954e0821180d4313b43c53e92180e..b639f46ddbb1709551093894de01802d818ca30f:/Execute.cpp
diff --git a/Execute.cpp b/Execute.cpp
index 6197bc9..2d77e21 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-2012 Jay Freeman (saurik)
*/
-/* Modified BSD License {{{ */
+/* GNU Lesser 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 Lesser 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 Lesser 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 Lesser General Public License
+ * along with Cycript. If not, see .
+**/
/* }}} */
#include "Internal.hpp"
@@ -166,6 +148,7 @@ JSStringRef splice_s;
JSStringRef toCYON_s;
JSStringRef toJSON_s;
JSStringRef toPointer_s;
+JSStringRef toString_s;
static JSStringRef Result_;
@@ -484,6 +467,17 @@ static JSValueRef Array_callAsFunction_toCYON(JSContextRef context, JSObjectRef
return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
} CYCatch }
+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 }
+
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);
@@ -701,6 +695,15 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function,
// 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_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 +716,7 @@ Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function,
_syscall(mprotect(closure, sizeof(*closure), PROT_READ | PROT_EXEC));
internal->value_ = closure;
+#endif
return internal;
}
@@ -950,17 +954,17 @@ static void *CYCastSymbol(const char *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);
@@ -999,6 +1003,20 @@ static JSValueRef All_getProperty(JSContextRef context, JSObjectRef object, JSSt
return NULL;
} CYCatch }
+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");
@@ -1199,7 +1217,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 +1235,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 +1277,7 @@ void CYInitializeDynamic() {
definition = kJSClassDefinitionEmpty;
definition.className = "All";
definition.getProperty = &All_getProperty;
+ definition.getPropertyNames = &All_getPropertyNames;
All_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
@@ -1318,6 +1335,7 @@ void CYInitializeDynamic() {
toCYON_s = JSStringCreateWithUTF8CString("toCYON");
toJSON_s = JSStringCreateWithUTF8CString("toJSON");
toPointer_s = JSStringCreateWithUTF8CString("toPointer");
+ toString_s = JSStringCreateWithUTF8CString("toString");
Result_ = JSStringCreateWithUTF8CString("_");
@@ -1374,6 +1392,8 @@ JSGlobalContextRef CYGetJSContext(JSContextRef context) {
}
extern "C" void CYSetupContext(JSGlobalContextRef context) {
+ JSValueRef exception(NULL);
+
CYInitializeDynamic();
JSObjectRef global(CYGetGlobalObject(context));
@@ -1405,9 +1425,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);
@@ -1423,6 +1447,10 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
JSObjectRef all(JSObjectMake(context, All_, NULL));
CYSetProperty(context, cycript, CYJSString("all"), all);
+ JSObjectRef alls(JSObjectCallAsConstructor(context, Array, 0, NULL, &exception));
+ CYThrow(context, exception);
+ CYSetProperty(context, cycript, CYJSString("alls"), alls);
+
if (true) {
JSObjectRef last(NULL), curr(global);
@@ -1450,6 +1478,8 @@ extern "C" void CYSetupContext(JSGlobalContextRef context) {
if (hooks_ != NULL && hooks_->SetupContext != NULL)
(*hooks_->SetupContext)(context);
+
+ CYArrayPush(context, alls, cycript);
}
JSGlobalContextRef CYGetJSContext() {