ffi 1.0.7-x86-mingw32 → 1.0.9-x86-mingw32

data/ext/ffi_c/Pointer.c

@@ -27,16 +27,12 @@
 #include "AbstractMemory.h"
 #include "Pointer.h"
 
-typedef struct Pointer {
-    AbstractMemory memory;
-    VALUE parent;
-} Pointer;
-
 #define POINTER(obj) rbffi_AbstractMemory_Cast((obj), rbffi_PointerClass)
 
 VALUE rbffi_PointerClass = Qnil;
 VALUE rbffi_NullPointerSingleton = Qnil;
 
+static void ptr_release(Pointer* ptr);
 static void ptr_mark(Pointer* ptr);
 
 VALUE
@@ -54,7 +50,7 @@ rbffi_Pointer_NewInstance(void* addr)
     p->memory.size = LONG_MAX;
     p->memory.flags = (addr == NULL) ? 0 : (MEM_RD | MEM_WR);
     p->memory.typeSize = 1;
-    p->parent = Qnil;
+    p->rbParent = Qnil;
 
     return obj;
 }
@@ -65,8 +61,8 @@ ptr_allocate(VALUE klass)
     Pointer* p;
     VALUE obj;
 
-    obj = Data_Make_Struct(klass, Pointer, ptr_mark, -1, p);
-    p->parent = Qnil;
+    obj = Data_Make_Struct(klass, Pointer, ptr_mark, ptr_release, p);
+    p->rbParent = Qnil;
     p->memory.flags = MEM_RD | MEM_WR;
 
     return obj;
@@ -107,7 +103,7 @@ ptr_initialize(int argc, VALUE* argv, VALUE self)
             if (rb_obj_is_kind_of(rbAddress, rbffi_PointerClass)) {
                 Pointer* orig;
 
-                p->parent = rbAddress;
+                p->rbParent = rbAddress;
                 Data_Get_Struct(rbAddress, Pointer, orig);
                 p->memory = orig->memory;
             } else {
@@ -121,6 +117,46 @@ ptr_initialize(int argc, VALUE* argv, VALUE self)
     return self;
 }
 
+static VALUE
+ptr_initialize_copy(VALUE self, VALUE other)
+{
+    AbstractMemory* src;
+    Pointer* dst;
+    
+    Data_Get_Struct(self, Pointer, dst);
+    src = POINTER(other);
+    if (src->size == LONG_MAX) {
+        rb_raise(rb_eRuntimeError, "cannot duplicate unbounded memory area");
+        return Qnil;
+    }
+    
+    if ((dst->memory.flags & (MEM_RD | MEM_WR)) != (MEM_RD | MEM_WR)) {
+        rb_raise(rb_eRuntimeError, "cannot duplicate unreadable/unwritable memory area");
+        return Qnil;
+    }
+
+    if (dst->storage != NULL) {
+        xfree(dst->storage);
+        dst->storage = NULL;
+    }
+
+    dst->storage = xmalloc(src->size + 7);
+    if (dst->storage == NULL) {
+        rb_raise(rb_eNoMemError, "failed to allocate memory size=%lu bytes", src->size);
+        return Qnil;
+    }
+    
+    dst->allocated = true;
+    dst->autorelease = true;
+    dst->memory.address = (void *) (((uintptr_t) dst->storage + 0x7) & (uintptr_t) ~0x7UL);
+    dst->memory.size = src->size;
+    dst->memory.typeSize = src->typeSize;
+    
+    // finally, copy the actual memory contents
+    memcpy(dst->memory.address, src->address, src->size);
+
+    return self;
+}
 
 static VALUE
 slice(VALUE self, long offset, long size)
@@ -130,7 +166,7 @@ slice(VALUE self, long offset, long size)
     VALUE retval;
     
     Data_Get_Struct(self, AbstractMemory, ptr);
-    checkBounds(ptr, offset, 1);
+    checkBounds(ptr, offset, size == LONG_MAX ? 1 : size);
 
     retval = Data_Make_Struct(rbffi_PointerClass, Pointer, ptr_mark, -1, p);
 
@@ -138,7 +174,7 @@ slice(VALUE self, long offset, long size)
     p->memory.size = size;
     p->memory.flags = ptr->flags;
     p->memory.typeSize = ptr->typeSize;
-    p->parent = self;
+    p->rbParent = self;
 
     return retval;
 }
@@ -252,10 +288,61 @@ ptr_order(int argc, VALUE* argv, VALUE self)
     }
 }
 
+
+static VALUE
+ptr_free(VALUE self)
+{
+    Pointer* ptr;
+
+    Data_Get_Struct(self, Pointer, ptr);
+
+    if (ptr->allocated) {
+        if (ptr->storage != NULL) {
+            xfree(ptr->storage);
+            ptr->storage = NULL;
+        }
+        ptr->allocated = false;
+    }
+
+    return self;
+}
+
+static VALUE
+ptr_autorelease(VALUE self, VALUE autorelease)
+{
+    Pointer* ptr;
+
+    Data_Get_Struct(self, Pointer, ptr);
+    ptr->autorelease = autorelease == Qtrue;
+
+    return autorelease;
+}
+
+static VALUE
+ptr_autorelease_p(VALUE self)
+{
+    Pointer* ptr;
+
+    Data_Get_Struct(self, Pointer, ptr);
+    
+    return ptr->autorelease ? Qtrue : Qfalse;
+}
+
+
+static void
+ptr_release(Pointer* ptr)
+{
+    if (ptr->autorelease && ptr->allocated && ptr->storage != NULL) {
+        xfree(ptr->storage);
+        ptr->storage = NULL;
+    }
+    xfree(ptr);
+}
+
 static void
 ptr_mark(Pointer* ptr)
 {
-    rb_gc_mark(ptr->parent);
+    rb_gc_mark(ptr->rbParent);
 }
 
 void
@@ -268,6 +355,7 @@ rbffi_Pointer_Init(VALUE moduleFFI)
 
     rb_define_alloc_func(rbffi_PointerClass, ptr_allocate);
     rb_define_method(rbffi_PointerClass, "initialize", ptr_initialize, -1);
+    rb_define_method(rbffi_PointerClass, "initialize_copy", ptr_initialize_copy, 1);
     rb_define_method(rbffi_PointerClass, "inspect", ptr_inspect, 0);
     rb_define_method(rbffi_PointerClass, "to_s", ptr_inspect, 0);
     rb_define_method(rbffi_PointerClass, "+", ptr_plus, 1);
@@ -277,6 +365,9 @@ rbffi_Pointer_Init(VALUE moduleFFI)
     rb_define_alias(rbffi_PointerClass, "to_i", "address");
     rb_define_method(rbffi_PointerClass, "==", ptr_equals, 1);
     rb_define_method(rbffi_PointerClass, "order", ptr_order, -1);
+    rb_define_method(rbffi_PointerClass, "autorelease=", ptr_autorelease, 1);
+    rb_define_method(rbffi_PointerClass, "autorelease?", ptr_autorelease_p, 0);
+    rb_define_method(rbffi_PointerClass, "free", ptr_free, 0);
 
     rbffi_NullPointerSingleton = rb_class_new_instance(1, &rbNullAddress, rbffi_PointerClass);
     rb_define_const(rbffi_PointerClass, "NULL", rbffi_NullPointerSingleton);

data/ext/ffi_c/Pointer.h

@@ -21,6 +21,8 @@
 #ifndef RBFFI_POINTER_H
 #define	RBFFI_POINTER_H
 
+#include <stdbool.h>
+
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -32,6 +34,13 @@ extern VALUE rbffi_Pointer_NewInstance(void* addr);
 extern VALUE rbffi_PointerClass;
 extern VALUE rbffi_NullPointerSingleton;
 
+typedef struct Pointer {
+    AbstractMemory memory;
+    VALUE rbParent;
+    char* storage; /* start of malloc area */
+    bool autorelease;
+    bool allocated;
+} Pointer;
 
 #ifdef	__cplusplus
 }

data/ext/ffi_c/Struct.c

@@ -118,6 +118,47 @@ struct_initialize(int argc, VALUE* argv, VALUE self)
     return self;
 }
 
+static VALUE
+struct_initialize_copy(VALUE self, VALUE other)
+{
+    Struct* src;
+    Struct* dst;
+    VALUE memargs[3];
+    
+    Data_Get_Struct(self, Struct, dst);
+    Data_Get_Struct(other, Struct, src);
+    if (dst == src) {
+        return self;
+    }
+    
+    dst->rbLayout = src->rbLayout;
+    dst->layout = src->layout;
+    
+    //
+    // A new MemoryPointer instance is allocated here instead of just calling 
+    // #dup on rbPointer, since the Pointer may not know its length, or may
+    // be longer than just this struct.
+    //
+    if (src->pointer->address != NULL) {
+        memargs[0] = INT2FIX(1);
+        memargs[1] = INT2FIX(src->layout->size);
+        memargs[2] = Qfalse;
+        dst->rbPointer = rb_class_new_instance(2, memargs, rbffi_MemoryPointerClass);
+        dst->pointer = MEMORY(dst->rbPointer);
+        memcpy(dst->pointer->address, src->pointer->address, src->layout->size);
+    } else {
+        dst->rbPointer = src->rbPointer;
+        dst->pointer = src->pointer;
+    }
+
+    if (src->layout->referenceFieldCount > 0) {
+        dst->rbReferences = ALLOC_N(VALUE, dst->layout->referenceFieldCount);
+        memcpy(dst->rbReferences, src->rbReferences, dst->layout->referenceFieldCount * sizeof(VALUE));
+    }
+        
+    return self;
+}
+
 static VALUE
 struct_class_layout(VALUE klass)
 {
@@ -444,7 +485,7 @@ inline_array_size(VALUE self)
 
     Data_Get_Struct(self, InlineArray, array);
 
-    return UINT2NUM(array->field->type->ffiType->size);
+    return UINT2NUM(((ArrayType *) array->field->type)->length);
 }
 
 static int
@@ -617,6 +658,7 @@ rbffi_Struct_Init(VALUE moduleFFI)
 
     rb_define_alloc_func(StructClass, struct_allocate);
     rb_define_method(StructClass, "initialize", struct_initialize, -1);
+    rb_define_method(StructClass, "initialize_copy", struct_initialize_copy, 1);
     rb_define_method(StructClass, "order", struct_order, -1);
     
     rb_define_alias(rb_singleton_class(StructClass), "alloc_in", "new");

data/ext/ffi_c/StructLayout.c

@@ -374,7 +374,8 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
         }
         rbName = rb_funcall2(rbField, rb_intern("name"), 0, NULL);
 
-        Data_Get_Struct(rbField, StructField, field = layout->fields[i]);
+        field = layout->fields[i];
+        Data_Get_Struct(rbField, StructField, field);
 
         if (field->type == NULL || field->type->ffiType == NULL) {
             rb_raise(rb_eRuntimeError, "type of field %d not supported", i);

data/lib/ffi/enum.rb

@@ -57,7 +57,6 @@ module FFI
     def initialize(info, tag=nil)
       @tag = tag
       @kv_map = Hash.new
-      @vk_map = Hash.new
       unless info.nil?
         last_cst = nil
         value = 0
@@ -65,16 +64,15 @@ module FFI
           case i
           when Symbol
             @kv_map[i] = value
-            @vk_map[value] = i
             last_cst = i
             value += 1
           when Integer
             @kv_map[last_cst] = i
-            @vk_map[i] = last_cst
             value = i+1
           end
         end
       end
+      @vk_map = Hash[@kv_map.map{|k,v| [v,k]}]
     end
 
     def symbols

data/lib/ffi/platform.rb

@@ -64,7 +64,7 @@ module FFI
     IS_OPENBSD = is_os("openbsd")
     IS_WINDOWS = is_os("windows")
     IS_BSD = IS_MAC || IS_FREEBSD || IS_OPENBSD
-    CONF_DIR = File.dirname(__FILE__)
+    CONF_DIR = File.join(File.dirname(__FILE__), 'platform', ARCH.to_s + "-" + OS.to_s)
     public
 
     

data/lib/ffi/platform/i386-darwin/types.conf

@@ -0,0 +1,100 @@
+rbx.platform.typedef.__int8_t = char
+rbx.platform.typedef.__uint8_t = uchar
+rbx.platform.typedef.__int16_t = short
+rbx.platform.typedef.__uint16_t = ushort
+rbx.platform.typedef.__int32_t = int
+rbx.platform.typedef.__uint32_t = uint
+rbx.platform.typedef.__int64_t = long_long
+rbx.platform.typedef.__uint64_t = ulong_long
+rbx.platform.typedef.__darwin_intptr_t = long
+rbx.platform.typedef.__darwin_natural_t = uint
+rbx.platform.typedef.__darwin_ct_rune_t = int
+rbx.platform.typedef.__darwin_ptrdiff_t = int
+rbx.platform.typedef.__darwin_size_t = ulong
+rbx.platform.typedef.__darwin_wchar_t = int
+rbx.platform.typedef.__darwin_rune_t = int
+rbx.platform.typedef.__darwin_wint_t = int
+rbx.platform.typedef.__darwin_clock_t = ulong
+rbx.platform.typedef.__darwin_socklen_t = uint
+rbx.platform.typedef.__darwin_ssize_t = long
+rbx.platform.typedef.__darwin_time_t = long
+rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.u_int8_t = uchar
+rbx.platform.typedef.int16_t = short
+rbx.platform.typedef.u_int16_t = ushort
+rbx.platform.typedef.int32_t = int
+rbx.platform.typedef.u_int32_t = uint
+rbx.platform.typedef.int64_t = long_long
+rbx.platform.typedef.u_int64_t = ulong_long
+rbx.platform.typedef.register_t = int
+rbx.platform.typedef.intptr_t = long
+rbx.platform.typedef.uintptr_t = ulong
+rbx.platform.typedef.user_addr_t = ulong_long
+rbx.platform.typedef.user_size_t = ulong_long
+rbx.platform.typedef.user_ssize_t = long_long
+rbx.platform.typedef.user_long_t = long_long
+rbx.platform.typedef.user_ulong_t = ulong_long
+rbx.platform.typedef.user_time_t = long_long
+rbx.platform.typedef.syscall_arg_t = ulong_long
+rbx.platform.typedef.__darwin_blkcnt_t = long_long
+rbx.platform.typedef.__darwin_blksize_t = int
+rbx.platform.typedef.__darwin_dev_t = int
+rbx.platform.typedef.__darwin_fsblkcnt_t = uint
+rbx.platform.typedef.__darwin_fsfilcnt_t = uint
+rbx.platform.typedef.__darwin_gid_t = uint
+rbx.platform.typedef.__darwin_id_t = uint
+rbx.platform.typedef.__darwin_ino64_t = ulong_long
+rbx.platform.typedef.__darwin_ino_t = ulong_long
+rbx.platform.typedef.__darwin_mach_port_name_t = uint
+rbx.platform.typedef.__darwin_mach_port_t = uint
+rbx.platform.typedef.__darwin_mode_t = ushort
+rbx.platform.typedef.__darwin_off_t = long_long
+rbx.platform.typedef.__darwin_pid_t = int
+rbx.platform.typedef.__darwin_pthread_key_t = ulong
+rbx.platform.typedef.__darwin_sigset_t = uint
+rbx.platform.typedef.__darwin_suseconds_t = int
+rbx.platform.typedef.__darwin_uid_t = uint
+rbx.platform.typedef.__darwin_useconds_t = uint
+rbx.platform.typedef.__darwin_uuid_t[16] = uchar
+rbx.platform.typedef.u_char = uchar
+rbx.platform.typedef.u_short = ushort
+rbx.platform.typedef.u_int = uint
+rbx.platform.typedef.u_long = ulong
+rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.uint = uint
+rbx.platform.typedef.u_quad_t = ulong_long
+rbx.platform.typedef.quad_t = long_long
+rbx.platform.typedef.qaddr_t = pointer
+rbx.platform.typedef.caddr_t = string
+rbx.platform.typedef.daddr_t = int
+rbx.platform.typedef.dev_t = int
+rbx.platform.typedef.fixpt_t = uint
+rbx.platform.typedef.blkcnt_t = long_long
+rbx.platform.typedef.blksize_t = int
+rbx.platform.typedef.gid_t = uint
+rbx.platform.typedef.in_addr_t = uint
+rbx.platform.typedef.in_port_t = ushort
+rbx.platform.typedef.ino_t = ulong_long
+rbx.platform.typedef.ino64_t = ulong_long
+rbx.platform.typedef.key_t = int
+rbx.platform.typedef.mode_t = ushort
+rbx.platform.typedef.nlink_t = ushort
+rbx.platform.typedef.id_t = uint
+rbx.platform.typedef.pid_t = int
+rbx.platform.typedef.off_t = long_long
+rbx.platform.typedef.segsz_t = int
+rbx.platform.typedef.swblk_t = int
+rbx.platform.typedef.uid_t = uint
+rbx.platform.typedef.clock_t = ulong
+rbx.platform.typedef.size_t = ulong
+rbx.platform.typedef.ssize_t = long
+rbx.platform.typedef.time_t = long
+rbx.platform.typedef.useconds_t = uint
+rbx.platform.typedef.suseconds_t = int
+rbx.platform.typedef.fd_mask = int
+rbx.platform.typedef.pthread_key_t = ulong
+rbx.platform.typedef.fsblkcnt_t = uint
+rbx.platform.typedef.fsfilcnt_t = uint
+rbx.platform.typedef.sa_family_t = uchar
+rbx.platform.typedef.socklen_t = uint
+rbx.platform.typedef.rlim_t = ulong_long

data/lib/ffi/platform/i386-linux/types.conf

@@ -0,0 +1,100 @@
+rbx.platform.typedef.__u_char = uchar
+rbx.platform.typedef.__u_short = ushort
+rbx.platform.typedef.__u_int = uint
+rbx.platform.typedef.__u_long = ulong
+rbx.platform.typedef.__int8_t = char
+rbx.platform.typedef.__uint8_t = uchar
+rbx.platform.typedef.__int16_t = short
+rbx.platform.typedef.__uint16_t = ushort
+rbx.platform.typedef.__int32_t = int
+rbx.platform.typedef.__uint32_t = uint
+rbx.platform.typedef.__int64_t = long_long
+rbx.platform.typedef.__uint64_t = ulong_long
+rbx.platform.typedef.__quad_t = long_long
+rbx.platform.typedef.__u_quad_t = ulong_long
+rbx.platform.typedef.__dev_t = ulong_long
+rbx.platform.typedef.__uid_t = uint
+rbx.platform.typedef.__gid_t = uint
+rbx.platform.typedef.__ino_t = ulong
+rbx.platform.typedef.__ino64_t = ulong_long
+rbx.platform.typedef.__mode_t = uint
+rbx.platform.typedef.__nlink_t = uint
+rbx.platform.typedef.__off_t = long
+rbx.platform.typedef.__off64_t = long_long
+rbx.platform.typedef.__pid_t = int
+rbx.platform.typedef.__clock_t = long
+rbx.platform.typedef.__rlim_t = ulong
+rbx.platform.typedef.__rlim64_t = ulong_long
+rbx.platform.typedef.__id_t = uint
+rbx.platform.typedef.__time_t = long
+rbx.platform.typedef.__useconds_t = uint
+rbx.platform.typedef.__suseconds_t = long
+rbx.platform.typedef.__daddr_t = int
+rbx.platform.typedef.__swblk_t = long
+rbx.platform.typedef.__key_t = int
+rbx.platform.typedef.__clockid_t = int
+rbx.platform.typedef.__timer_t = pointer
+rbx.platform.typedef.__blksize_t = long
+rbx.platform.typedef.__blkcnt_t = long
+rbx.platform.typedef.__blkcnt64_t = long_long
+rbx.platform.typedef.__fsblkcnt_t = ulong
+rbx.platform.typedef.__fsblkcnt64_t = ulong_long
+rbx.platform.typedef.__fsfilcnt_t = ulong
+rbx.platform.typedef.__fsfilcnt64_t = ulong_long
+rbx.platform.typedef.__ssize_t = int
+rbx.platform.typedef.__loff_t = long_long
+rbx.platform.typedef.*__qaddr_t = long_long
+rbx.platform.typedef.*__caddr_t = char
+rbx.platform.typedef.__intptr_t = int
+rbx.platform.typedef.__socklen_t = uint
+rbx.platform.typedef.u_char = uchar
+rbx.platform.typedef.u_short = ushort
+rbx.platform.typedef.u_int = uint
+rbx.platform.typedef.u_long = ulong
+rbx.platform.typedef.quad_t = long_long
+rbx.platform.typedef.u_quad_t = ulong_long
+rbx.platform.typedef.loff_t = long_long
+rbx.platform.typedef.ino_t = ulong_long
+rbx.platform.typedef.dev_t = ulong_long
+rbx.platform.typedef.gid_t = uint
+rbx.platform.typedef.mode_t = uint
+rbx.platform.typedef.nlink_t = uint
+rbx.platform.typedef.uid_t = uint
+rbx.platform.typedef.off_t = long_long
+rbx.platform.typedef.pid_t = int
+rbx.platform.typedef.id_t = uint
+rbx.platform.typedef.ssize_t = int
+rbx.platform.typedef.daddr_t = int
+rbx.platform.typedef.key_t = int
+rbx.platform.typedef.time_t = long
+rbx.platform.typedef.clockid_t = int
+rbx.platform.typedef.timer_t = pointer
+rbx.platform.typedef.size_t = uint
+rbx.platform.typedef.ulong = ulong
+rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.uint = uint
+rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.int16_t = short
+rbx.platform.typedef.int32_t = int
+rbx.platform.typedef.int64_t = long_long
+rbx.platform.typedef.u_int8_t = uchar
+rbx.platform.typedef.u_int16_t = ushort
+rbx.platform.typedef.u_int32_t = uint
+rbx.platform.typedef.u_int64_t = ulong_long
+rbx.platform.typedef.register_t = long
+rbx.platform.typedef.__sig_atomic_t = int
+rbx.platform.typedef.suseconds_t = long
+rbx.platform.typedef.__fd_mask = long
+rbx.platform.typedef.fd_mask = long
+rbx.platform.typedef.blkcnt_t = long_long
+rbx.platform.typedef.fsblkcnt_t = ulong_long
+rbx.platform.typedef.fsfilcnt_t = ulong_long
+rbx.platform.typedef.pthread_t = ulong
+rbx.platform.typedef.pthread_key_t = uint
+rbx.platform.typedef.pthread_once_t = int
+rbx.platform.typedef.socklen_t = uint
+rbx.platform.typedef.sa_family_t = ushort
+rbx.platform.typedef.rlim_t = ulong_long
+rbx.platform.typedef.__rlimit_resource_t = int
+rbx.platform.typedef.__rusage_who_t = int
+rbx.platform.typedef.__priority_which_t = int