Put the filename in _trace to make it more useful.

[cycript.git] / sig / ffi_type.cpp

diff --git a/sig/ffi_type.cpp b/sig/ffi_type.cpp
index 2955d4701689cc104365dbce1f7e94c1b414aebc..836f7cd8bb938e2e5ab95da4b0c7826030ff1a09 100644 (file)
--- a/sig/ffi_type.cpp
+++ b/sig/ffi_type.cpp
@@ -1,4 +1,25 @@
-#include "minimal/stdlib.h"
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2015  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 <http://www.gnu.org/licenses/>.
+**/
+/* }}} */
+
+#include "Error.hpp"

 
 #include "sig/ffi_type.hpp"
 #include "sig/types.hpp"
 
 #include "sig/ffi_type.hpp"
 #include "sig/types.hpp"


@@ -9,8 +30,8 @@
 namespace sig {
 
 void sig_ffi_types(
 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,
     struct Signature *signature,
     ffi_type **types,
     size_t skip = 0,


@@ -21,7 +42,7 @@ void sig_ffi_types(
         types[index - skip + offset] = (*sig_ffi_type)(pool, signature->elements[index].type);
 }
 
         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;
 
     switch (type->primitive) {
         case typename_P: return &ffi_type_pointer;
 


@@ -32,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 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 object_P: return &ffi_type_pointer;
         case boolean_P: return &ffi_type_uchar;
         case uchar_P: return &ffi_type_uchar;


@@ -40,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 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;
 
 
         case pointer_P: return &ffi_type_pointer;
 


@@ -63,12 +98,12 @@ ffi_type *ObjectiveC(apr_pool_t *pool, struct Type *type) {
         case void_P: return &ffi_type_void;
 
         case struct_P: {
         case void_P: return &ffi_type_void;
 
         case struct_P: {

-            ffi_type *aggregate = reinterpret_cast<ffi_type *>(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->size = 0;
             aggregate->alignment = 0;
             aggregate->type = FFI_TYPE_STRUCT;
 

-            aggregate->elements = reinterpret_cast<ffi_type **>(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;
 
             sig_ffi_types(pool, &ObjectiveC, &type->data.signature, aggregate->elements);
             aggregate->elements[type->data.signature.count] = NULL;
 


@@ -81,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;
     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 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 object_P: return &ffi_type_pointer;
         case boolean_P: return &ffi_type_uchar;
         case uchar_P: return &ffi_type_uchar;


@@ -96,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;
         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 char_P: return &ffi_type_schar;
         case double_P: return &ffi_type_double;
         case float_P: return &ffi_type_double;


@@ -117,8 +150,8 @@ ffi_type *Java(apr_pool_t *pool, struct Type *type) {
 }
 
 void sig_ffi_cif(
 }
 
 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,
     struct Signature *signature,
     ffi_cif *cif,
     size_t skip,


@@ -126,7 +159,7 @@ void sig_ffi_cif(
     size_t offset
 ) {
     if (types == NULL)
     size_t offset
 ) {
     if (types == NULL)

-        types = reinterpret_cast<ffi_type **>(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);
     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);