X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/ea2d184cbcdf25cfa51727f175356fe2ee211136..2ca4dab349cc3f91032b17ced6b76023b4e67115:/sig/ffi_type.cpp
diff --git a/sig/ffi_type.cpp b/sig/ffi_type.cpp
index 49e4084..0cd7981 100644
--- a/sig/ffi_type.cpp
+++ b/sig/ffi_type.cpp
@@ -1,11 +1,48 @@
-#include "minimal/stdlib.h"
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2014 Jay Freeman (saurik)
+*/
+
+/* GNU Affero General Public License, Version 3 {{{ */
+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program 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 Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+**/
+/* }}} */
+
+#include "Error.hpp"
#include "sig/ffi_type.hpp"
#include "sig/types.hpp"
+#define ffi_type_slonglong ffi_type_sint64
+#define ffi_type_ulonglong ffi_type_uint64
+
namespace sig {
-ffi_type *sig_objc_ffi_type(apr_pool_t *pool, struct Type *type) {
+void sig_ffi_types(
+ CYPool &pool,
+ ffi_type *(*sig_ffi_type)(CYPool &, struct Type *),
+ struct Signature *signature,
+ ffi_type **types,
+ size_t skip = 0,
+ size_t offset = 0
+) {
+ _assert(signature->count >= skip);
+ for (size_t index = skip; index != signature->count; ++index)
+ types[index - skip + offset] = (*sig_ffi_type)(pool, signature->elements[index].type);
+}
+
+ffi_type *ObjectiveC(CYPool &pool, struct Type *type) {
switch (type->primitive) {
case typename_P: return &ffi_type_pointer;
@@ -16,18 +53,32 @@ ffi_type *sig_objc_ffi_type(apr_pool_t *pool, struct Type *type) {
case string_P: return &ffi_type_pointer;
case selector_P: return &ffi_type_pointer;
+ case block_P: return &ffi_type_pointer;
case object_P: return &ffi_type_pointer;
case boolean_P: return &ffi_type_uchar;
case uchar_P: return &ffi_type_uchar;
case uint_P: return &ffi_type_uint;
case ulong_P: return &ffi_type_ulong;
- case ulonglong_P: return &ffi_type_ulong;
+ case ulonglong_P: return &ffi_type_ulonglong;
case ushort_P: return &ffi_type_ushort;
- case array_P:
- /* XXX: implement */
- _assert(false);
- break;
+ case array_P: {
+ // XXX: this is really lame
+ ffi_type *aggregate(new(pool) ffi_type());
+ aggregate->size = 0;
+ aggregate->alignment = 0;
+ aggregate->type = FFI_TYPE_STRUCT;
+
+ ffi_type *element(ObjectiveC(pool, type->data.data.type));
+ size_t size(type->data.data.size);
+
+ aggregate->elements = new(pool) ffi_type *[size + 1];
+ for (size_t i(0); i != size; ++i)
+ aggregate->elements[i] = element;
+ aggregate->elements[size] = NULL;
+
+ return aggregate;
+ } break;
case pointer_P: return &ffi_type_pointer;
@@ -40,20 +91,20 @@ ffi_type *sig_objc_ffi_type(apr_pool_t *pool, struct Type *type) {
case double_P: return &ffi_type_double;
case float_P: return &ffi_type_float;
case int_P: return &ffi_type_sint;
- case long_P: return &ffi_type_sint;
- case longlong_P: return &ffi_type_slong;
+ case long_P: return &ffi_type_slong;
+ case longlong_P: return &ffi_type_slonglong;
case short_P: return &ffi_type_sshort;
case void_P: return &ffi_type_void;
case struct_P: {
- ffi_type *aggregate = reinterpret_cast(apr_palloc(pool, sizeof(ffi_type)));
+ ffi_type *aggregate(new(pool) ffi_type());
aggregate->size = 0;
aggregate->alignment = 0;
aggregate->type = FFI_TYPE_STRUCT;
- aggregate->elements = reinterpret_cast(apr_palloc(pool, (type->data.signature.count + 1) * sizeof(ffi_type *)));
- sig_ffi_types(pool, &sig_objc_ffi_type, &type->data.signature, aggregate->elements, 0, 0);
+ aggregate->elements = new(pool) ffi_type *[type->data.signature.count + 1];
+ sig_ffi_types(pool, &ObjectiveC, &type->data.signature, aggregate->elements);
aggregate->elements[type->data.signature.count] = NULL;
return aggregate;
@@ -65,31 +116,29 @@ ffi_type *sig_objc_ffi_type(apr_pool_t *pool, struct Type *type) {
}
}
-ffi_type *sig_java_ffi_type(apr_pool_t *pool, struct Type *type) {
+ffi_type *Java(CYPool &pool, struct Type *type) {
switch (type->primitive) {
case typename_P: return &ffi_type_pointer;
- case union_P: return &ffi_type_pointer;
+ case union_P: _assert(false); break;
case string_P: return &ffi_type_pointer;
case selector_P: return &ffi_type_pointer;
+ case block_P: return &ffi_type_pointer;
case object_P: return &ffi_type_pointer;
case boolean_P: return &ffi_type_uchar;
case uchar_P: return &ffi_type_uchar;
case uint_P: return &ffi_type_uint;
case ulong_P: return &ffi_type_ulong;
- case ulonglong_P: return &ffi_type_ulong;
+ case ulonglong_P: return &ffi_type_ulonglong;
case ushort_P: return &ffi_type_ushort;
case array_P: return &ffi_type_pointer;
case pointer_P: return &ffi_type_pointer;
-
- /* XXX: bit type */
- case bit_P: return &ffi_type_uint;
-
+ case bit_P: _assert(false); break;
case char_P: return &ffi_type_schar;
case double_P: return &ffi_type_double;
case float_P: return &ffi_type_double;
case int_P: return &ffi_type_sint;
- case long_P: return &ffi_type_sint;
- case longlong_P: return &ffi_type_slong;
+ case long_P: return &ffi_type_slong;
+ case longlong_P: return &ffi_type_slonglong;
case short_P: return &ffi_type_sshort;
case void_P: return &ffi_type_void;
case struct_P: return &ffi_type_pointer;
@@ -100,33 +149,20 @@ ffi_type *sig_java_ffi_type(apr_pool_t *pool, struct Type *type) {
}
}
-void sig_ffi_types(
- apr_pool_t *pool,
- ffi_type *(*sig_ffi_type)(apr_pool_t *, struct Type *),
- struct Signature *signature,
- ffi_type **ffi_types,
- size_t skip,
- size_t offset
-) {
- _assert(signature->count >= skip);
- for (size_t index = skip; index != signature->count; ++index)
- ffi_types[index - skip + offset] = (*sig_ffi_type)(pool, signature->elements[index].type);
-}
-
void sig_ffi_cif(
- apr_pool_t *pool,
- ffi_type *(*sig_ffi_type)(apr_pool_t *, struct Type *),
+ CYPool &pool,
+ ffi_type *(*sig_ffi_type)(CYPool &, struct Type *),
struct Signature *signature,
- ffi_cif *ffi_cif,
+ ffi_cif *cif,
size_t skip,
ffi_type **types,
size_t offset
) {
if (types == NULL)
- types = reinterpret_cast(apr_palloc(pool, (signature->count - 1) * sizeof(ffi_type *)));
+ types = new(pool) ffi_type *[signature->count - 1];
ffi_type *type = (*sig_ffi_type)(pool, signature->elements[0].type);
sig_ffi_types(pool, sig_ffi_type, signature, types, 1 + skip, offset);
- ffi_status status = ffi_prep_cif(ffi_cif, FFI_DEFAULT_ABI, signature->count - 1 - skip + offset, type, types);
+ ffi_status status = ffi_prep_cif(cif, FFI_DEFAULT_ABI, signature->count - 1 - skip + offset, type, types);
_assert(status == FFI_OK);
}