JSStringRef CYCopyJSString(CYUTF8String value) {
if (memchr(value.data, '\0', value.size) != NULL) {
CYPool pool;
- return CYCopyJSString(pool.memdup(value.data, value.size));
+ return CYCopyJSString(CYPoolUTF16String(pool, value));
} else if (value.data[value.size] != '\0') {
CYPool pool;
- return CYCopyJSString(CYPoolUTF16String(pool, value));
+ return CYCopyJSString(pool.strmemdup(value.data, value.size));
} else {
return CYCopyJSString(value.data);
}
static JSClassRef All_;
static JSClassRef Context_;
-static JSClassRef CString_;
JSClassRef Functor_;
static JSClassRef Global_;
-static JSClassRef Pointer_;
-static JSClassRef Struct_;
JSStringRef Array_s;
JSStringRef cy_s;
JSStringRef cyi_s;
+JSStringRef cyt_s;
JSStringRef length_s;
JSStringRef message_s;
JSStringRef name_s;
}
};
+struct CArray :
+ CYValue_<CArray, void *>
+{
+ 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),
+ owner_(context, owner),
+ type_(new(*pool_) Type_privateData(type, ffi)),
+ length_(length)
+ {
+ if (owner == NULL) {
+ size_t size(ffi->size * length);
+ void *copy(pool_->malloc<void>(size, ffi->alignment));
+ memcpy(copy, GetValue(), size);
+ value_ = copy;
+ }
+ }
+};
+
struct CString :
- CYOwned
+ CYValue_<CString, char *>
{
+ CYProtect owner_;
+
CString(char *value, JSContextRef context, JSObjectRef owner) :
- CYOwned(value, context, owner)
+ CYValue_(value),
+ owner_(context, owner)
{
+ if (owner == NULL)
+ value_ = pool_->strdup(GetValue());
}
};
struct Pointer :
- CYOwned
+ CYValue_<Pointer, void *>
{
+ CYProtect owner_;
Type_privateData *type_;
- size_t length_;
- Pointer(void *value, JSContextRef context, JSObjectRef owner, size_t length, const sig::Type &type) :
- CYOwned(value, context, owner),
- type_(new(*pool_) Type_privateData(type)),
- length_(length)
+ Pointer(void *value, const sig::Type &type, JSContextRef context, JSObjectRef owner) :
+ CYValue_(value),
+ owner_(context, owner),
+ type_(new(*pool_) Type_privateData(type))
{
}
- Pointer(void *value, JSContextRef context, JSObjectRef owner, size_t length, const char *encoding) :
- CYOwned(value, context, owner),
- type_(new(*pool_) Type_privateData(encoding)),
- length_(length)
+ Pointer(void *value, const char *encoding, JSContextRef context, JSObjectRef owner) :
+ CYValue_(value),
+ owner_(context, owner),
+ type_(new(*pool_) Type_privateData(encoding))
{
}
};
struct Struct_privateData :
- CYOwned
+ CYValue_<Struct_privateData, void *>
{
+ CYProtect owner_;
Type_privateData *type_;
- Struct_privateData(JSContextRef context, JSObjectRef owner) :
- CYOwned(NULL, context, owner)
+ Struct_privateData(void *value, const sig::Type &type, ffi_type *ffi, JSContextRef context, JSObjectRef owner) :
+ CYValue_(value),
+ owner_(context, owner),
+ type_(new(*pool_) Type_privateData(type, ffi))
{
+ if (owner == NULL) {
+ size_t size(ffi->size);
+ void *copy(pool_->malloc<void>(size, ffi->alignment));
+ memcpy(copy, GetValue(), size);
+ value_ = copy;
+ }
}
};
-JSObjectRef CYMakeStruct(JSContextRef context, void *data, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) {
- Struct_privateData *internal(new Struct_privateData(context, owner));
- CYPool &pool(*internal->pool_);
- Type_privateData *typical(new(pool) Type_privateData(type, ffi));
- internal->type_ = typical;
-
- if (owner != NULL)
- internal->value_ = data;
- else {
- size_t size(typical->GetFFI()->size);
- void *copy(internal->pool_->malloc<void>(size));
- memcpy(copy, data, size);
- internal->value_ = copy;
- }
-
- return JSObjectMake(context, Struct_, internal);
-}
-
static void *CYCastSymbol(const char *name) {
for (CYHook *hook : GetHooks())
if (hook->CastSymbol != NULL)
return JSValueMakeNumber(context, static_cast<double>(value)); \
}
-CYCastJSValue_(int)
+CYCastJSValue_(signed short int)
+CYCastJSValue_(unsigned short int)
+CYCastJSValue_(signed int)
CYCastJSValue_(unsigned int)
-CYCastJSValue_(long int)
-CYCastJSValue_(long unsigned int)
-CYCastJSValue_(long long int)
-CYCastJSValue_(long long unsigned int)
+CYCastJSValue_(signed long int)
+CYCastJSValue_(unsigned long int)
+CYCastJSValue_(signed long long int)
+CYCastJSValue_(unsigned long long int)
JSValueRef CYJSUndefined(JSContextRef context) {
return JSValueMakeUndefined(context);
return CYCastJSValue(context, CYJSString(CYUTF8String(value.c_str(), value.size())));
} CYCatch(NULL) }
-JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) {
- Pointer *internal(new Pointer(pointer, context, owner, length, type));
- return JSObjectMake(context, Pointer_, internal);
-}
-
-JSObjectRef CYMakePointer(JSContextRef context, void *pointer, size_t length, const char *encoding, JSObjectRef owner) {
- Pointer *internal(new Pointer(pointer, context, owner, length, encoding));
- return JSObjectMake(context, Pointer_, internal);
+JSObjectRef CYMakePointer(JSContextRef context, void *pointer, const sig::Type &type, ffi_type *ffi, JSObjectRef owner) {
+ return Pointer::Make(context, pointer, type, context, owner);
}
-JSObjectRef CYMakeCString(JSContextRef context, char *pointer, JSObjectRef owner) {
- CString *internal(new CString(pointer, context, owner));
- return JSObjectMake(context, CString_, internal);
-}
-
-static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), const sig::Signature &signature) {
- return JSObjectMake(context, Functor_, new cy::Functor(signature, function));
+static JSObjectRef CYMakeFunctor(JSContextRef context, void (*function)(), bool variadic, const sig::Signature &signature) {
+ return JSObjectMake(context, Functor_, new cy::Functor(function, variadic, signature));
}
static JSObjectRef CYMakeFunctor(JSContextRef context, const char *symbol, const char *encoding) {
if (function == NULL)
return NULL;
- cy::Functor *internal(new cy::Functor(encoding, function));
+ cy::Functor *internal(new cy::Functor(function, encoding));
++internal->count_;
return JSObjectMake(context, Functor_, internal);
}
return NULL;
case kJSTypeObject: {
JSObjectRef object((JSObjectRef) value);
- if (JSValueIsObjectOfClass(context, value, Pointer_)) {
+ if (JSValueIsObjectOfClass(context, value, Pointer::Class_)) {
Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
return internal->value_;
}
_assert(false);
}
-void Pointer::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
- *reinterpret_cast<void **>(data) = CYCastPointer<void *>(context, value);
-}
-
-void Array::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
- uint8_t *base(reinterpret_cast<uint8_t *>(data));
- JSObjectRef aggregate(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL);
- for (size_t index(0); index != size; ++index) {
- ffi_type *field(ffi->elements[index]);
-
+static void CYArrayCopy(CYPool *pool, JSContextRef context, uint8_t *base, size_t length, const sig::Type &type, ffi_type *ffi, JSValueRef value, JSObjectRef object) {
+ for (size_t index(0); index != length; ++index) {
JSValueRef rhs;
- if (aggregate == NULL)
+ if (object == NULL)
rhs = value;
else {
- rhs = CYGetProperty(context, aggregate, index);
+ rhs = CYGetProperty(context, object, index);
if (JSValueIsUndefined(context, rhs))
throw CYJSError(context, "unable to extract array value");
}
- type.PoolFFI(pool, context, field, base, rhs);
- // XXX: alignment?
- base += field->size;
+ type.PoolFFI(pool, context, ffi, base, rhs);
+ base += ffi->size;
}
}
+void Pointer::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+ bool guess(false);
+ *reinterpret_cast<void **>(data) = CYCastPointer<void *>(context, value, &guess);
+ if (!guess || pool == NULL || !JSValueIsObject(context, value))
+ return;
+ JSObjectRef object(CYCastJSObject(context, value));
+ if (CYHasProperty(context, object, length_s)) {
+ size_t length(CYArrayLength(context, object));
+ ffi_type *element(type.GetFFI(*pool));
+ size_t size(element->size * length);
+ uint8_t *base(pool->malloc<uint8_t>(size, element->alignment));
+ CYArrayCopy(pool, context, base, length, type, element, value, object);
+ *reinterpret_cast<void **>(data) = base;
+ }
+}
+
+void Array::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
+ if (size == 0)
+ return;
+ uint8_t *base(reinterpret_cast<uint8_t *>(data));
+ JSObjectRef object(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL);
+ CYArrayCopy(pool, context, base, size, type, ffi->elements[0], value, object);
+}
+
void Aggregate::PoolFFI(CYPool *pool, JSContextRef context, ffi_type *ffi, void *data, JSValueRef value) const {
_assert(!overlap);
+ size_t offset(0);
uint8_t *base(reinterpret_cast<uint8_t *>(data));
JSObjectRef aggregate(JSValueIsObject(context, value) ? (JSObjectRef) value : NULL);
for (size_t index(0); index != signature.count; ++index) {
}
}
- element->type->PoolFFI(pool, context, field, base, rhs);
- // XXX: alignment?
- base += field->size;
+ element->type->PoolFFI(pool, context, field, base + offset, rhs);
+ offset += field->size;
+ CYAlign(offset, field->alignment);
}
}
JSValueRef String::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
if (char *value = *reinterpret_cast<char **>(data))
- return CYMakeCString(context, value, owner);
+ return CString::Make(context, value, context, owner);
return CYJSNull(context);
}
JSValueRef Pointer::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
if (void *value = *reinterpret_cast<void **>(data))
- return CYMakePointer(context, value, _not(size_t), type, NULL, owner);
+ return CYMakePointer(context, value, type, NULL, owner);
return CYJSNull(context);
}
JSValueRef Array::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
- _assert(data != NULL);
- return CYMakePointer(context, data, size, type, NULL, owner);
+ return CArray::Make(context, data, size, type, ffi->elements[0], context, owner);
}
JSValueRef Aggregate::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
- return CYMakeStruct(context, data, *this, ffi, owner);
+ return Struct_privateData::Make(context, data, *this, ffi, context, owner);
}
JSValueRef Function::FromFFI(JSContextRef context, ffi_type *ffi, void *data, bool initialize, JSObjectRef owner) const {
- return CYMakeFunctor(context, reinterpret_cast<void (*)()>(data), signature);
+ return CYMakeFunctor(context, reinterpret_cast<void (*)()>(data), variadic, signature);
}
}
return CYCallAsFunction(context, function, NULL, count, values);
}
+#if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__))
+static void CYFreeFunctor(void *data) {
+ ffi_closure_free(data);
+}
+#else
+static void CYFreeFunctor(void *data) {
+ _syscall(munmap(data, sizeof(ffi_closure)));
+}
+#endif
+
Closure_privateData *CYMakeFunctor_(JSContextRef context, JSObjectRef function, const sig::Signature &signature, JSValueRef (*adapter)(JSContextRef, size_t, JSValueRef[], JSObjectRef)) {
// XXX: in case of exceptions this will leak
- // XXX: in point of fact, this may /need/ to leak :(
Closure_privateData *internal(new Closure_privateData(context, function, adapter, signature));
#if defined(__APPLE__) && (defined(__arm__) || defined(__arm64__))
ffi_status status(ffi_prep_closure_loc(writable, &internal->cif_, &CYExecuteClosure, internal, executable));
_assert(status == FFI_OK);
+ internal->pool_->atexit(&CYFreeFunctor, writable);
internal->value_ = executable;
#else
ffi_closure *closure((ffi_closure *) _syscall(mmap(
_syscall(mprotect(closure, sizeof(*closure), PROT_READ | PROT_EXEC));
+ internal->pool_->atexit(&CYFreeFunctor, closure);
internal->value_ = closure;
#endif
return CYCastJSObject(context, CYGetCachedValue(context, name));
}
-static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, const sig::Signature &signature) {
+static JSObjectRef CYMakeFunctor(JSContextRef context, JSValueRef value, bool variadic, const sig::Signature &signature) {
JSObjectRef Function(CYGetCachedObject(context, CYJSString("Function")));
bool function(_jsccall(JSValueIsInstanceOfConstructor, context, value, Function));
return CYMakeFunctor(context, function, signature);
} else {
void (*function)()(CYCastPointer<void (*)()>(context, value));
- return CYMakeFunctor(context, function, signature);
+ return CYMakeFunctor(context, function, variadic, signature);
}
}
static JSValueRef CString_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
CYPool pool;
CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(object)));
- char *string(static_cast<char *>(internal->value_));
ssize_t offset;
if (!CYGetOffset(pool, context, property, offset))
return NULL;
- return CYCastJSValue(context, CYJSString(CYUTF8String(&string[offset], 1)));
+ return CYCastJSValue(context, CYJSString(CYUTF8String(&internal->GetValue()[offset], 1)));
} CYCatch(NULL) }
static bool CString_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
CYPool pool;
CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(object)));
- char *string(static_cast<char *>(internal->value_));
ssize_t offset;
if (!CYGetOffset(pool, context, property, offset))
return false;
const char *data(CYPoolCString(pool, context, value));
- string[offset] = *data;
+ internal->GetValue()[offset] = *data;
return true;
} CYCatch(false) }
return true;
}
-static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
- CYPool pool;
- Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
-
- if (JSStringIsEqual(property, length_s))
- return internal->length_ == _not(size_t) ? CYJSUndefined(context) : CYCastJSValue(context, internal->length_);
-
- Type_privateData *typical(internal->type_);
- if (typical->type_ == NULL)
- return NULL;
-
- if (sig::Function *function = dynamic_cast<sig::Function *>(typical->type_)) {
- if (!JSStringIsEqualToUTF8CString(property, "$cyi"))
- return NULL;
- return CYMakeFunctor(context, reinterpret_cast<void (*)()>(internal->value_), function->signature);
- }
-
+static void *Offset_(CYPool &pool, JSContextRef context, JSStringRef property, void *data, ffi_type *ffi) {
ssize_t offset;
if (JSStringIsEqualToUTF8CString(property, "$cyi"))
offset = 0;
else if (!CYGetOffset(pool, context, property, offset))
return NULL;
+ return reinterpret_cast<uint8_t *>(data) + ffi->size * offset;
+}
+static JSValueRef Offset_getProperty(CYPool &pool, JSContextRef context, JSStringRef property, void *data, Type_privateData *typical, JSObjectRef owner) {
ffi_type *ffi(typical->GetFFI());
+ void *base(Offset_(pool, context, property, data, ffi));
+ if (base == NULL)
+ return NULL;
+ return typical->type_->FromFFI(context, ffi, base, false, owner);
+}
- uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
- base += ffi->size * offset;
+static bool Offset_setProperty(CYPool &pool, JSContextRef context, JSStringRef property, void *data, Type_privateData *typical, JSValueRef value) {
+ ffi_type *ffi(typical->GetFFI());
+ void *base(Offset_(pool, context, property, data, ffi));
+ if (base == NULL)
+ return false;
- JSObjectRef owner(internal->GetOwner() ?: object);
- return typical->type_->FromFFI(context, ffi, base, false, owner);
+ typical->type_->PoolFFI(NULL, context, ffi, base, value);
+ return true;
+}
+
+static JSValueRef CArray_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+ CYPool pool;
+ CArray *internal(reinterpret_cast<CArray *>(JSObjectGetPrivate(object)));
+ if (JSStringIsEqual(property, length_s))
+ return CYCastJSValue(context, internal->length_);
+ Type_privateData *typical(internal->type_);
+ JSObjectRef owner(internal->owner_ ?: object);
+ return Offset_getProperty(pool, context, property, internal->value_, typical, owner);
} CYCatch(NULL) }
-static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
+static bool CArray_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
CYPool pool;
Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
Type_privateData *typical(internal->type_);
+ return Offset_setProperty(pool, context, property, internal->value_, typical, value);
+} CYCatch(false) }
- if (typical->type_ == NULL)
- return false;
+static JSValueRef Pointer_getProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+ CYPool pool;
+ Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
- ssize_t offset;
- if (JSStringIsEqualToUTF8CString(property, "$cyi"))
- offset = 0;
- else if (!CYGetOffset(pool, context, property, offset))
- return false;
+ Type_privateData *typical(internal->type_);
- ffi_type *ffi(typical->GetFFI());
+ if (sig::Function *function = dynamic_cast<sig::Function *>(typical->type_)) {
+ if (!JSStringIsEqualToUTF8CString(property, "$cyi"))
+ return NULL;
+ return CYMakeFunctor(context, reinterpret_cast<void (*)()>(internal->value_), function->variadic, function->signature);
+ }
- uint8_t *base(reinterpret_cast<uint8_t *>(internal->value_));
- base += ffi->size * offset;
+ JSObjectRef owner(internal->owner_ ?: object);
+ return Offset_getProperty(pool, context, property, internal->value_, typical, owner);
+} CYCatch(NULL) }
- typical->type_->PoolFFI(NULL, context, ffi, base, value);
- return true;
+static bool Pointer_setProperty(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef value, JSValueRef *exception) { CYTry {
+ CYPool pool;
+ Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
+ Type_privateData *typical(internal->type_);
+ return Offset_setProperty(pool, context, property, internal->value_, typical, value);
} CYCatch(false) }
static JSValueRef Struct_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(_this)));
Type_privateData *typical(internal->type_);
- return CYMakePointer(context, internal->value_, _not(size_t), *typical->type_, typical->ffi_, _this);
+ return CYMakePointer(context, internal->value_, *typical->type_, typical->ffi_, _this);
} CYCatch(NULL) }
-static JSValueRef Struct_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef Struct_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Struct_privateData *internal(reinterpret_cast<Struct_privateData *>(JSObjectGetPrivate(object)));
return CYMakeType(context, *internal->type_->type_);
} CYCatch(NULL) }
if (!Index_(pool, context, internal, property, index, base))
return NULL;
- JSObjectRef owner(internal->GetOwner() ?: object);
+ JSObjectRef owner(internal->owner_ ?: object);
return type->signature.elements[index].type->FromFFI(context, typical->GetFFI()->elements[index], base, false, owner);
} CYCatch(NULL) }
}
}
+static sig::Void Void_;
+static sig::Pointer PointerToVoid_(Void_);
+
+static sig::Type *CYGetType(CYPool &pool, JSContextRef context, JSValueRef value) {
+ if (JSValueIsNull(context, value))
+ return &PointerToVoid_;
+ JSObjectRef object(CYCastJSObject(context, value));
+ JSObjectRef type(CYCastJSObject(context, CYGetProperty(context, object, cyt_s)));
+ _assert(JSValueIsObjectOfClass(context, type, Type_privateData::Class_));
+ Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(type)));
+ return internal->type_;
+}
+
void CYCallFunction(CYPool &pool, JSContextRef context, ffi_cif *cif, void (*function)(), void *value, void **values) {
ffi_call(cif, function, value, values);
}
-JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, sig::Signature *signature, ffi_cif *cif, void (*function)()) {
- if (setups + count != signature->count - 1)
- throw CYJSError(context, "incorrect number of arguments to ffi function");
+JSValueRef CYCallFunction(CYPool &pool, JSContextRef context, size_t setups, void *setup[], size_t count, const JSValueRef arguments[], bool initialize, bool variadic, const sig::Signature &signature, ffi_cif *cif, void (*function)()) {
+ size_t have(setups + count);
+ size_t need(signature.count - 1);
+
+ if (have < need)
+ throw CYJSError(context, "insufficient number of arguments to ffi function");
+
+ ffi_cif corrected;
+ sig::Element *elements(signature.elements);
+
+ if (have > need) {
+ if (!variadic)
+ throw CYJSError(context, "exorbitant number of arguments to ffi function");
+
+ elements = new (pool) sig::Element[have + 1];
+ memcpy(elements, signature.elements, sizeof(sig::Element) * (need + 1));
+
+ for (size_t index(need); index != have; ++index) {
+ sig::Element &element(elements[index + 1]);
+ element.name = NULL;
+ element.offset = _not(size_t);
+ element.type = CYGetType(pool, context, arguments[index - setups]);
+ }
+
+ sig::Signature extended;
+ extended.elements = elements;
+ extended.count = have + 1;
+ sig::sig_ffi_cif(pool, signature.count, extended, &corrected);
+ cif = &corrected;
+ }
- size_t size(setups + count);
- void *values[size];
+ void *values[have];
memcpy(values, setup, sizeof(void *) * setups);
- for (size_t index(setups); index != size; ++index) {
- sig::Element *element(&signature->elements[index + 1]);
+ for (size_t index(setups); index != have; ++index) {
+ sig::Element &element(elements[index + 1]);
ffi_type *ffi(cif->arg_types[index]);
- // XXX: alignment?
- values[index] = new(pool) uint8_t[ffi->size];
- element->type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]);
+ values[index] = pool.malloc<uint8_t>(ffi->size, ffi->alignment);
+ element.type->PoolFFI(&pool, context, ffi, values[index], arguments[index - setups]);
}
uint8_t value[cif->rtype->size];
call = hook->CallFunction;
call(pool, context, cif, function, value, values);
- return signature->elements[0].type->FromFFI(context, cif->rtype, value, initialize);
+ return signature.elements[0].type->FromFFI(context, cif->rtype, value, initialize);
}
static JSValueRef Functor_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
CYPool pool;
cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(object)));
- return CYCallFunction(pool, context, 0, NULL, count, arguments, false, &internal->signature_, &internal->cif_, internal->GetValue());
+ return CYCallFunction(pool, context, 0, NULL, count, arguments, false, internal->variadic_, internal->signature_, &internal->cif_, internal->GetValue());
} CYCatch(NULL) }
static JSValueRef Pointer_callAsFunction(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
return JSObjectMake(context, Type_privateData::Class_, internal);
}
-JSObjectRef CYMakeType(JSContextRef context, sig::Signature *signature) {
- CYPool pool;
- sig::Function type;
- sig::Copy(pool, type.signature, *signature);
- return CYMakeType(context, type);
-}
-
extern "C" bool CYBridgeHash(CYPool &pool, CYUTF8String name, const char *&code, unsigned &flags) {
sqlite3_stmt *statement;
}
}
+static JSObjectRef CArray_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
+ _assert(false);
+} CYCatch(NULL) }
+
static JSObjectRef CString_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 CString constructor");
- char *value(CYCastPointer<char *>(context, arguments[0]));
- return CYMakeCString(context, value, NULL);
+ _assert(false);
} CYCatch(NULL) }
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 Pointer constructor");
-
- CYPool pool;
-
- void *value(CYCastPointer<void *>(context, arguments[0]));
- const char *type(CYPoolCString(pool, context, arguments[1]));
-
- sig::Signature signature;
- sig::Parse(pool, &signature, type, &Structor_);
-
- return CYMakePointer(context, value, _not(size_t), *signature.elements[0].type, NULL, NULL);
+ _assert(false);
} CYCatch(NULL) }
static JSObjectRef Type_new(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
} CYCatch(NULL) }
static JSValueRef Type_callAsFunction_functionWith(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) {
- sig::Function type;
- return Type_callAsFunction_$With(context, object, _this, count, arguments, type, exception);
+ bool variadic(count != 0 && JSValueIsNull(context, arguments[count - 1]));
+ sig::Function type(variadic);
+ return Type_callAsFunction_$With(context, object, _this, variadic ? count - 1 : count, arguments, type, exception);
}
static JSValueRef Type_callAsFunction_pointerTo(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
if (sig::Function *function = dynamic_cast<sig::Function *>(internal->type_))
- return CYMakeFunctor(context, arguments[0], function->signature);
+ return CYMakeFunctor(context, arguments[0], function->variadic, function->signature);
+ CYPool pool;
sig::Type *type(internal->type_);
ffi_type *ffi(internal->GetFFI());
- // XXX: alignment?
- uint8_t value[ffi->size];
- CYPool pool;
- type->PoolFFI(&pool, context, ffi, value, arguments[0]);
- return type->FromFFI(context, ffi, value);
+
+ void *data(pool.malloc<void>(ffi->size, ffi->alignment));
+ type->PoolFFI(&pool, context, ffi, data, arguments[0]);
+ JSValueRef value(type->FromFFI(context, ffi, data));
+
+ if (JSValueGetType(context, value) == kJSTypeNumber) {
+ JSObjectRef typed(_jsccall(JSObjectCallAsConstructor, context, CYGetCachedObject(context, CYJSString("Number")), 1, &value));
+ CYSetProperty(context, typed, cyt_s, object, kJSPropertyAttributeDontEnum);
+ value = typed;
+ }
+
+ return value;
} CYCatch(NULL) }
static JSObjectRef Type_callAsConstructor(JSContextRef context, JSObjectRef object, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
throw CYJSError(context, "incorrect number of arguments to Type allocator");
Type_privateData *internal(reinterpret_cast<Type_privateData *>(JSObjectGetPrivate(object)));
- sig::Type *type(internal->type_);
- size_t length(type->Translate(type));
-
- JSObjectRef pointer(CYMakePointer(context, NULL, length, *type, NULL, NULL));
+ JSObjectRef pointer(CYMakePointer(context, NULL, *internal->type_, NULL, NULL));
Pointer *value(reinterpret_cast<Pointer *>(JSObjectGetPrivate(pointer)));
- value->value_ = value->pool_->malloc<void>(internal->GetFFI()->size);
- memset(value->value_, 0, internal->GetFFI()->size);
+ ffi_type *ffi(internal->GetFFI());
+ value->value_ = value->pool_->malloc<void>(ffi->size, ffi->alignment);
+ memset(value->value_, 0, ffi->size);
return pointer;
} CYCatch(NULL) }
const char *encoding(CYPoolCString(pool, context, arguments[1]));
sig::Signature signature;
sig::Parse(pool, &signature, encoding, &Structor_);
- return CYMakeFunctor(context, arguments[0], signature);
+ return 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 {
+ CArray *internal(reinterpret_cast<CArray *>(JSObjectGetPrivate(_this)));
+ JSObjectRef owner(internal->owner_ ?: object);
+ return CYMakePointer(context, internal->value_, *internal->type_->type_, NULL, owner);
} CYCatch(NULL) }
static JSValueRef CString_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(_this)));
- return CYMakePointer(context, internal->value_, _not(size_t), sig::Primitive<char>(), NULL, NULL);
+ JSObjectRef owner(internal->owner_ ?: object);
+ return CYMakePointer(context, internal->value_, sig::Primitive<char>(), NULL, owner);
} CYCatch(NULL) }
static JSValueRef Functor_callAsFunction_$cya(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
CYPool pool;
cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(_this)));
- sig::Function type;
+ sig::Function type(internal->variadic_);
sig::Copy(pool, type.signature, internal->signature_);
- return CYMakePointer(context, internal->value_, _not(size_t), type, NULL, NULL);
+ return CYMakePointer(context, internal->value_, type, NULL, NULL);
} CYCatch(NULL) }
static JSValueRef Pointer_callAsFunction_toPointer(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
std::set<void *> *objects(CYCastObjects(context, _this, count, arguments));
Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(_this)));
- if (internal->length_ != _not(size_t)) {
- JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype")));
- JSObjectRef toCYON(CYCastJSObject(context, CYGetProperty(context, Array, toCYON_s)));
- return CYCallAsFunction(context, toCYON, _this, count, arguments);
- }
try {
JSValueRef value(CYGetProperty(context, _this, cyi_s));
static JSValueRef CString_getProperty_length(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(object)));
- char *string(static_cast<char *>(internal->value_));
- return CYCastJSValue(context, strlen(string));
+ return CYCastJSValue(context, strlen(internal->GetValue()));
} CYCatch(NULL) }
-static JSValueRef CString_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef CString_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
return CYMakeType(context, sig::String());
} CYCatch(NULL) }
-static JSValueRef Pointer_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef CArray_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+ CArray *internal(reinterpret_cast<CArray *>(JSObjectGetPrivate(object)));
+ sig::Array type(*internal->type_->type_, internal->length_);
+ return CYMakeType(context, type);
+} CYCatch(NULL) }
+
+static JSValueRef Pointer_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(object)));
sig::Pointer type(*internal->type_->type_);
return CYMakeType(context, type);
} CYCatch(NULL) }
static JSValueRef CString_callAsFunction_toCYON(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(_this)));
- const char *string(static_cast<const char *>(internal->value_));
+ CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(_this)));
+ const char *string(internal->GetValue());
std::ostringstream str;
if (string == NULL)
str << "NULL";
} CYCatch(NULL) }
static JSValueRef CString_callAsFunction_toString(JSContextRef context, JSObjectRef object, JSObjectRef _this, size_t count, const JSValueRef arguments[], JSValueRef *exception) { CYTry {
- Pointer *internal(reinterpret_cast<Pointer *>(JSObjectGetPrivate(_this)));
- const char *string(static_cast<const char *>(internal->value_));
- return CYCastJSValue(context, string);
+ CString *internal(reinterpret_cast<CString *>(JSObjectGetPrivate(_this)));
+ return CYCastJSValue(context, internal->GetValue());
} CYCatch(NULL) }
-static JSValueRef Functor_getProperty_type(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
+static JSValueRef Functor_getProperty_$cyt(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
cy::Functor *internal(reinterpret_cast<cy::Functor *>(JSObjectGetPrivate(object)));
- return CYMakeType(context, &internal->signature_);
+ CYPool pool;
+ sig::Function type(internal->variadic_);
+ sig::Copy(pool, type.signature, internal->signature_);
+ return CYMakeType(context, type);
} CYCatch(NULL) }
static JSValueRef Type_getProperty_alignment(JSContextRef context, JSObjectRef object, JSStringRef property, JSValueRef *exception) { CYTry {
{NULL, NULL, 0}
};
+static JSStaticFunction CArray_staticFunctions[4] = {
+ {"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"toPointer", &CArray_callAsFunction_toPointer, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"valueOf", &CYValue_callAsFunction_valueOf, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {NULL, NULL, 0}
+};
+
+static JSStaticValue CArray_staticValues[2] = {
+ {"$cyt", &CArray_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {NULL, NULL, NULL, 0}
+};
+
static JSStaticFunction CString_staticFunctions[6] = {
{"toCYON", &CString_callAsFunction_toCYON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{"toJSON", &CYValue_callAsFunction_toJSON, kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
static JSStaticValue CString_staticValues[3] = {
{"length", &CString_getProperty_length, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
- {"type", &CString_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"$cyt", &CString_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, NULL, 0}
};
};
static JSStaticValue Pointer_staticValues[2] = {
- {"type", &Pointer_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"$cyt", &Pointer_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, NULL, 0}
};
};
static JSStaticValue Struct_staticValues[2] = {
- {"type", &Struct_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"$cyt", &Struct_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, NULL, 0}
};
}
static JSStaticValue Functor_staticValues[2] = {
- {"type", &Functor_getProperty_type, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
+ {"$cyt", &Functor_getProperty_$cyt, NULL, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontEnum | kJSPropertyAttributeDontDelete},
{NULL, NULL, NULL, 0}
};
definition.finalize = &CYFinalize;
Context_ = JSClassCreate(&definition);
+ definition = kJSClassDefinitionEmpty;
+ definition.className = "CArray";
+ definition.staticFunctions = CArray_staticFunctions;
+ definition.staticValues = CArray_staticValues;
+ definition.getProperty = &CArray_getProperty;
+ definition.setProperty = &CArray_setProperty;
+ definition.finalize = &CYFinalize;
+ CArray::Class_ = JSClassCreate(&definition);
+
definition = kJSClassDefinitionEmpty;
definition.className = "CString";
definition.staticFunctions = CString_staticFunctions;
definition.getProperty = &CString_getProperty;
definition.setProperty = &CString_setProperty;
definition.finalize = &CYFinalize;
- CString_ = JSClassCreate(&definition);
+ CString::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Functor";
definition.getProperty = &Pointer_getProperty;
definition.setProperty = &Pointer_setProperty;
definition.finalize = &CYFinalize;
- Pointer_ = JSClassCreate(&definition);
+ Pointer::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Struct";
definition.setProperty = &Struct_setProperty;
definition.getPropertyNames = &Struct_getPropertyNames;
definition.finalize = &CYFinalize;
- Struct_ = JSClassCreate(&definition);
+ Struct_privateData::Class_ = JSClassCreate(&definition);
definition = kJSClassDefinitionEmpty;
definition.className = "Type";
Array_s = JSStringCreateWithUTF8CString("Array");
cy_s = JSStringCreateWithUTF8CString("$cy");
cyi_s = JSStringCreateWithUTF8CString("$cyi");
+ cyt_s = JSStringCreateWithUTF8CString("$cyt");
length_s = JSStringCreateWithUTF8CString("length");
message_s = JSStringCreateWithUTF8CString("message");
name_s = JSStringCreateWithUTF8CString("name");
CYSetProperty(context, cycript, CYJSString("compile"), &Cycript_compile_callAsFunction);
CYSetProperty(context, cycript, CYJSString("gc"), &Cycript_gc_callAsFunction);
- JSObjectRef CString(JSObjectMakeConstructor(context, CString_, &CString_new));
+ JSObjectRef CArray(JSObjectMakeConstructor(context, 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));
CYSetPrototype(context, CYCastJSObject(context, CYGetProperty(context, CString, prototype_s)), String_prototype);
CYSetProperty(context, cycript, CYJSString("CString"), CString);
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_, &Pointer_new));
+ CYSetProperty(context, cycript, CYJSString("Pointer"), JSObjectMakeConstructor(context, Pointer::Class_, &Pointer_new));
CYSetProperty(context, cycript, CYJSString("Type"), JSObjectMakeConstructor(context, Type_privateData::Class_, &Type_new));
JSObjectRef modules(JSObjectMake(context, NULL, NULL));
}
#endif
+ CYSetProperty(context, String_prototype, cyt_s, CYMakeType(context, sig::String()), kJSPropertyAttributeDontEnum);
+
CYSetProperty(context, cache, CYJSString("dlerror"), CYMakeFunctor(context, "dlerror", "*"), kJSPropertyAttributeDontEnum);
CYSetProperty(context, cache, CYJSString("RTLD_DEFAULT"), CYCastJSValue(context, reinterpret_cast<intptr_t>(RTLD_DEFAULT)), kJSPropertyAttributeDontEnum);
CYSetProperty(context, cache, CYJSString("dlsym"), CYMakeFunctor(context, "dlsym", "^v^v*"), kJSPropertyAttributeDontEnum);
projects / cycript.git / blobdiff