Added cyrver to make clean, fixed GC protection for CYJS*, implemented array comprehe...

[cycript.git] / sig / ffi_type.cpp

diff --git a/sig/ffi_type.cpp b/sig/ffi_type.cpp
index 00d04b2947dc36af0c20d9290190423f8aaa21bb..7092dda239a90d100bfd9b1a3d1e1f3e4fed4aee 100644 (file)
--- a/sig/ffi_type.cpp
+++ b/sig/ffi_type.cpp
@@ -1,8 +1,50 @@
+/* Cycript - Remove Execution Server and Disassembler
+ * Copyright (C) 2009  Jay Freeman (saurik)
+*/
+
+/* Modified BSD License {{{ */
+/*
+ *        Redistribution and use in source and binary
+ * forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * 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.
+ *
+ * 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.
+*/
+/* }}} */
+
 #include "minimal/stdlib.h"
 
 #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 {
 
 void sig_ffi_types(
@@ -34,7 +76,7 @@ ffi_type *ObjectiveC(apr_pool_t *pool, struct Type *type) {
         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:
@@ -53,8 +95,8 @@ ffi_type *ObjectiveC(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;
@@ -89,7 +131,7 @@ ffi_type *Java(apr_pool_t *pool, struct Type *type) {
         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;
@@ -101,8 +143,8 @@ ffi_type *Java(apr_pool_t *pool, struct Type *type) {
         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;