X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/ecf94af80a71bb579df516d76181f696b8c11867..b799113bd4ec270504dd9f552142c1adfd6e583a:/sig/ffi_type.cpp
diff --git a/sig/ffi_type.cpp b/sig/ffi_type.cpp
index e542ba4..7d552ba 100644
--- a/sig/ffi_type.cpp
+++ b/sig/ffi_type.cpp
@@ -1,40 +1,22 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * 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 "Error.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;
@@ -82,7 +64,7 @@ ffi_type *ObjectiveC(apr_pool_t *pool, struct Type *type) {
case array_P: {
// XXX: this is really lame
- ffi_type *aggregate(reinterpret_cast(apr_palloc(pool, sizeof(ffi_type))));
+ ffi_type *aggregate(reinterpret_cast(pool(sizeof(ffi_type))));
aggregate->size = 0;
aggregate->alignment = 0;
aggregate->type = FFI_TYPE_STRUCT;
@@ -90,7 +72,7 @@ ffi_type *ObjectiveC(apr_pool_t *pool, struct Type *type) {
ffi_type *element(ObjectiveC(pool, type->data.data.type));
size_t size(type->data.data.size);
- aggregate->elements = reinterpret_cast(apr_palloc(pool, (size + 1) * sizeof(ffi_type *)));
+ aggregate->elements = reinterpret_cast(pool((size + 1) * sizeof(ffi_type *)));
for (size_t i(0); i != size; ++i)
aggregate->elements[i] = element;
aggregate->elements[size] = NULL;
@@ -116,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(reinterpret_cast(pool(sizeof(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 = reinterpret_cast(pool((type->data.signature.count + 1) * sizeof(ffi_type *)));
sig_ffi_types(pool, &ObjectiveC, &type->data.signature, aggregate->elements);
aggregate->elements[type->data.signature.count] = NULL;
@@ -134,7 +116,7 @@ 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;
@@ -171,8 +153,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,
@@ -180,7 +162,7 @@ void sig_ffi_cif(
size_t offset
) {
if (types == NULL)
- types = reinterpret_cast(apr_palloc(pool, (signature->count - 1) * sizeof(ffi_type *)));
+ types = reinterpret_cast(pool((signature->count - 1) * sizeof(ffi_type *)));
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);