ffi 1.0.7 → 1.0.9

data/Rakefile

@@ -75,7 +75,7 @@ PROJ.name = 'ffi'
 PROJ.authors = 'Wayne Meissner'
 PROJ.email = 'wmeissner@gmail.com'
 PROJ.url = 'http://wiki.github.com/ffi/ffi'
-PROJ.version = '1.0.7'
+PROJ.version = '1.0.9'
 PROJ.rubyforge.name = 'ffi'
 PROJ.readme_file = 'README.rdoc'
 
@@ -93,7 +93,7 @@ PROJ.gem.platform = Gem::Platform::RUBY
 #PROJ.gem.required_ruby_version = ">= 1.9.2"
 
 # Override Mr. Bones autogenerated extensions and force ours in
-PROJ.gem.extras['extensions'] = %w(ext/ffi_c/extconf.rb gen/Rakefile)
+PROJ.gem.extras['extensions'] = %w(ext/ffi_c/extconf.rb)
 #PROJ.gem.extras['required_ruby_version'] = ">= 1.9.2"
 
 # RDoc
@@ -110,7 +110,7 @@ PROJ.spec.opts << '--color' << '-fs'
 
 # Dependencies
 
-depend_on 'rake', '>=0.8.7'
+#depend_on 'rake', '>=0.8.7'
 
 TEST_DEPS = [ LIBTEST ]
 if RUBY_PLATFORM == "java"

data/ext/ffi_c/AbstractMemory.c

@@ -165,7 +165,7 @@ SWAPU16(uint16_t x)
     return bswap16(x);
 }
 
-#if !defined(__GNUC__) || __GNUC__ < 4
+#if !defined(__GNUC__) || (__GNUC__ < 4) || (__GNUC__ == 4 && __GNUC_MINOR__ < 3)
 #define bswap32(x) \
        (((x << 24) & 0xff000000) | \
         ((x <<  8) & 0x00ff0000) | \
@@ -243,7 +243,7 @@ get_pointer_value(VALUE value)
     } else if (type == T_NIL) {
         return NULL;
     } else if (type == T_FIXNUM) {
-        return (void *) (uintptr_t) FIX2INT(value);
+        return (void *) (uintptr_t) FIX2ULONG(value);
     } else if (type == T_BIGNUM) {
         return (void *) (uintptr_t) NUM2ULL(value);
     } else if (rb_respond_to(value, id_to_ptr)) {
@@ -333,6 +333,21 @@ memory_get_array_of_string(int argc, VALUE* argv, VALUE self)
     return retVal;
 }
 
+static VALUE 
+memory_read_array_of_string(int argc, VALUE* argv, VALUE self)
+{
+    VALUE* rargv = ALLOCA_N(VALUE, argc + 1);
+    int i;
+
+    rargv[0] = INT2FIX(0);
+    for (i = 0; i < argc; i++) {
+        rargv[i + 1] = argv[i];
+    }
+
+    return memory_get_array_of_string(argc + 1, rargv, self);
+}
+
+
 static VALUE
 memory_put_string(VALUE self, VALUE offset, VALUE str)
 {
@@ -406,6 +421,26 @@ memory_put_bytes(int argc, VALUE* argv, VALUE self)
     return self;
 }
 
+static VALUE 
+memory_read_bytes(VALUE self, VALUE length)
+{
+    return memory_get_bytes(self, INT2FIX(0), length);
+}
+
+static VALUE 
+memory_write_bytes(int argc, VALUE* argv, VALUE self)
+{
+    VALUE* wargv = ALLOCA_N(VALUE, argc + 1);
+    int i;
+
+    wargv[0] = INT2FIX(0);
+    for (i = 0; i < argc; i++) {
+        wargv[i + 1] = argv[i];
+    }
+
+    return memory_put_bytes(argc + 1, wargv, self);
+}
+
 static VALUE
 memory_type_size(VALUE self)
 {
@@ -495,7 +530,7 @@ MemoryOps rbffi_AbstractMemoryOps = {
     .int64 = &memory_op_int64,
     .uint64 = &memory_op_uint64,
     .slong = &memory_op_long,
-    .ulong = &memory_op_ulong,
+    .uslong = &memory_op_ulong,
     .float32 = &memory_op_float32,
     .float64 = &memory_op_float64,
     .pointer = &memory_op_pointer,
@@ -599,6 +634,8 @@ rbffi_AbstractMemory_Init(VALUE moduleFFI)
     rb_define_method(classMemory, "put_string", memory_put_string, 2);
     rb_define_method(classMemory, "get_bytes", memory_get_bytes, 2);
     rb_define_method(classMemory, "put_bytes", memory_put_bytes, -1);
+    rb_define_method(classMemory, "read_bytes", memory_read_bytes, 1);
+    rb_define_method(classMemory, "write_bytes", memory_write_bytes, -1);
     rb_define_method(classMemory, "get_array_of_string", memory_get_array_of_string, -1);
 
     rb_define_method(classMemory, "clear", memory_clear, 0);

data/ext/ffi_c/AbstractMemory.h

@@ -55,7 +55,7 @@ typedef struct {
     MemoryOp* int64;
     MemoryOp* uint64;
     MemoryOp* slong;
-    MemoryOp* ulong;
+    MemoryOp* uslong;
     MemoryOp* float32;
     MemoryOp* float64;
     MemoryOp* pointer;
@@ -127,7 +127,7 @@ get_memory_op(Type* type)
         case NATIVE_LONG:
             return rbffi_AbstractMemoryOps.slong;
         case NATIVE_ULONG:
-            return rbffi_AbstractMemoryOps.ulong;
+            return rbffi_AbstractMemoryOps.uslong;
         case NATIVE_FLOAT32:
             return rbffi_AbstractMemoryOps.float32;
         case NATIVE_FLOAT64:

data/ext/ffi_c/Buffer.c

@@ -97,6 +97,33 @@ buffer_initialize(int argc, VALUE* argv, VALUE self)
     return self;
 }
 
+static VALUE
+buffer_initialize_copy(VALUE self, VALUE other)
+{
+    AbstractMemory* src;
+    Buffer* dst;
+    
+    Data_Get_Struct(self, Buffer, dst);
+    src = rbffi_AbstractMemory_Cast(other, BufferClass);
+    if (dst->storage != NULL) {
+        xfree(dst->storage);
+    }
+    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->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 buffer contents
+    memcpy(dst->memory.address, src->address, src->size);
+
+    return self;
+}
+
 static VALUE
 buffer_alloc_inout(int argc, VALUE* argv, VALUE klass)
 {
@@ -235,6 +262,7 @@ rbffi_Buffer_Init(VALUE moduleFFI)
     rb_define_alias(rb_singleton_class(BufferClass), "new_inout", "alloc_inout");
     
     rb_define_method(BufferClass, "initialize", buffer_initialize, -1);
+    rb_define_method(BufferClass, "initialize_copy", buffer_initialize_copy, 1);
     rb_define_method(BufferClass, "order", buffer_order, -1);
     rb_define_method(BufferClass, "inspect", buffer_inspect, 0);
     rb_define_alias(BufferClass, "length", "total");

data/ext/ffi_c/DynamicLibrary.c

@@ -37,7 +37,7 @@
 #include "DynamicLibrary.h"
 
 typedef struct LibrarySymbol_ {
-    AbstractMemory memory;
+    Pointer base;
     VALUE library;
     VALUE name;
 } LibrarySymbol;
@@ -163,20 +163,29 @@ symbol_allocate(VALUE klass)
     VALUE obj = Data_Make_Struct(klass, LibrarySymbol, NULL, -1, sym);
     sym->name = Qnil;
     sym->library = Qnil;
+    sym->base.rbParent = Qnil;
 
     return obj;
 }
 
+
+static VALUE
+symbol_initialize_copy(VALUE self, VALUE other)
+{
+    rb_raise(rb_eRuntimeError, "cannot duplicate symbol");
+    return Qnil;
+}
+
 static VALUE
 symbol_new(VALUE library, void* address, VALUE name)
 {
     LibrarySymbol* sym;
     VALUE obj = Data_Make_Struct(SymbolClass, LibrarySymbol, symbol_mark, -1, sym);
 
-    sym->memory.address = address;
-    sym->memory.size = LONG_MAX;
-    sym->memory.typeSize = 1;
-    sym->memory.flags = MEM_RD | MEM_WR;
+    sym->base.memory.address = address;
+    sym->base.memory.size = LONG_MAX;
+    sym->base.memory.typeSize = 1;
+    sym->base.memory.flags = MEM_RD | MEM_WR;
     sym->library = library;
     sym->name = name;
 
@@ -198,7 +207,7 @@ symbol_inspect(VALUE self)
 
     Data_Get_Struct(self, LibrarySymbol, sym);
     snprintf(buf, sizeof(buf), "#<FFI::Library::Symbol name=%s address=%p>",
-             StringValueCStr(sym->name), sym->memory.address);
+             StringValueCStr(sym->name), sym->base.memory.address);
     return rb_str_new2(buf);
 }
 
@@ -224,6 +233,8 @@ rbffi_DynamicLibrary_Init(VALUE moduleFFI)
     rb_define_alloc_func(SymbolClass, symbol_allocate);
     rb_undef_method(SymbolClass, "new");
     rb_define_method(SymbolClass, "inspect", symbol_inspect, 0);
+    rb_define_method(SymbolClass, "initialize_copy", symbol_initialize_copy, 1);
+    
 
 #define DEF(x) rb_define_const(LibraryClass, "RTLD_" #x, UINT2NUM(RTLD_##x))
     DEF(LAZY);

data/ext/ffi_c/Function.c

@@ -53,7 +53,7 @@
 #include "Thread.h"
 
 typedef struct Function_ {
-    AbstractMemory memory;
+    Pointer base;
     FunctionType* info;
     MethodHandle* methodHandle;
     bool autorelease;
@@ -131,8 +131,8 @@ function_allocate(VALUE klass)
 
     obj = Data_Make_Struct(klass, Function, function_mark, function_free, fn);
 
-    fn->memory.flags = MEM_RD;
-
+    fn->base.memory.flags = MEM_RD;
+    fn->base.rbParent = Qnil;
     fn->rbProc = Qnil;
     fn->rbFunctionInfo = Qnil;
     fn->autorelease = true;
@@ -143,6 +143,7 @@ function_allocate(VALUE klass)
 static void
 function_mark(Function *fn)
 {
+    rb_gc_mark(fn->base.rbParent);
     rb_gc_mark(fn->rbProc);
     rb_gc_mark(fn->rbFunctionInfo);
 }
@@ -201,6 +202,13 @@ function_initialize(int argc, VALUE* argv, VALUE self)
     return self;
 }
 
+static VALUE
+function_initialize_copy(VALUE self, VALUE other)
+{
+    rb_raise(rb_eRuntimeError, "cannot duplicate function instances");
+    return Qnil;
+}
+
 VALUE
 rbffi_Function_NewInstance(VALUE rbFunctionInfo, VALUE rbProc)
 {
@@ -254,9 +262,10 @@ function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc)
     Data_Get_Struct(fn->rbFunctionInfo, FunctionType, fn->info);
 
     if (rb_obj_is_kind_of(rbProc, rbffi_PointerClass)) {
-        AbstractMemory* memory;
-        Data_Get_Struct(rbProc, AbstractMemory, memory);
-        fn->memory = *memory;
+        Pointer* orig;
+        Data_Get_Struct(rbProc, Pointer, orig);
+        fn->base.memory = orig->memory;
+        fn->base.rbParent = rbProc;
 
     } else if (rb_obj_is_kind_of(rbProc, rb_cProc) || rb_respond_to(rbProc, id_call)) {
         if (fn->info->closurePool == NULL) {
@@ -280,8 +289,8 @@ function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc)
 
         fn->closure = rbffi_Closure_Alloc(fn->info->closurePool);
         fn->closure->info = fn;
-        fn->memory.address = fn->closure->code;
-        fn->memory.size = sizeof(*fn->closure);
+        fn->base.memory.address = fn->closure->code;
+        fn->base.memory.size = sizeof(*fn->closure);
         fn->autorelease = true;
 
     } else {
@@ -301,7 +310,7 @@ function_call(int argc, VALUE* argv, VALUE self)
 
     Data_Get_Struct(self, Function, fn);
 
-    return (*fn->info->invoke)(argc, argv, fn->memory.address, fn->info);
+    return (*fn->info->invoke)(argc, argv, fn->base.memory.address, fn->info);
 }
 
 static VALUE
@@ -323,7 +332,7 @@ function_attach(VALUE self, VALUE module, VALUE name)
     }
 
     if (fn->methodHandle == NULL) {
-        fn->methodHandle = rbffi_MethodHandle_Alloc(fn->info, fn->memory.address);
+        fn->methodHandle = rbffi_MethodHandle_Alloc(fn->info, fn->base.memory.address);
     }
 
     //
@@ -819,6 +828,7 @@ rbffi_Function_Init(VALUE moduleFFI)
     rb_define_alloc_func(rbffi_FunctionClass, function_allocate);
 
     rb_define_method(rbffi_FunctionClass, "initialize", function_initialize, -1);
+    rb_define_method(rbffi_FunctionClass, "initialize_copy", function_initialize_copy, 1);
     rb_define_method(rbffi_FunctionClass, "call", function_call, -1);
     rb_define_method(rbffi_FunctionClass, "attach", function_attach, 2);
     rb_define_method(rbffi_FunctionClass, "free", function_release, 0);

data/ext/ffi_c/MemoryPointer.c

@@ -28,15 +28,10 @@
 #include "Pointer.h"
 #include "MemoryPointer.h"
 
-typedef struct MemoryPointer {
-    AbstractMemory memory;
-    char* storage; /* start of malloc area */
-    bool autorelease;
-    bool allocated;
-} MemoryPointer;
 
 static VALUE memptr_allocate(VALUE klass);
-static void memptr_release(MemoryPointer* ptr);
+static void memptr_mark(Pointer* ptr);
+static void memptr_release(Pointer* ptr);
 static VALUE memptr_malloc(VALUE self, long size, long count, bool clear);
 static VALUE memptr_free(VALUE self);
 
@@ -53,8 +48,9 @@ rbffi_MemoryPointer_NewInstance(long size, long count, bool clear)
 static VALUE
 memptr_allocate(VALUE klass)
 {
-    MemoryPointer* p;
-    VALUE obj = Data_Make_Struct(klass, MemoryPointer, NULL, memptr_release, p);
+    Pointer* p;
+    VALUE obj = Data_Make_Struct(klass, Pointer, NULL, memptr_release, p);
+    p->rbParent = Qnil;
     p->memory.flags = MEM_RD | MEM_WR;
 
     return obj;
@@ -79,10 +75,10 @@ memptr_initialize(int argc, VALUE* argv, VALUE self)
 static VALUE
 memptr_malloc(VALUE self, long size, long count, bool clear)
 {
-    MemoryPointer* p;
+    Pointer* p;
     unsigned long msize;
 
-    Data_Get_Struct(self, MemoryPointer, p);
+    Data_Get_Struct(self, Pointer, p);
 
     msize = size * count;
 
@@ -108,9 +104,9 @@ memptr_malloc(VALUE self, long size, long count, bool clear)
 static VALUE
 memptr_free(VALUE self)
 {
-    MemoryPointer* ptr;
+    Pointer* ptr;
 
-    Data_Get_Struct(self, MemoryPointer, ptr);
+    Data_Get_Struct(self, Pointer, ptr);
 
     if (ptr->allocated) {
         if (ptr->storage != NULL) {
@@ -123,19 +119,8 @@ memptr_free(VALUE self)
     return self;
 }
 
-static VALUE
-memptr_autorelease(VALUE self, VALUE autorelease)
-{
-    MemoryPointer* ptr;
-
-    Data_Get_Struct(self, MemoryPointer, ptr);
-    ptr->autorelease = autorelease == Qtrue;
-
-    return autorelease;
-}
-
 static void
-memptr_release(MemoryPointer* ptr)
+memptr_release(Pointer* ptr)
 {
     if (ptr->autorelease && ptr->allocated && ptr->storage != NULL) {
         xfree(ptr->storage);
@@ -144,6 +129,13 @@ memptr_release(MemoryPointer* ptr)
     xfree(ptr);
 }
 
+static void
+memptr_mark(Pointer* ptr)
+{
+    rb_gc_mark(ptr->rbParent);
+}
+
+
 void
 rbffi_MemoryPointer_Init(VALUE moduleFFI)
 {
@@ -152,7 +144,5 @@ rbffi_MemoryPointer_Init(VALUE moduleFFI)
 
     rb_define_alloc_func(rbffi_MemoryPointerClass, memptr_allocate);
     rb_define_method(rbffi_MemoryPointerClass, "initialize", memptr_initialize, -1);
-    rb_define_method(rbffi_MemoryPointerClass, "autorelease=", memptr_autorelease, 1);
-    rb_define_method(rbffi_MemoryPointerClass, "free", memptr_free, 0);
 }
 

data/ext/ffi_c/Platform.c

@@ -34,14 +34,17 @@ static VALUE PlatformModule = Qnil;
  * system installed ruby incorrectly reports 'host_cpu' as 'powerpc' when running
  * on intel.
  */
-#ifdef __i386__
+#if defined(__x86_64__) || defined(__x86_64) || defined(__amd64)
+# define CPU "x86_64"
+
+#elif defined(__i386__) || defined(__i386)
 # define CPU "i386"
 
-#elif defined(__ppc__) || defined(__powerpc__)
-# define CPU "powerpc"
+#elif defined(__ppc64__) || defined(__powerpc64__)
+# define CPU "ppc64"
 
-#elif defined(__x86_64__)
-# define CPU "x86_64"
+#elif defined(__ppc__) || defined(__powerpc__) || defined(__powerpc)
+# define CPU "ppc"
 
 /* Need to check for __sparcv9 first, because __sparc will be defined either way. */
 #elif defined(__sparcv9__) || defined(__sparcv9)
@@ -50,10 +53,17 @@ static VALUE PlatformModule = Qnil;
 #elif defined(__sparc__) || defined(__sparc)
 # define CPU "sparc"
 
-#elif defined(__arm__)
+#elif defined(__arm__) || defined(__arm)
 # define CPU "arm"
+
+#elif defined(__mips__) || defined(__mips)
+# define CPU "mips"
+
+#elif defined(__s390__)
+# define CPU "s390"
+
 #else
-# error "Unknown cpu type"
+# define CPU "unknown"
 #endif
 
 static void