#endif
#ifdef __APPLE__
+static Class __NSMallocBlock__;
static Class NSCFBoolean_;
static Class NSCFType_;
static Class NSGenericDeallocHandler_;
return _jsccall(JSValueIsInstanceOfConstructor, context, value, CYGetCachedObject(context, cache));
}
-NSObject *CYMakeBlock(void (*invoke)(), sig::Signature &signature) {
- BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(malloc(sizeof(BlockLiteral))));
+struct CYBlockDescriptor {
+ struct {
+ BlockDescriptor1 one_;
+ BlockDescriptor2 two_;
+ BlockDescriptor3 three_;
+ } d_;
+
+ Closure_privateData *internal_;
+};
+
+void CYDisposeBlock(BlockLiteral *literal) {
+ delete reinterpret_cast<CYBlockDescriptor *>(literal->descriptor)->internal_;
+}
- struct Descriptor {
- struct {
- BlockDescriptor1 one_;
- BlockDescriptor2 two_;
- BlockDescriptor3 three_;
- } d_;
+static JSValueRef BlockAdapter_(JSContextRef context, size_t count, JSValueRef values[], JSObjectRef function) {
+ JSObjectRef _this(CYCastJSObject(context, values[0]));
+ return CYCallAsFunction(context, function, _this, count - 1, values + 1);
+}
- CYPool pool_;
- };
+static void BlockClosure_(ffi_cif *cif, void *result, void **arguments, void *arg) {
+ CYExecuteClosure(cif, result, arguments, arg, &BlockAdapter_);
+}
+
+NSObject *CYMakeBlock(JSContextRef context, JSObjectRef function, sig::Signature &signature) {
+ _assert(__NSMallocBlock__ != Nil);
+ BlockLiteral *literal(reinterpret_cast<BlockLiteral *>(malloc(sizeof(BlockLiteral))));
- Descriptor *descriptor(new Descriptor);
+ CYBlockDescriptor *descriptor(new CYBlockDescriptor);
memset(&descriptor->d_, 0, sizeof(descriptor->d_));
- literal->isa = objc_getClass("__NSGlobalBlock__");
+ descriptor->internal_ = CYMakeFunctor_(context, function, signature, &BlockClosure_);
+ literal->invoke = reinterpret_cast<void (*)(void *, ...)>(descriptor->internal_->GetValue());
+
+ literal->isa = __NSMallocBlock__;
literal->flags = BLOCK_HAS_SIGNATURE | BLOCK_HAS_COPY_DISPOSE | BLOCK_IS_GLOBAL;
literal->reserved = 0;
- literal->invoke = reinterpret_cast<void (*)(void *, ...)>(invoke);
literal->descriptor = descriptor;
descriptor->d_.one_.size = sizeof(descriptor->d_);
- descriptor->d_.three_.signature = sig::Unparse(descriptor->pool_, &signature);
+ descriptor->d_.two_.dispose_helper = &CYDisposeBlock;
+ descriptor->d_.three_.signature = sig::Unparse(*descriptor->internal_->pool_, &signature);
return reinterpret_cast<NSObject *>(literal);
}
return internal->GetValue();
}
- if (JSValueIsObjectOfClass(context, object, Functor_)) {
- cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(object)));
- return CYMakeBlock(internal->GetValue(), internal->signature_);
- }
-
bool array(CYJSValueIsInstanceOfCachedConstructor(context, object, Array_s));
id value(array ? [CYJSArray alloc] : [CYJSObject alloc]);
return CYPoolRelease(pool, [value initWithJSObject:object inContext:context]);
}
- (NSString *) cy$toCYON:(bool)objective {
- return [[self description] cy$toCYON:objective];
+ return [@"#" stringByAppendingString:[[self description] cy$toCYON:true]];
}
- (bool) cy$hasProperty:(NSString *)name {
return [[self description] cy$toCYON:objective];
}
+@end
+/* }}} */
+/* Bridge: NSSet {{{ */
+@implementation NSSet (Cycript)
+
+- (NSString *) cy$toCYON:(bool)objective {
+ NSMutableString *json([[[NSMutableString alloc] init] autorelease]);
+ [json appendString:@"[NSSet setWithArray:"];
+ [json appendString:CYCastNSCYON([self allObjects], true)];
+ [json appendString:@"]]"];
+ return json;
+}
+
@end
/* }}} */
/* Bridge: NSString {{{ */
} CYSadCatch() }
static bool CYObjectiveC_PoolFFI(CYPool *pool, JSContextRef context, sig::Type *type, ffi_type *ffi, void *data, JSValueRef value) { CYSadTry {
+ // XXX: assigning to an indirect id * works for return values, but not for properties and fields
+
switch (type->primitive) {
- // XXX: do something epic about blocks
- case sig::block_P:
+ case sig::block_P: {
+ _assert(type->data.signature.count != 0);
+ sig::Signature signature;
+ sig::Copy(*pool, signature, type->data.signature);
+
+ sig::Element *elements(new(*pool) sig::Element[++signature.count]);
+ elements[0] = signature.elements[0];
+ memcpy(elements + 2, signature.elements + 1, sizeof(sig::Element) * (signature.count - 2));
+ signature.elements = elements;
+
+ elements[1].name = NULL;
+ elements[1].type = new(*pool) sig::Type();
+ elements[1].offset = _not(size_t);
+
+ memset(elements[1].type, 0, sizeof(sig::Type));
+ elements[1].type->primitive = sig::object_P;
+
+ JSObjectRef function(CYCastJSObject(context, value));
+ *reinterpret_cast<id *>(data) = CYMakeBlock(context, function, signature);
+ } break;
+
case sig::object_P:
case sig::typename_P:
- // XXX: this works for return values, but not for properties and fields
*reinterpret_cast<id *>(data) = CYCastNSObject(pool, context, value);
break;
return JSObjectMake(context, Message_, internal);
}
-static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *type) {
+static IMP CYMakeMessage(JSContextRef context, JSValueRef value, const char *encoding) {
JSObjectRef function(CYCastJSObject(context, value));
- Closure_privateData *internal(CYMakeFunctor_(context, function, type, &MessageClosure_));
+ CYPool pool;
+ sig::Signature signature;
+ sig::Parse(pool, &signature, encoding, &Structor_);
+ Closure_privateData *internal(CYMakeFunctor_(context, function, signature, &MessageClosure_));
// XXX: see notes in Library.cpp about needing to leak
return reinterpret_cast<IMP>(internal->GetValue());
}
return NULL;
} CYCatch(NULL) }
-static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
#ifdef __APPLE__
- size_t size(objc_getClassList(NULL, 0));
+static Class *CYCopyClassList(size_t &size) {
+ size = objc_getClassList(NULL, 0);
Class *data(reinterpret_cast<Class *>(malloc(sizeof(Class) * size)));
- get:
- size_t writ(objc_getClassList(data, size));
- if (size < writ) {
+ for (;;) {
+ size_t writ(objc_getClassList(data, size));
+ if (writ <= size) {
+ size = writ;
+ return data;
+ }
+
+ Class *copy(reinterpret_cast<Class *>(realloc(data, sizeof(Class) * writ)));
+ if (copy == NULL) {
+ free(data);
+ return NULL;
+ }
+
+ data = copy;
size = writ;
- if (Class *copy = reinterpret_cast<Class *>(realloc(data, sizeof(Class) * writ))) {
- data = copy;
- goto get;
- } else goto done;
}
+}
+#endif
- for (size_t i(0); i != writ; ++i)
- JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(data[i])));
-
- done:
- free(data);
+static void ObjectiveC_Classes_getPropertyNames(JSContextRef context, JSObjectRef object, JSPropertyNameAccumulatorRef names) {
+#ifdef __APPLE__
+ size_t size;
+ if (Class *data = CYCopyClassList(size)) {
+ for (size_t i(0); i != size; ++i)
+ JSPropertyNameAccumulatorAddName(names, CYJSString(class_getName(data[i])));
+ free(data);
+ }
#else
void *state(NULL);
while (Class _class = objc_next_class(&state))
JSPropertyNameAccumulatorAddName(names, CYJSString("nil"));
}
+#ifdef __APPLE__
static kern_return_t CYReadMemory(task_t task, vm_address_t address, vm_size_t size, void **data) {
*data = reinterpret_cast<void *>(address);
return KERN_SUCCESS;
}
struct CYChoice {
- Class query_;
+ std::set<Class> query_;
JSContextRef context_;
JSObjectRef results_;
};
Class isa(reinterpret_cast<Class>(pointers[0]));
#endif
- if (isa != choice->query_)
+ std::set<Class>::const_iterator result(choice->query_.find(isa));
+ if (result == choice->query_.end())
+ continue;
+
+ // XXX: if (size < class_getInstanceSize(*result))
+ if ((class_getInstanceSize(*result) + 15) / 16 * 16 != size)
continue;
CYArrayPush(context, choice->results_, CYCastJSValue(context, reinterpret_cast<id>(data)));
}
JSObjectRef results(_jsccall(JSObjectCallAsConstructor, context, Array, 0, NULL));
CYChoice choice;
- choice.query_ = _class;
choice.context_ = context;
choice.results_ = results;
+ size_t number;
+ Class *classes(CYCopyClassList(number));
+ _assert(classes != NULL);
+
+ for (size_t i(0); i != number; ++i)
+ for (Class current(classes[i]); current != Nil; current = class_getSuperclass(current))
+ if (current == _class) {
+ choice.query_.insert(classes[i]);
+ break;
+ }
+
+ free(classes);
+
for (unsigned i(0); i != size; ++i) {
const malloc_zone_t *zone(reinterpret_cast<const malloc_zone_t *>(zones[i]));
if (zone == NULL || zone->introspect == NULL)
continue;
+
zone->introspect->enumerator(mach_task_self(), &choice, MALLOC_PTR_IN_USE_RANGE_TYPE, zones[i], &CYReadMemory, &choose_);
}
return results;
} CYCatch(NULL) }
+#endif
#ifdef __APPLE__
#if defined(__i386__) || defined(__x86_64__)
static JSObjectRef Super_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 Super constructor");
+ throw CYJSError(context, "incorrect number of arguments to objc_super constructor");
CYPool pool;
id self(CYCastNSObject(&pool, context, arguments[0]));
Class _class(CYCastClass(pool, context, arguments[1]));
else
method = NULL;
- if (const char *type = CYPoolTypeEncoding(pool, context, sel, method))
- return CYCastJSValue(context, CYJSString(type));
+ const char *encoding(CYPoolTypeEncoding(pool, context, sel, method));
+ if (encoding == NULL)
+ return CYJSNull(context);
- return CYJSNull(context);
+ sig::Signature signature;
+ sig::Parse(pool, &signature, encoding, &Structor_);
+ return CYMakeType(context, &signature);
} CYCatch(NULL) }
static JSStaticValue Selector_staticValues[2] = {
Object_ = objc_getClass("Object");
#ifdef __APPLE__
+ __NSMallocBlock__ = objc_getClass("__NSMallocBlock__");
+
// XXX: apparently, iOS now has both of these
NSCFBoolean_ = objc_getClass("__NSCFBoolean");
if (NSCFBoolean_ == nil)
CYSetProperty(context, cycript, CYJSString("Instance"), Instance);
CYSetProperty(context, cycript, CYJSString("Selector"), Selector);
- CYSetProperty(context, cycript, CYJSString("Super"), Super);
+ CYSetProperty(context, cycript, CYJSString("objc_super"), Super);
JSObjectRef box(JSObjectMakeFunctionWithCallback(context, CYJSString("box"), &Instance_box_callAsFunction));
- CYSetProperty(context, Instance, CYJSString("box"), box);
-
-#if defined(__APPLE__) && defined(__arm__) && 0
- CYSetProperty(context, all, CYJSString("objc_registerClassPair"), &objc_registerClassPair_, kJSPropertyAttributeDontEnum);
-#endif
+ CYSetProperty(context, Instance, CYJSString("box"), box, kJSPropertyAttributeDontEnum);
#ifdef __APPLE__
CYSetProperty(context, all, CYJSString("choose"), &choose, kJSPropertyAttributeDontEnum);
_assert(hooks_ != NULL);
}
} CYObjectiveC;
+
+extern "C" void CydgetSetupContext(JSGlobalContextRef context) { CYObjectiveTry_ {
+ CYSetupContext(context);
+} CYObjectiveCatch }
+
+extern "C" void CydgetMemoryParse(const uint16_t **data, size_t *size) { try {
+ CYPool pool;
+
+ CYUTF8String utf8(CYPoolUTF8String(pool, CYUTF16String(*data, *size)));
+ utf8 = CYPoolCode(pool, utf8);
+
+ CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(utf8.data, utf8.size)));
+ size_t bytes(utf16.size * sizeof(uint16_t));
+ uint16_t *copy(reinterpret_cast<uint16_t *>(malloc(bytes)));
+ memcpy(copy, utf16.data, bytes);
+
+ *data = copy;
+ *size = utf16.size;
+} catch (const CYException &exception) {
+ CYPool pool;
+ @throw [NSException exceptionWithName:NSRangeException reason:[NSString stringWithFormat:@"%s", exception.PoolCString(pool)] userInfo:nil];
+} }
projects / cycript.git / blobdiff