ffi 1.13.1 → 1.15.1

data/ext/ffi_c/Pointer.h

@@ -30,11 +30,7 @@
 #ifndef RBFFI_POINTER_H
 #define	RBFFI_POINTER_H
 
-#ifndef _MSC_VER
 # include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-#endif
 
 #ifdef	__cplusplus
 extern "C" {

data/ext/ffi_c/Struct.c

@@ -31,12 +31,9 @@
 #include <sys/types.h>
 #ifndef _MSC_VER
 # include <sys/param.h>
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
 #endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <ruby.h>
 #include "rbffi.h"
 #include "compat.h"
@@ -290,7 +287,7 @@ struct_field(Struct* s, VALUE fieldName)
         VALUE rbField = rb_hash_aref(layout->rbFieldMap, fieldName);
         if (unlikely(NIL_P(rbField))) {
             VALUE str = rb_funcall2(fieldName, id_to_s, 0, NULL);
-            rb_raise(rb_eArgError, "No such field '%s'", StringValuePtr(str));
+            rb_raise(rb_eArgError, "No such field '%s'", StringValueCStr(str));
         }
         /* Write the retrieved coder to the cache */
         p_ce->fieldName = fieldName;

data/ext/ffi_c/StructByValue.c

@@ -32,13 +32,8 @@
 #endif
 #include <sys/types.h>
 #include <stdio.h>
-#ifndef _MSC_VER
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <errno.h>
 #include <ruby.h>
 

data/ext/ffi_c/StructLayout.c

@@ -32,12 +32,9 @@
 
 #ifndef _MSC_VER
 # include <sys/param.h>
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
 #endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <ruby.h>
 #include "rbffi.h"
 #include "compat.h"
@@ -126,7 +123,6 @@ struct_field_initialize(int argc, VALUE* argv, VALUE self)
 
     switch (field->type->nativeType == NATIVE_MAPPED ? ((MappedType *) field->type)->type->nativeType : field->type->nativeType) {
         case NATIVE_FUNCTION:
-        case NATIVE_CALLBACK:
         case NATIVE_POINTER:
             field->referenceRequired = true;
             break;

data/ext/ffi_c/Thread.c

@@ -28,12 +28,7 @@
  */
 
 #include <stddef.h>
-#ifndef _MSC_VER
 #include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
 
 #if defined(__CYGWIN__) || !defined(_WIN32)
 # include <pthread.h>

data/ext/ffi_c/Thread.h

@@ -30,12 +30,7 @@
 #ifndef RBFFI_THREAD_H
 #define	RBFFI_THREAD_H
 
-#ifndef _MSC_VER
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
+#include <stdbool.h>
 #include <ruby.h>
 #include "extconf.h"
 

data/ext/ffi_c/Type.c

@@ -28,7 +28,7 @@
  */
 
 #ifndef _MSC_VER
-#include <sys/param.h>
+# include <sys/param.h>
 #endif
 
 #include <sys/types.h>

data/ext/ffi_c/Types.c

@@ -85,10 +85,9 @@ rbffi_NativeValue_ToRuby(Type* type, VALUE rbType, const void* ptr)
             return rbffi_Pointer_NewInstance(*(void **) ptr);
         case NATIVE_BOOL:
             return ((unsigned char) *(ffi_arg *) ptr) ? Qtrue : Qfalse;
-        
-        case NATIVE_FUNCTION:
-        case NATIVE_CALLBACK: {
-            return *(void **) ptr != NULL 
+
+        case NATIVE_FUNCTION: {
+            return *(void **) ptr != NULL
                     ? rbffi_Function_NewInstance(rbType, rbffi_Pointer_NewInstance(*(void **) ptr))
                     : Qnil;
         }
@@ -116,15 +115,15 @@ rbffi_NativeValue_ToRuby(Type* type, VALUE rbType, const void* ptr)
 
             values[0] = rbffi_NativeValue_ToRuby(m->type, m->rbType, ptr);
             values[1] = Qnil;
-            
+
 
             rbReturnValue = rb_funcall2(m->rbConverter, id_from_native, 2, values);
             RB_GC_GUARD(values[0]);
             RB_GC_GUARD(rbType);
-            
+
             return rbReturnValue;
         }
-    
+
         default:
             rb_raise(rb_eRuntimeError, "Unknown type: %d", type->nativeType);
             return Qnil;

data/ext/ffi_c/Types.h

@@ -51,20 +51,19 @@ typedef enum {
     NATIVE_FLOAT64,
     NATIVE_LONGDOUBLE,
     NATIVE_POINTER,
-    NATIVE_CALLBACK,
     NATIVE_FUNCTION,
     NATIVE_BUFFER_IN,
     NATIVE_BUFFER_OUT,
     NATIVE_BUFFER_INOUT,
     NATIVE_CHAR_ARRAY,
     NATIVE_BOOL,
-    
+
     /** An immutable string.  Nul terminated, but only copies in to the native function */
     NATIVE_STRING,
-    
+
     /** The function takes a variable number of arguments */
     NATIVE_VARARGS,
-    
+
     /** Struct-by-value param or result */
     NATIVE_STRUCT,
 

data/ext/ffi_c/Variadic.c

@@ -33,13 +33,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifndef _MSC_VER
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <ruby.h>
 
 #include <ffi.h>
@@ -173,7 +168,8 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     ffi_type* ffiReturnType;
     Type** paramTypes;
     VALUE* argv;
-    int paramCount = 0, fixedCount = 0, i;
+    VALUE* callbackParameters;
+    int paramCount = 0, fixedCount = 0, callbackCount = 0, i;
     ffi_status ffiStatus;
     rbffi_frame_t frame = { 0 };
 
@@ -187,6 +183,7 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     params = ALLOCA_N(FFIStorage, paramCount);
     ffiValues = ALLOCA_N(void*, paramCount);
     argv = ALLOCA_N(VALUE, paramCount);
+    callbackParameters = ALLOCA_N(VALUE, paramCount);
     retval = alloca(MAX(invoker->returnType->ffiType->size, FFI_SIZEOF_ARG));
 
     for (i = 0; i < paramCount; ++i) {
@@ -216,6 +213,14 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
                 Data_Get_Struct(rbType, Type, paramTypes[i]);
                 break;
 
+            case NATIVE_FUNCTION:
+                if (!rb_obj_is_kind_of(rbType, rbffi_FunctionTypeClass)) {
+                    VALUE typeName = rb_funcall2(rbType, rb_intern("inspect"), 0, NULL);
+                    rb_raise(rb_eTypeError, "Incorrect parameter type (%s)", RSTRING_PTR(typeName));
+                }
+                callbackParameters[callbackCount++] = rbType;
+                break;
+
             default:
                 break;
         }
@@ -253,7 +258,7 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     }
 
     rbffi_SetupCallParams(paramCount, argv, -1, paramTypes, params,
-        ffiValues, NULL, 0, invoker->rbEnums);
+        ffiValues, callbackParameters, callbackCount, invoker->rbEnums);
 
     rbffi_frame_push(&frame);
 

data/ext/ffi_c/extconf.rb

@@ -50,6 +50,19 @@ if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   else
     $defs << "-DHAVE_FFI_PREP_CIF_VAR"
     $defs << "-DUSE_INTERNAL_LIBFFI"
+
+    # Ensure libffi symbols aren't exported when using static libffi.
+    # This is to avoid interference with other gems like fiddle.
+    # See https://github.com/ffi/ffi/issues/835
+    append_ldflags "-Wl,--exclude-libs,ALL"
+  end
+
+  # Some linux archs need explicit linking to pthread, see https://github.com/ffi/ffi/issues/893
+  append_ldflags "-pthread"
+
+  ffi_alloc_default = RbConfig::CONFIG['host_os'] =~ /darwin/i && RbConfig::CONFIG['host'] =~ /arm|aarch64/i
+  if enable_config('libffi-alloc', ffi_alloc_default)
+    $defs << "-DUSE_FFI_ALLOC"
   end
 
   $defs << "-DHAVE_EXTCONF_H" if $defs.empty? # needed so create_header works
@@ -60,13 +73,16 @@ if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   unless system_libffi
     File.open("Makefile", "a") do |mf|
       mf.puts "LIBFFI_HOST=--host=#{RbConfig::CONFIG['host_alias']}" if RbConfig::CONFIG.has_key?("host_alias")
-      if RbConfig::CONFIG['host_os'].downcase =~ /darwin/
+      if RbConfig::CONFIG['host_os'] =~ /darwin/i
+        if RbConfig::CONFIG['host'] =~ /arm|aarch64/i
+          mf.puts "LIBFFI_HOST=--host=aarch64-apple-#{RbConfig::CONFIG['host_os']}"
+        end
         mf.puts "include ${srcdir}/libffi.darwin.mk"
-      elsif RbConfig::CONFIG['host_os'].downcase =~ /bsd/
+      elsif RbConfig::CONFIG['host_os'] =~ /bsd/i
         mf.puts '.include "${srcdir}/libffi.bsd.mk"'
-      elsif RbConfig::CONFIG['host_os'].downcase =~ /mswin64/
+      elsif RbConfig::CONFIG['host_os'] =~ /mswin64/i
         mf.puts '!include $(srcdir)/libffi.vc64.mk'
-      elsif RbConfig::CONFIG['host_os'].downcase =~ /mswin32/
+      elsif RbConfig::CONFIG['host_os'] =~ /mswin32/i
         mf.puts '!include $(srcdir)/libffi.vc.mk'
       else
         mf.puts "include ${srcdir}/libffi.mk"

data/ext/ffi_c/libffi/.travis/bfin-sim.exp

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, MA 02110, USA.
 
 # This is a list of toolchains that are supported on this board.
 set_board_info target_install {bfin-elf}

data/ext/ffi_c/libffi/.travis/m32r-sim.exp

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, MA 02110, USA.
 
 # This is a list of toolchains that are supported on this board.
 set_board_info target_install {m32r-elf}

data/ext/ffi_c/libffi/.travis/moxie-sim.exp

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, MA 02110, USA.
 
 # This is a list of toolchains that are supported on this board.
 set_board_info target_install {moxie-elf}

data/ext/ffi_c/libffi/.travis/or1k-sim.exp

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, MA 02110, USA.
 
 # This is a list of toolchains that are supported on this board.
 set_board_info target_install {or1k-elf}

data/ext/ffi_c/libffi/.travis/powerpc-eabisim.exp

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, MA 02110, USA.
 
 # This is a list of toolchains that are supported on this board.
 set_board_info target_install {powerpc-eabisim}

data/ext/ffi_c/libffi/.travis/wine-sim.exp

@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, MA 02110, USA.
 
 # This is a list of toolchains that are supported on this board.
 set_board_info target_install {i686-w64-mingw32}

data/ext/ffi_c/libffi/Makefile.am

@@ -44,65 +44,55 @@ if FFI_DEBUG
 libffi_la_SOURCES += src/debug.c
 endif
 
-noinst_HEADERS = \
-	src/aarch64/ffitarget.h src/aarch64/internal.h			\
+noinst_HEADERS = src/aarch64/ffitarget.h src/aarch64/internal.h		\
 	src/alpha/ffitarget.h src/alpha/internal.h			\
-	src/arc/ffitarget.h						\
-	src/arm/ffitarget.h src/arm/internal.h				\
-	src/avr32/ffitarget.h						\
-	src/bfin/ffitarget.h						\
-	src/cris/ffitarget.h						\
-	src/frv/ffitarget.h						\
+	src/arc/ffitarget.h src/arm/ffitarget.h src/arm/internal.h	\
+	src/avr32/ffitarget.h src/bfin/ffitarget.h			\
+	src/cris/ffitarget.h src/csky/ffitarget.h src/frv/ffitarget.h	\
 	src/ia64/ffitarget.h src/ia64/ia64_flags.h			\
-	src/m32r/ffitarget.h						\
-	src/m68k/ffitarget.h						\
-	src/m88k/ffitarget.h						\
-	src/metag/ffitarget.h						\
-	src/microblaze/ffitarget.h					\
-	src/mips/ffitarget.h						\
-	src/moxie/ffitarget.h						\
-	src/nios2/ffitarget.h						\
-	src/or1k/ffitarget.h						\
-	src/pa/ffitarget.h						\
-	src/powerpc/ffitarget.h src/powerpc/asm.h src/powerpc/ffi_powerpc.h \
-	src/riscv/ffitarget.h						\
-	src/s390/ffitarget.h src/s390/internal.h			\
-	src/sh/ffitarget.h						\
-	src/sh64/ffitarget.h						\
-	src/sparc/ffitarget.h src/sparc/internal.h			\
-	src/tile/ffitarget.h						\
-	src/vax/ffitarget.h						\
-	src/x86/ffitarget.h src/x86/internal.h src/x86/internal64.h src/x86/asmnames.h \
-	src/xtensa/ffitarget.h						\
-	src/dlmalloc.c
-
-EXTRA_libffi_la_SOURCES = src/aarch64/ffi.c src/aarch64/sysv.S \
-	src/aarch64/win64_armasm.S src/alpha/ffi.c src/alpha/osf.S \
-	src/arc/ffi.c src/arc/arcompact.S src/arm/ffi.c	\
-	src/arm/sysv.S src/arm/ffi.c src/arm/sysv_msvc_arm32.S \
-	src/avr32/ffi.c src/avr32/sysv.S src/bfin/ffi.c	\
-	src/bfin/sysv.S src/cris/ffi.c src/cris/sysv.S src/frv/ffi.c \
-	src/frv/eabi.S src/ia64/ffi.c src/ia64/unix.S src/m32r/ffi.c \
-	src/m32r/sysv.S src/m68k/ffi.c src/m68k/sysv.S src/m88k/ffi.c \
-	src/m88k/obsd.S src/metag/ffi.c src/metag/sysv.S \
-	src/microblaze/ffi.c src/microblaze/sysv.S src/mips/ffi.c \
-	src/mips/o32.S src/mips/n32.S src/moxie/ffi.c \
-	src/moxie/eabi.S src/nios2/ffi.c src/nios2/sysv.S \
-	src/or1k/ffi.c src/or1k/sysv.S src/pa/ffi.c src/pa/linux.S \
-	src/pa/hpux32.S src/powerpc/ffi.c src/powerpc/ffi_sysv.c \
-	src/powerpc/ffi_linux64.c src/powerpc/sysv.S \
-	src/powerpc/linux64.S src/powerpc/linux64_closure.S \
-	src/powerpc/ppc_closure.S src/powerpc/aix.S \
-	src/powerpc/darwin.S src/powerpc/aix_closure.S \
-	src/powerpc/darwin_closure.S src/powerpc/ffi_darwin.c \
-	src/riscv/ffi.c src/riscv/sysv.S src/s390/ffi.c	\
-	src/s390/sysv.S src/sh/ffi.c src/sh/sysv.S src/sh64/ffi.c \
-	src/sh64/sysv.S src/sparc/ffi.c src/sparc/ffi64.c \
-	src/sparc/v8.S src/sparc/v9.S src/tile/ffi.c src/tile/tile.S \
-	src/vax/ffi.c src/vax/elfbsd.S src/x86/ffi.c src/x86/sysv.S \
-	src/x86/ffiw64.c src/x86/win64.S src/x86/ffi64.c \
-	src/x86/unix64.S src/x86/sysv_intel.S src/x86/win64_intel.S \
-	src/xtensa/ffi.c src/xtensa/sysv.S
+	src/m32r/ffitarget.h src/m68k/ffitarget.h			\
+	src/m88k/ffitarget.h src/metag/ffitarget.h			\
+	src/microblaze/ffitarget.h src/mips/ffitarget.h			\
+	src/moxie/ffitarget.h src/nios2/ffitarget.h			\
+	src/or1k/ffitarget.h src/pa/ffitarget.h				\
+	src/powerpc/ffitarget.h src/powerpc/asm.h			\
+	src/powerpc/ffi_powerpc.h src/riscv/ffitarget.h			\
+	src/s390/ffitarget.h src/s390/internal.h src/sh/ffitarget.h	\
+	src/sh64/ffitarget.h src/sparc/ffitarget.h			\
+	src/sparc/internal.h src/tile/ffitarget.h src/vax/ffitarget.h	\
+	src/x86/ffitarget.h src/x86/internal.h src/x86/internal64.h	\
+	src/x86/asmnames.h src/xtensa/ffitarget.h src/dlmalloc.c	\
+	src/kvx/ffitarget.h
+
+EXTRA_libffi_la_SOURCES = src/aarch64/ffi.c src/aarch64/sysv.S		\
+	src/aarch64/win64_armasm.S src/alpha/ffi.c src/alpha/osf.S	\
+	src/arc/ffi.c src/arc/arcompact.S src/arm/ffi.c			\
+	src/arm/sysv.S src/arm/ffi.c src/arm/sysv_msvc_arm32.S		\
+	src/avr32/ffi.c src/avr32/sysv.S src/bfin/ffi.c			\
+	src/bfin/sysv.S src/cris/ffi.c src/cris/sysv.S src/frv/ffi.c	\
+	src/csky/ffi.c src/csky/sysv.S src/frv/eabi.S src/ia64/ffi.c	\
+	src/ia64/unix.S src/m32r/ffi.c src/m32r/sysv.S src/m68k/ffi.c	\
+	src/m68k/sysv.S src/m88k/ffi.c src/m88k/obsd.S			\
+	src/metag/ffi.c src/metag/sysv.S src/microblaze/ffi.c		\
+	src/microblaze/sysv.S src/mips/ffi.c src/mips/o32.S		\
+	src/mips/n32.S src/moxie/ffi.c src/moxie/eabi.S			\
+	src/nios2/ffi.c src/nios2/sysv.S src/or1k/ffi.c			\
+	src/or1k/sysv.S src/pa/ffi.c src/pa/linux.S src/pa/hpux32.S	\
+	src/powerpc/ffi.c src/powerpc/ffi_sysv.c			\
+	src/powerpc/ffi_linux64.c src/powerpc/sysv.S			\
+	src/powerpc/linux64.S src/powerpc/linux64_closure.S		\
+	src/powerpc/ppc_closure.S src/powerpc/aix.S			\
+	src/powerpc/darwin.S src/powerpc/aix_closure.S			\
+	src/powerpc/darwin_closure.S src/powerpc/ffi_darwin.c		\
+	src/riscv/ffi.c src/riscv/sysv.S src/s390/ffi.c			\
+	src/s390/sysv.S src/sh/ffi.c src/sh/sysv.S src/sh64/ffi.c	\
+	src/sh64/sysv.S src/sparc/ffi.c src/sparc/ffi64.c		\
+	src/sparc/v8.S src/sparc/v9.S src/tile/ffi.c src/tile/tile.S	\
+	src/vax/ffi.c src/vax/elfbsd.S src/x86/ffi.c src/x86/sysv.S	\
+	src/x86/ffiw64.c src/x86/win64.S src/x86/ffi64.c		\
+	src/x86/unix64.S src/x86/sysv_intel.S src/x86/win64_intel.S	\
+	src/xtensa/ffi.c src/xtensa/sysv.S src/kvx/ffi.c		\
+	src/kvx/sysv.S
 
 TARGET_OBJ = @TARGET_OBJ@
 libffi_la_LIBADD = $(TARGET_OBJ)
@@ -145,7 +135,7 @@ libffi_version_info = -version-info `grep -v '^\#' $(srcdir)/libtool-version`
 
 libffi.map: $(top_srcdir)/libffi.map.in
 	$(COMPILE) -D$(TARGET) -DGENERATE_LIBFFI_MAP \
-	 -E -x assembler-with-cpp -o $@ $<
+	 -E -x assembler-with-cpp -o $@ $(top_srcdir)/libffi.map.in
 
 libffi_la_LDFLAGS = -no-undefined $(libffi_version_info) $(libffi_version_script) $(LTLDFLAGS) $(AM_LTLDFLAGS)
 libffi_la_DEPENDENCIES = $(libffi_la_LIBADD) $(libffi_version_dep)