X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/3f9ae37cb15f239389eeba110b3a7da0280a8381..0cfdb323b24a4f14f7eef842675dc5ae1dc09201:/ObjectiveC/Library.mm?ds=sidebyside
diff --git a/ObjectiveC/Library.mm b/ObjectiveC/Library.mm
index 77511f8..5873277 100644
--- a/ObjectiveC/Library.mm
+++ b/ObjectiveC/Library.mm
@@ -1,28 +1,24 @@
/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2012 Jay Freeman (saurik)
+ * Copyright (C) 2009-2013 Jay Freeman (saurik)
*/
-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */
/*
- * 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.
+ * 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.
*
- * 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.
+ * 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.
*
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
* along with Cycript. If not, see .
**/
/* }}} */
-#ifdef __APPLE__
-#include "Struct.hpp"
-#endif
-
#include
#include "ObjectiveC/Internal.hpp"
@@ -1300,7 +1296,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
- (id) objectAtIndex:(NSUInteger)index { CYObjectiveTry {
size_t bounds([self count]);
if (index >= bounds)
- @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray objectAtIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];
+ @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray objectAtIndex:]: index (%zu) beyond bounds (%zu)", static_cast(index), bounds] userInfo:nil];
JSValueRef exception(NULL);
JSValueRef value(JSObjectGetPropertyAtIndex(context_, object_, index, &exception));
CYThrow(context_, exception);
@@ -1314,7 +1310,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
- (void) insertObject:(id)object atIndex:(NSUInteger)index { CYObjectiveTry {
size_t bounds([self count] + 1);
if (index >= bounds)
- @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray insertObject:atIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];
+ @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray insertObject:atIndex:]: index (%zu) beyond bounds (%zu)", static_cast(index), bounds] userInfo:nil];
JSValueRef exception(NULL);
JSValueRef arguments[3];
arguments[0] = CYCastJSValue(context_, index);
@@ -1335,7 +1331,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
- (void) removeObjectAtIndex:(NSUInteger)index { CYObjectiveTry {
size_t bounds([self count]);
if (index >= bounds)
- @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray removeObjectAtIndex:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];
+ @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray removeObjectAtIndex:]: index (%zu) beyond bounds (%zu)", static_cast(index), bounds] userInfo:nil];
JSValueRef exception(NULL);
JSValueRef arguments[2];
arguments[0] = CYCastJSValue(context_, index);
@@ -1348,7 +1344,7 @@ JSValueRef CYCastJSValue(JSContextRef context, NSObject *value) { CYPoolTry {
- (void) replaceObjectAtIndex:(NSUInteger)index withObject:(id)object { CYObjectiveTry {
size_t bounds([self count]);
if (index >= bounds)
- @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray replaceObjectAtIndex:withObject:]: index (%zu) beyond bounds (%zu)", index, bounds] userInfo:nil];
+ @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"*** -[CYJSArray replaceObjectAtIndex:withObject:]: index (%zu) beyond bounds (%zu)", static_cast(index), bounds] userInfo:nil];
CYSetProperty(context_, object_, index, CYCastJSValue(context_, (NSObject *) object));
} CYObjectiveCatch }
@@ -1758,7 +1754,7 @@ static JSValueRef Instance_getProperty(JSContextRef context, JSObjectRef object,
return CYSendMessage(pool, context, self, NULL, sel, 0, NULL, false, exception);
return NULL;
-} CYCatch }
+} CYCatch(NULL) }
static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast(JSObjectGetPrivate(object)));
@@ -1772,7 +1768,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
CYPoolTry {
if ([self cy$setProperty:name to:data])
return true;
- } CYPoolCatch(NULL)
+ } CYPoolCatch(false)
const char *string(CYPoolCString(pool, context, name));
Class _class(object_getClass(self));
@@ -1818,7 +1814,7 @@ static bool Instance_setProperty(JSContextRef context, JSObjectRef object, JSStr
}
return false;
-} CYCatch }
+} CYCatch(false) }
static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast(JSObjectGetPrivate(object)));
@@ -1827,8 +1823,8 @@ static bool Instance_deleteProperty(JSContextRef context, JSObjectRef object, JS
CYPoolTry {
NSString *name(CYCastNSString(NULL, context, property));
return [self cy$deleteProperty:name];
- } CYPoolCatch(NULL)
-} CYCatch return /*XXX*/ NULL; }
+ } CYPoolCatch(false)
+} CYCatch(false) return /*XXX*/ false; }
static void Instance_getPropertyNames_message(JSPropertyNameAccumulatorRef names, objc_method *method) {
const char *name(sel_getName(method_getName(method)));
@@ -1885,7 +1881,7 @@ static JSObjectRef Instance_callAsConstructor(JSContextRef context, JSObjectRef
Instance *internal(reinterpret_cast(JSObjectGetPrivate(object)));
JSObjectRef value(Instance::Make(context, [internal->GetValue() alloc], Instance::Uninitialized));
return value;
-} CYCatch }
+} CYCatch(NULL) }
static JSValueRef Instance_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast(JSObjectGetPrivate(object)));
@@ -1933,7 +1929,7 @@ static JSValueRef Instance_callAsFunction(JSContextRef context, JSObjectRef obje
} CYPoolCatch(NULL);
return NULL;
-} CYCatch }
+} CYCatch(NULL) }
static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor, JSValueRef instance, JSValueRef *exception) { CYTry {
Instance *internal(reinterpret_cast(JSObjectGetPrivate((JSObjectRef) constructor)));
@@ -1948,7 +1944,7 @@ static bool Instance_hasInstance(JSContextRef context, JSObjectRef constructor,
}
return false;
-} CYCatch }
+} CYCatch(false) }
static JSValueRef Instance_box_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (count == 0)
@@ -1958,7 +1954,7 @@ static JSValueRef Instance_box_callAsFunction(JSContextRef context, JSObjectRef
if (value == nil)
value = [NSNull null];
return CYCastJSValue(context, [value cy$box]);
-} CYCatch }
+} CYCatch(NULL) }
static bool Internal_hasProperty(JSContextRef context, JSObjectRef object, JSStringRef property) {
Internal *internal(reinterpret_cast(JSObjectGetPrivate(object)));
@@ -1987,7 +1983,7 @@ static JSValueRef Internal_getProperty(JSContextRef context, JSObjectRef object,
}
return NULL;
-} CYCatch }
+} CYCatch(NULL) }
static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
Internal *internal(reinterpret_cast(JSObjectGetPrivate(object)));
@@ -2003,7 +1999,7 @@ static bool Internal_setProperty(JSContextRef context, JSObjectRef object, JSStr
}
return false;
-} CYCatch }
+} CYCatch(false) }
static void Internal_getPropertyNames_(Class _class, JSPropertyNameAccumulatorRef names) {
if (Class super = class_getSuperclass(_class))
@@ -2043,7 +2039,7 @@ static JSValueRef ObjectiveC_Classes_getProperty(JSContextRef context, JSObjectR
if (Class _class = NSClassFromString(name))
return CYMakeInstance(context, _class, true);
return NULL;
-} CYCatch }
+} CYCatch(NULL) }
static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
#ifdef __APPLE__
@@ -2093,7 +2089,7 @@ static JSValueRef ObjectiveC_Image_Classes_getProperty(JSContextRef context, JSO
free:
free(data);
return value;
-} CYCatch }
+} CYCatch(NULL) }
static void ObjectiveC_Image_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
const char *internal(reinterpret_cast(JSObjectGetPrivate(object)));
@@ -2122,7 +2118,7 @@ static JSValueRef ObjectiveC_Images_getProperty(JSContextRef context, JSObjectRe
JSObjectRef value(JSObjectMake(context, NULL, NULL));
CYSetProperty(context, value, CYJSString("classes"), JSObjectMake(context, ObjectiveC_Image_Classes_, const_cast(name)));
return value;
-} CYCatch }
+} CYCatch(NULL) }
static void ObjectiveC_Images_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
unsigned int size;
@@ -2139,7 +2135,7 @@ static JSValueRef ObjectiveC_Protocols_getProperty(JSContextRef context, JSObjec
if (Protocol *protocol = objc_getProtocol(name))
return CYMakeInstance(context, protocol, true);
return NULL;
-} CYCatch }
+} CYCatch(NULL) }
static void ObjectiveC_Protocols_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
#if OBJC_API_VERSION >= 2
@@ -2159,13 +2155,25 @@ static JSValueRef ObjectiveC_Constants_getProperty(JSContextRef context, JSObjec
if (name == "nil")
return Instance::Make(context, nil);
return NULL;
-} CYCatch }
+} CYCatch(NULL) }
static void ObjectiveC_Constants_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
JSPropertyNameAccumulatorAddName(names, CYJSString("nil"));
}
#ifdef __APPLE__
+#if defined(__i386__) || defined(__x86_64__)
+#define OBJC_MAX_STRUCT_BY_VALUE 8
+static int struct_forward_array[] = {
+ 0, 0, 0, 1, 0, 1, 1, 1, 0 };
+#elif defined(__arm__)
+#define OBJC_MAX_STRUCT_BY_VALUE 1
+static int struct_forward_array[] = {
+ 0, 0 };
+#else
+#error missing objc-runtime-info
+#endif
+
static bool stret(ffi_type *ffi_type) {
return ffi_type->type == FFI_TYPE_STRUCT && (
ffi_type->size > OBJC_MAX_STRUCT_BY_VALUE ||
@@ -2240,7 +2248,7 @@ JSValueRef CYSendMessage(apr_pool_t *pool, JSContextRef context, id self, Class
void (*function)() = reinterpret_cast(imp);
return CYCallFunction(pool, context, 2, setup, count, arguments, initialize, exception, &signature, &cif, function);
-} CYCatch }
+} CYCatch(NULL) }
static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (count < 2)
@@ -2278,7 +2286,7 @@ static JSValueRef $objc_msgSend(JSContextRef context, JSObjectRef object, JSObje
_cmd = CYCastSEL(context, arguments[1]);
return CYSendMessage(pool, context, self, _class, _cmd, count - 2, arguments + 2, uninitialized, exception);
-} CYCatch }
+} CYCatch(NULL) }
static JSValueRef Selector_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
JSValueRef setup[count + 2];
@@ -2309,7 +2317,7 @@ static JSObjectRef Super_new(JSContextRef context, JSObjectRef object, size_t co
id self(CYCastNSObject(pool, context, arguments[0]));
Class _class(CYCastClass(pool, context, arguments[1]));
return cy::Super::Make(context, self, _class);
-} CYCatch }
+} CYCatch(NULL) }
static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (count != 1)
@@ -2317,14 +2325,14 @@ static JSObjectRef Selector_new(JSContextRef context, JSObjectRef object, size_t
CYPool pool;
const char *name(CYPoolCString(pool, context, arguments[0]));
return CYMakeSelector(context, sel_registerName(name));
-} CYCatch }
+} CYCatch(NULL) }
static JSObjectRef Instance_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (count > 1)
throw CYJSError(context, "incorrect number of arguments to Instance constructor");
id self(count == 0 ? nil : CYCastPointer(context, arguments[0]));
return CYMakeInstance(context, self, false);
-} CYCatch }
+} CYCatch(NULL) }
static JSValueRef CYValue_getProperty_value(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
CYValue *internal(reinterpret_cast(JSObjectGetPrivate(object)));
@@ -2360,7 +2368,7 @@ static JSValueRef Instance_getProperty_prototype(JSContextRef context, JSObjectR
if (!CYIsClass(self))
return CYJSUndefined(context);
return CYGetClassPrototype(context, self);
-} CYCatch }
+} CYCatch(NULL) }
static JSValueRef Instance_getProperty_messages(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) {
Instance *internal(reinterpret_cast(JSObjectGetPrivate(object)));
@@ -2376,7 +2384,7 @@ static JSValueRef Instance_callAsFunction_toCYON(JSContextRef context, JSObjectR
Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this)));
return CYCastJSValue(context, CYJSString(context, CYCastNSCYON(internal->GetValue(), false)));
-} CYCatch }
+} CYCatch(NULL) }
static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (!CYJSValueIsNSObject(context, _this))
@@ -2399,7 +2407,7 @@ static JSValueRef Instance_callAsFunction_toJSON(JSContextRef context, JSObjectR
else
return CYCastJSValue(context, CYJSString(context, [value description]));
} CYPoolCatch(NULL)
-} CYCatch return /*XXX*/ NULL; }
+} CYCatch(NULL) return /*XXX*/ NULL; }
static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (!CYJSValueIsNSObject(context, _this))
@@ -2415,7 +2423,7 @@ static JSValueRef Instance_callAsFunction_valueOf(JSContextRef context, JSObject
return result;
return _this;
-} CYCatch return /*XXX*/ NULL; }
+} CYCatch(NULL) return /*XXX*/ NULL; }
static JSValueRef Instance_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (!CYJSValueIsNSObject(context, _this))
@@ -2424,7 +2432,7 @@ static JSValueRef Instance_callAsFunction_toPointer(JSContextRef context, JSObje
Instance *internal(reinterpret_cast(JSObjectGetPrivate(_this)));
// XXX: but... but... THIS ISN'T A POINTER! :(
return CYCastJSValue(context, reinterpret_cast(internal->GetValue()));
-} CYCatch return /*XXX*/ NULL; }
+} CYCatch(NULL) return /*XXX*/ NULL; }
static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (!CYJSValueIsNSObject(context, _this))
@@ -2437,7 +2445,7 @@ static JSValueRef Instance_callAsFunction_toString(JSContextRef context, JSObjec
// XXX: this seems like a stupid implementation; what if it crashes? why not use the CYONifier backend?
return CYCastJSValue(context, CYJSString(context, [value description]));
} CYPoolCatch(NULL)
-} CYCatch return /*XXX*/ NULL; }
+} CYCatch(NULL) return /*XXX*/ NULL; }
static JSValueRef Class_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (!CYJSValueIsNSObject(context, _this))
@@ -2459,12 +2467,12 @@ static JSValueRef Class_callAsFunction_pointerTo(JSContextRef context, JSObjectR
CYPoolTry {
return CYMakeType(context, type.str().c_str());
} CYPoolCatch(NULL)
-} CYCatch return /*XXX*/ NULL; }
+} CYCatch(NULL) return /*XXX*/ NULL; }
static JSValueRef Selector_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Selector_privateData *internal(reinterpret_cast(JSObjectGetPrivate(_this)));
return CYCastJSValue(context, sel_getName(internal->GetValue()));
-} CYCatch }
+} CYCatch(NULL) }
static JSValueRef Selector_callAsFunction_toJSON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
return Selector_callAsFunction_toString(context, object, _this, count, arguments, exception);
@@ -2478,7 +2486,7 @@ static JSValueRef Selector_callAsFunction_toCYON(JSContextRef context, JSObjectR
NSString *string([NSString stringWithFormat:@"@selector(%s)", name]);
return CYCastJSValue(context, CYJSString(context, string));
} CYPoolCatch(NULL)
-} CYCatch return /*XXX*/ NULL; }
+} CYCatch(NULL) return /*XXX*/ NULL; }
static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
if (count != 1)
@@ -2498,7 +2506,7 @@ static JSValueRef Selector_callAsFunction_type(JSContextRef context, JSObjectRef
return CYCastJSValue(context, CYJSString(type));
return CYJSNull(context);
-} CYCatch }
+} CYCatch(NULL) }
static JSStaticValue Selector_staticValues[2] = {
{"value", &CYValue_getProperty_value, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete},