X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b4aa79afea0c26718af8880c3ee8fea63eb21563..ccd33bdc275e7b4b7cc18d484ec68976354e48e2:/sig/ffi_type.cpp
diff --git a/sig/ffi_type.cpp b/sig/ffi_type.cpp
index 7092dda..96f39bb 100644
--- a/sig/ffi_type.cpp
+++ b/sig/ffi_type.cpp
@@ -1,43 +1,25 @@
-/* Cycript - Remove Execution Server and Disassembler
- * Copyright (C) 2009 Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2013 Jay Freeman (saurik)
*/
-/* Modified BSD License {{{ */
+/* GNU 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 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 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 General Public License
+ * along with Cycript. If not, see .
+**/
/* }}} */
-#include "minimal/stdlib.h"
+#include "Error.hpp"
#include "sig/ffi_type.hpp"
#include "sig/types.hpp"
@@ -48,8 +30,8 @@
namespace sig {
void sig_ffi_types(
- 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_type **types,
size_t skip = 0,
@@ -60,7 +42,7 @@ void sig_ffi_types(
types[index - skip + offset] = (*sig_ffi_type)(pool, signature->elements[index].type);
}
-ffi_type *ObjectiveC(apr_pool_t *pool, struct Type *type) {
+ffi_type *ObjectiveC(CYPool &pool, struct Type *type) {
switch (type->primitive) {
case typename_P: return &ffi_type_pointer;
@@ -71,6 +53,7 @@ ffi_type *ObjectiveC(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;
@@ -79,10 +62,23 @@ ffi_type *ObjectiveC(apr_pool_t *pool, struct Type *type) {
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;
@@ -102,12 +98,12 @@ ffi_type *ObjectiveC(apr_pool_t *pool, struct Type *type) {
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 *)));
+ 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;
@@ -120,12 +116,13 @@ ffi_type *ObjectiveC(apr_pool_t *pool, struct Type *type) {
}
}
-ffi_type *Java(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;
@@ -135,10 +132,7 @@ ffi_type *Java(apr_pool_t *pool, struct Type *type) {
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;
@@ -156,8 +150,8 @@ ffi_type *Java(apr_pool_t *pool, struct Type *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 *cif,
size_t skip,
@@ -165,7 +159,7 @@ void sig_ffi_cif(
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(cif, FFI_DEFAULT_ABI, signature->count - 1 - skip + offset, type, types);