ffi 1.10.0 → 1.15.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +240 -0
- data/Gemfile +3 -4
- data/README.md +42 -18
- data/Rakefile +68 -145
- data/ext/ffi_c/AbstractMemory.c +29 -34
- data/ext/ffi_c/Buffer.c +4 -9
- data/ext/ffi_c/Call.c +17 -50
- data/ext/ffi_c/Call.h +4 -7
- data/ext/ffi_c/ClosurePool.c +75 -25
- data/ext/ffi_c/ClosurePool.h +3 -1
- data/ext/ffi_c/DynamicLibrary.c +2 -7
- data/ext/ffi_c/Function.c +47 -131
- data/ext/ffi_c/Function.h +0 -4
- data/ext/ffi_c/FunctionInfo.c +3 -8
- data/ext/ffi_c/LastError.c +2 -6
- data/ext/ffi_c/LongDouble.c +12 -10
- data/ext/ffi_c/LongDouble.h +0 -4
- data/ext/ffi_c/MemoryPointer.c +3 -8
- data/ext/ffi_c/MemoryPointer.h +0 -4
- data/ext/ffi_c/MethodHandle.c +21 -31
- data/ext/ffi_c/MethodHandle.h +3 -2
- data/ext/ffi_c/Platform.c +5 -56
- data/ext/ffi_c/Pointer.c +25 -26
- data/ext/ffi_c/Pointer.h +0 -4
- data/ext/ffi_c/Struct.c +49 -56
- data/ext/ffi_c/Struct.h +12 -6
- data/ext/ffi_c/StructByValue.c +2 -7
- data/ext/ffi_c/StructLayout.c +22 -20
- data/ext/ffi_c/Thread.c +4 -228
- data/ext/ffi_c/Thread.h +1 -20
- data/ext/ffi_c/Type.c +1 -19
- data/ext/ffi_c/Type.h +0 -1
- data/ext/ffi_c/Types.c +7 -8
- data/ext/ffi_c/Types.h +3 -4
- data/ext/ffi_c/Variadic.c +23 -24
- data/ext/ffi_c/compat.h +4 -0
- data/ext/ffi_c/extconf.rb +56 -30
- data/ext/ffi_c/ffi.c +3 -8
- data/ext/ffi_c/libffi/.appveyor.yml +29 -13
- data/ext/ffi_c/libffi/.gitattributes +4 -0
- data/ext/ffi_c/libffi/.travis/bfin-sim.exp +58 -0
- data/ext/ffi_c/libffi/.travis/build-cross-in-container.sh +14 -0
- data/ext/ffi_c/libffi/.travis/build-in-container.sh +12 -0
- data/ext/ffi_c/libffi/.travis/build.sh +116 -8
- data/ext/ffi_c/libffi/.travis/install.sh +65 -16
- data/ext/ffi_c/libffi/.travis/m32r-sim.exp +58 -0
- data/ext/ffi_c/libffi/.travis/moxie-sim.exp +1 -1
- data/ext/ffi_c/libffi/.travis/or1k-sim.exp +58 -0
- data/ext/ffi_c/libffi/.travis/powerpc-eabisim.exp +58 -0
- data/ext/ffi_c/libffi/.travis/site.exp +10 -1
- data/ext/ffi_c/libffi/.travis/wine-sim.exp +55 -0
- data/ext/ffi_c/libffi/.travis.yml +51 -2
- data/ext/ffi_c/libffi/{ChangeLog.libffi-3.1 → ChangeLog.old} +1407 -0
- data/ext/ffi_c/libffi/LICENSE +1 -1
- data/ext/ffi_c/libffi/LICENSE-BUILDTOOLS +5 -4
- data/ext/ffi_c/libffi/Makefile.am +56 -72
- data/ext/ffi_c/libffi/Makefile.in +458 -207
- data/ext/ffi_c/libffi/README.md +33 -8
- data/ext/ffi_c/libffi/config.guess +552 -331
- data/ext/ffi_c/libffi/config.sub +1321 -1306
- data/ext/ffi_c/libffi/configure +414 -342
- data/ext/ffi_c/libffi/configure.ac +37 -12
- data/ext/ffi_c/libffi/configure.host +56 -27
- data/ext/ffi_c/libffi/doc/Makefile.in +9 -5
- data/ext/ffi_c/libffi/doc/libffi.texi +26 -14
- data/ext/ffi_c/libffi/doc/version.texi +4 -4
- data/ext/ffi_c/libffi/fficonfig.h.in +13 -0
- data/ext/ffi_c/libffi/generate-darwin-source-and-headers.py +2 -4
- data/ext/ffi_c/libffi/include/Makefile.in +10 -6
- data/ext/ffi_c/libffi/include/ffi.h.in +19 -7
- data/ext/ffi_c/libffi/include/ffi_common.h +5 -1
- data/ext/ffi_c/libffi/install-sh +23 -13
- data/ext/ffi_c/libffi/libffi.map.in +8 -12
- data/ext/ffi_c/libffi/libffi.xcodeproj/project.pbxproj +2 -48
- data/ext/ffi_c/libffi/libtool-version +1 -1
- data/ext/ffi_c/libffi/ltmain.sh +156 -61
- data/ext/ffi_c/libffi/m4/asmcfi.m4 +1 -1
- data/ext/ffi_c/libffi/m4/ax_append_flag.m4 +5 -26
- data/ext/ffi_c/libffi/m4/ax_check_compile_flag.m4 +5 -26
- data/ext/ffi_c/libffi/m4/ax_compiler_vendor.m4 +2 -1
- data/ext/ffi_c/libffi/m4/ax_configure_args.m4 +5 -26
- data/ext/ffi_c/libffi/m4/ax_gcc_archflag.m4 +7 -3
- data/ext/ffi_c/libffi/make_sunver.pl +333 -0
- data/ext/ffi_c/libffi/man/Makefile.in +9 -5
- data/ext/ffi_c/libffi/missing +8 -8
- data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.sln +33 -0
- data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.vcxproj +130 -0
- data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.vcxproj.filters +57 -0
- data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.vcxproj.user +4 -0
- data/ext/ffi_c/libffi/msvc_build/aarch64/aarch64_include/ffi.h +511 -0
- data/ext/ffi_c/libffi/msvc_build/aarch64/aarch64_include/fficonfig.h +219 -0
- data/ext/ffi_c/libffi/msvcc.sh +38 -13
- data/ext/ffi_c/libffi/src/aarch64/ffi.c +153 -69
- data/ext/ffi_c/libffi/src/aarch64/ffitarget.h +19 -3
- data/ext/ffi_c/libffi/src/aarch64/internal.h +1 -0
- data/ext/ffi_c/libffi/src/aarch64/sysv.S +22 -9
- data/ext/ffi_c/libffi/src/aarch64/win64_armasm.S +506 -0
- data/ext/ffi_c/libffi/src/arm/ffi.c +62 -5
- data/ext/ffi_c/libffi/src/arm/ffitarget.h +8 -1
- data/ext/ffi_c/libffi/src/arm/sysv.S +6 -4
- data/ext/ffi_c/libffi/src/arm/sysv_msvc_arm32.S +311 -0
- data/ext/ffi_c/libffi/src/closures.c +69 -14
- data/ext/ffi_c/libffi/src/csky/ffi.c +395 -0
- data/ext/ffi_c/libffi/src/csky/ffitarget.h +63 -0
- data/ext/ffi_c/libffi/src/csky/sysv.S +371 -0
- data/ext/ffi_c/libffi/src/dlmalloc.c +1 -1
- data/ext/ffi_c/libffi/src/frv/ffi.c +1 -1
- data/ext/ffi_c/libffi/src/kvx/asm.h +5 -0
- data/ext/ffi_c/libffi/src/kvx/ffi.c +273 -0
- data/ext/ffi_c/libffi/src/kvx/ffitarget.h +75 -0
- data/ext/ffi_c/libffi/src/kvx/sysv.S +127 -0
- data/ext/ffi_c/libffi/src/metag/ffi.c +1 -1
- data/ext/ffi_c/libffi/src/mips/ffi.c +5 -1
- data/ext/ffi_c/libffi/src/mips/ffitarget.h +1 -1
- data/ext/ffi_c/libffi/src/mips/o32.S +2 -0
- data/ext/ffi_c/libffi/src/moxie/ffi.c +1 -1
- data/ext/ffi_c/libffi/src/pa/ffi.c +46 -91
- data/ext/ffi_c/libffi/src/pa/ffitarget.h +1 -6
- data/ext/ffi_c/libffi/src/pa/hpux32.S +4 -2
- data/ext/ffi_c/libffi/src/pa/linux.S +27 -4
- data/ext/ffi_c/libffi/src/powerpc/ffi.c +6 -4
- data/ext/ffi_c/libffi/src/powerpc/ffi_darwin.c +13 -1
- data/ext/ffi_c/libffi/src/powerpc/ffi_linux64.c +211 -32
- data/ext/ffi_c/libffi/src/powerpc/ffi_powerpc.h +18 -7
- data/ext/ffi_c/libffi/src/powerpc/ffitarget.h +10 -4
- data/ext/ffi_c/libffi/src/powerpc/linux64.S +91 -28
- data/ext/ffi_c/libffi/src/powerpc/linux64_closure.S +81 -5
- data/ext/ffi_c/libffi/src/powerpc/sysv.S +5 -7
- data/ext/ffi_c/libffi/src/prep_cif.c +4 -2
- data/ext/ffi_c/libffi/src/riscv/ffi.c +42 -6
- data/ext/ffi_c/libffi/src/riscv/ffitarget.h +1 -0
- data/ext/ffi_c/libffi/src/riscv/sysv.S +86 -7
- data/ext/ffi_c/libffi/src/x86/ffi.c +29 -12
- data/ext/ffi_c/libffi/src/x86/ffi64.c +22 -11
- data/ext/ffi_c/libffi/src/x86/ffitarget.h +15 -2
- data/ext/ffi_c/libffi/src/x86/ffiw64.c +20 -10
- data/ext/ffi_c/libffi/src/x86/sysv.S +105 -10
- data/ext/ffi_c/libffi/src/x86/sysv_intel.S +995 -0
- data/ext/ffi_c/libffi/src/x86/unix64.S +100 -4
- data/ext/ffi_c/libffi/src/x86/win64.S +12 -3
- data/ext/ffi_c/libffi/src/x86/win64_intel.S +3 -2
- data/ext/ffi_c/libffi/testsuite/Makefile.am +114 -109
- data/ext/ffi_c/libffi/testsuite/Makefile.in +124 -84
- data/ext/ffi_c/libffi/testsuite/lib/libffi.exp +32 -8
- data/ext/ffi_c/libffi/testsuite/libffi.bhaible/bhaible.exp +7 -2
- data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-call.c +4 -4
- data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-callback.c +2 -2
- data/ext/ffi_c/libffi/testsuite/libffi.call/call.exp +12 -1
- data/ext/ffi_c/libffi/testsuite/libffi.call/float2.c +9 -8
- data/ext/ffi_c/libffi/testsuite/libffi.call/va_1.c +1 -1
- data/ext/ffi_c/libffi/testsuite/libffi.closures/closure.exp +67 -0
- data/ext/ffi_c/libffi/testsuite/libffi.closures/ffitest.h +138 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/huge_struct.c +3 -1
- data/ext/ffi_c/libffi.darwin.mk +1 -1
- data/ext/ffi_c/rbffi.h +0 -2
- data/ffi.gemspec +13 -7
- data/lib/ffi/abstract_memory.rb +44 -0
- data/lib/ffi/autopointer.rb +1 -1
- data/lib/ffi/data_converter.rb +67 -0
- data/lib/ffi/ffi.rb +3 -0
- data/lib/ffi/io.rb +3 -3
- data/lib/ffi/library.rb +13 -9
- data/lib/ffi/managedstruct.rb +2 -2
- data/lib/ffi/platform/aarch64-darwin/types.conf +130 -0
- data/lib/ffi/platform/aarch64-freebsd/types.conf +89 -89
- data/lib/ffi/platform/aarch64-freebsd12/types.conf +162 -109
- data/lib/ffi/platform/aarch64-linux/types.conf +81 -81
- data/lib/ffi/platform/aarch64-openbsd/types.conf +134 -0
- data/lib/ffi/platform/arm-freebsd/types.conf +87 -87
- data/lib/ffi/platform/arm-freebsd12/types.conf +87 -87
- data/lib/ffi/platform/arm-linux/types.conf +110 -82
- data/lib/ffi/platform/i386-cygwin/types.conf +1 -1
- data/lib/ffi/platform/i386-darwin/types.conf +63 -63
- data/lib/ffi/platform/i386-freebsd/types.conf +87 -87
- data/lib/ffi/platform/i386-freebsd12/types.conf +87 -87
- data/lib/ffi/platform/i386-gnu/types.conf +84 -84
- data/lib/ffi/platform/i386-linux/types.conf +77 -77
- data/lib/ffi/platform/i386-netbsd/types.conf +87 -87
- data/lib/ffi/platform/i386-openbsd/types.conf +89 -89
- data/lib/ffi/platform/i386-solaris/types.conf +96 -96
- data/lib/ffi/platform/i386-windows/types.conf +43 -96
- data/lib/ffi/platform/ia64-linux/types.conf +79 -79
- data/lib/ffi/platform/mips-linux/types.conf +79 -79
- data/lib/ffi/platform/mips64-linux/types.conf +81 -81
- data/lib/ffi/platform/mips64el-linux/types.conf +81 -81
- data/lib/ffi/platform/mipsel-linux/types.conf +79 -79
- data/lib/ffi/platform/mipsisa32r6-linux/types.conf +79 -79
- data/lib/ffi/platform/mipsisa32r6el-linux/types.conf +79 -79
- data/lib/ffi/platform/mipsisa64r6-linux/types.conf +81 -81
- data/lib/ffi/platform/mipsisa64r6el-linux/types.conf +81 -81
- data/lib/ffi/platform/powerpc-aix/types.conf +155 -155
- data/lib/ffi/platform/powerpc-darwin/types.conf +63 -63
- data/lib/ffi/platform/powerpc-linux/types.conf +108 -78
- data/lib/ffi/platform/powerpc-openbsd/types.conf +156 -0
- data/lib/ffi/platform/powerpc64-linux/types.conf +81 -81
- data/lib/ffi/platform/powerpc64le-linux/types.conf +100 -0
- data/lib/ffi/platform/riscv64-linux/types.conf +104 -0
- data/lib/ffi/platform/s390-linux/types.conf +79 -79
- data/lib/ffi/platform/s390x-linux/types.conf +79 -79
- data/lib/ffi/platform/sparc-linux/types.conf +79 -79
- data/lib/ffi/platform/sparc-solaris/types.conf +103 -103
- data/lib/ffi/platform/sparc64-linux/types.conf +79 -79
- data/lib/ffi/platform/sparcv9-openbsd/types.conf +156 -0
- data/lib/ffi/platform/sparcv9-solaris/types.conf +103 -103
- data/lib/ffi/platform/x86_64-cygwin/types.conf +1 -1
- data/lib/ffi/platform/x86_64-darwin/types.conf +88 -84
- data/lib/ffi/platform/x86_64-dragonflybsd/types.conf +130 -0
- data/lib/ffi/platform/x86_64-freebsd/types.conf +89 -89
- data/lib/ffi/platform/x86_64-freebsd12/types.conf +139 -109
- data/lib/ffi/platform/x86_64-haiku/types.conf +117 -0
- data/lib/ffi/platform/x86_64-linux/types.conf +107 -77
- data/lib/ffi/platform/x86_64-msys/types.conf +119 -0
- data/lib/ffi/platform/x86_64-netbsd/types.conf +89 -89
- data/lib/ffi/platform/x86_64-openbsd/types.conf +86 -86
- data/lib/ffi/platform/x86_64-solaris/types.conf +96 -96
- data/lib/ffi/platform/x86_64-windows/types.conf +42 -110
- data/lib/ffi/platform.rb +24 -9
- data/lib/ffi/pointer.rb +22 -15
- data/lib/ffi/struct.rb +13 -68
- data/lib/ffi/struct_by_reference.rb +72 -0
- data/lib/ffi/struct_layout.rb +96 -0
- data/lib/ffi/tools/const_generator.rb +11 -8
- data/lib/ffi/tools/generator.rb +47 -2
- data/lib/ffi/tools/generator_task.rb +13 -17
- data/lib/ffi/tools/struct_generator.rb +6 -5
- data/lib/ffi/tools/types_generator.rb +7 -4
- data/lib/ffi/types.rb +1 -1
- data/lib/ffi/variadic.rb +1 -10
- data/lib/ffi/version.rb +1 -1
- data/lib/ffi.rb +10 -3
- data/rakelib/ffi_gem_helper.rb +65 -0
- data/samples/getlogin.rb +1 -1
- data/samples/getpid.rb +1 -1
- data/samples/gettimeofday.rb +8 -8
- data/samples/hello.rb +2 -1
- data/samples/inotify.rb +1 -1
- data/samples/pty.rb +1 -2
- data/samples/qsort.rb +0 -1
- metadata +157 -139
- data/.gitignore +0 -22
- data/.gitmodules +0 -3
- data/.travis.yml +0 -43
- data/.yardopts +0 -5
- data/appveyor.yml +0 -22
- data/ext/ffi_c/DataConverter.c +0 -91
- data/ext/ffi_c/StructByReference.c +0 -190
- data/ext/ffi_c/StructByReference.h +0 -50
- data/ext/ffi_c/libffi/ChangeLog.libffi +0 -584
- data/ext/ffi_c/libffi/ChangeLog.libgcj +0 -40
- data/ext/ffi_c/libffi/ChangeLog.v1 +0 -764
- data/ext/ffi_c/win32/stdbool.h +0 -8
- data/ext/ffi_c/win32/stdint.h +0 -201
- data/samples/sample_helper.rb +0 -6
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn0.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn1.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn2.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn3.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn4.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn5.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn6.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_loc_fn0.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_simple.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_12byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_16byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_18byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_19byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_1_1byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_20byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_20byte1.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_24byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_2byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3_1byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3byte1.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3byte2.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3float.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_4_1byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_4byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_5_1_byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_5byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_64byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_6_1_byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_6byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_7_1_byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_7byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_8byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_9byte1.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_9byte2.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_double.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_float.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_longdouble.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_longdouble_split.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_longdouble_split2.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_pointer.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint16.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint32.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint64.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint16.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint32.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint64.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_dbls_struct.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_double.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_double_va.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_float.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_longdouble.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_longdouble_va.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_many_mixed_args.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_many_mixed_float_double.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_schar.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_sshort.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_sshortchar.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_uchar.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_ushort.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_ushortchar.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_pointer.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_pointer_stack.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_schar.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_sint.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_sshort.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_struct_va1.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uchar.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uchar_va.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uint.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uint_va.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ulong_va.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ulonglong.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ushort.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ushort_va.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/err_bad_abi.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct1.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct10.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct11.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct2.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct3.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct4.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct5.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct6.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct7.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct8.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct9.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/problem1.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_large.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_large2.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_medium.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_medium2.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/testclosure.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/unwindtest.cc +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/unwindtest_ffi_call.cc +0 -0
data/ext/ffi_c/Function.c
CHANGED
@@ -37,19 +37,10 @@
|
|
37
37
|
#endif
|
38
38
|
|
39
39
|
#include <stdio.h>
|
40
|
-
#
|
41
|
-
#
|
42
|
-
# include <stdbool.h>
|
43
|
-
#else
|
44
|
-
# include "win32/stdbool.h"
|
45
|
-
# if !defined(INT8_MIN)
|
46
|
-
# include "win32/stdint.h"
|
47
|
-
# endif
|
48
|
-
#endif
|
40
|
+
#include <stdint.h>
|
41
|
+
#include <stdbool.h>
|
49
42
|
#include <ruby.h>
|
50
|
-
#if defined(HAVE_RUBY_THREAD_H)
|
51
43
|
#include <ruby/thread.h>
|
52
|
-
#endif
|
53
44
|
|
54
45
|
#include <ffi.h>
|
55
46
|
#if defined(HAVE_NATIVETHREAD) && !defined(_WIN32)
|
@@ -90,8 +81,8 @@ static VALUE function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc);
|
|
90
81
|
static void callback_invoke(ffi_cif* cif, void* retval, void** parameters, void* user_data);
|
91
82
|
static bool callback_prep(void* ctx, void* code, Closure* closure, char* errmsg, size_t errmsgsize);
|
92
83
|
static void* callback_with_gvl(void* data);
|
93
|
-
static VALUE invoke_callback(
|
94
|
-
static VALUE save_callback_exception(
|
84
|
+
static VALUE invoke_callback(VALUE data);
|
85
|
+
static VALUE save_callback_exception(VALUE data, VALUE exc);
|
95
86
|
|
96
87
|
#define DEFER_ASYNC_CALLBACK 1
|
97
88
|
|
@@ -101,9 +92,8 @@ static VALUE async_cb_event(void *);
|
|
101
92
|
static VALUE async_cb_call(void *);
|
102
93
|
#endif
|
103
94
|
|
104
|
-
|
105
|
-
extern
|
106
|
-
#endif
|
95
|
+
extern int ruby_thread_has_gvl_p(void);
|
96
|
+
extern int ruby_native_thread_p(void);
|
107
97
|
|
108
98
|
VALUE rbffi_FunctionClass = Qnil;
|
109
99
|
|
@@ -136,15 +126,9 @@ static struct gvl_callback* async_cb_list = NULL;
|
|
136
126
|
# ifndef _WIN32
|
137
127
|
static pthread_mutex_t async_cb_mutex = PTHREAD_MUTEX_INITIALIZER;
|
138
128
|
static pthread_cond_t async_cb_cond = PTHREAD_COND_INITIALIZER;
|
139
|
-
# if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL))
|
140
|
-
static int async_cb_pipe[2];
|
141
|
-
# endif
|
142
129
|
# else
|
143
130
|
static HANDLE async_cb_cond;
|
144
131
|
static CRITICAL_SECTION async_cb_lock;
|
145
|
-
# if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL))
|
146
|
-
static int async_cb_pipe[2];
|
147
|
-
# endif
|
148
132
|
# endif
|
149
133
|
#endif
|
150
134
|
|
@@ -265,11 +249,11 @@ VALUE
|
|
265
249
|
rbffi_Function_ForProc(VALUE rbFunctionInfo, VALUE proc)
|
266
250
|
{
|
267
251
|
VALUE callback, cbref, cbTable;
|
268
|
-
Function* fp;
|
269
252
|
|
270
253
|
cbref = RTEST(rb_ivar_defined(proc, id_cb_ref)) ? rb_ivar_get(proc, id_cb_ref) : Qnil;
|
271
254
|
/* If the first callback reference has the same function function signature, use it */
|
272
255
|
if (cbref != Qnil && CLASS_OF(cbref) == rbffi_FunctionClass) {
|
256
|
+
Function* fp;
|
273
257
|
Data_Get_Struct(cbref, Function, fp);
|
274
258
|
if (fp->rbFunctionInfo == rbFunctionInfo) {
|
275
259
|
return cbref;
|
@@ -288,14 +272,27 @@ rbffi_Function_ForProc(VALUE rbFunctionInfo, VALUE proc)
|
|
288
272
|
rb_ivar_set(proc, id_cb_ref, callback);
|
289
273
|
} else {
|
290
274
|
/* The proc instance has been used as more than one type of callback, store extras in a hash */
|
291
|
-
cbTable
|
292
|
-
|
275
|
+
if(cbTable == Qnil) {
|
276
|
+
cbTable = rb_hash_new();
|
277
|
+
rb_ivar_set(proc, id_cbtable, cbTable);
|
278
|
+
}
|
293
279
|
rb_hash_aset(cbTable, rbFunctionInfo, callback);
|
294
280
|
}
|
295
281
|
|
296
282
|
return callback;
|
297
283
|
}
|
298
284
|
|
285
|
+
#if !defined(_WIN32) && defined(DEFER_ASYNC_CALLBACK)
|
286
|
+
static void
|
287
|
+
after_fork_callback(void)
|
288
|
+
{
|
289
|
+
/* Ensure that a new dispatcher thread is started in a forked process */
|
290
|
+
async_cb_thread = Qnil;
|
291
|
+
pthread_mutex_init(&async_cb_mutex, NULL);
|
292
|
+
pthread_cond_init(&async_cb_cond, NULL);
|
293
|
+
}
|
294
|
+
#endif
|
295
|
+
|
299
296
|
static VALUE
|
300
297
|
function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc)
|
301
298
|
{
|
@@ -323,16 +320,17 @@ function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc)
|
|
323
320
|
|
324
321
|
#if defined(DEFER_ASYNC_CALLBACK)
|
325
322
|
if (async_cb_thread == Qnil) {
|
326
|
-
|
327
|
-
|
328
|
-
|
329
|
-
|
330
|
-
|
331
|
-
fcntl(async_cb_pipe[1], F_SETFL, fcntl(async_cb_pipe[1], F_GETFL) | O_NONBLOCK);
|
323
|
+
|
324
|
+
#if !defined(_WIN32)
|
325
|
+
if( pthread_atfork(NULL, NULL, after_fork_callback) ){
|
326
|
+
rb_warn("FFI: unable to register fork callback");
|
327
|
+
}
|
332
328
|
#endif
|
329
|
+
|
333
330
|
async_cb_thread = rb_thread_create(async_cb_event, NULL);
|
331
|
+
/* Name thread, for better debugging */
|
332
|
+
rb_funcall(async_cb_thread, rb_intern("name="), 1, rb_str_new2("FFI Callback Dispatcher"));
|
334
333
|
}
|
335
|
-
|
336
334
|
#endif
|
337
335
|
|
338
336
|
fn->closure = rbffi_Closure_Alloc(fn->info->closurePool);
|
@@ -474,13 +472,13 @@ callback_invoke(ffi_cif* cif, void* retval, void** parameters, void* user_data)
|
|
474
472
|
cb.frame = rbffi_frame_current();
|
475
473
|
|
476
474
|
if (cb.frame != NULL) cb.frame->exc = Qnil;
|
477
|
-
if (cb.frame != NULL && cb.frame->has_gvl) {
|
478
|
-
callback_with_gvl(&cb);
|
479
475
|
|
480
|
-
|
481
|
-
|
476
|
+
if (ruby_native_thread_p()) {
|
477
|
+
if(ruby_thread_has_gvl_p()) {
|
478
|
+
callback_with_gvl(&cb);
|
479
|
+
} else {
|
482
480
|
rb_thread_call_with_gvl(callback_with_gvl, &cb);
|
483
|
-
|
481
|
+
}
|
484
482
|
#if defined(DEFER_ASYNC_CALLBACK) && !defined(_WIN32)
|
485
483
|
} else {
|
486
484
|
bool empty = false;
|
@@ -494,17 +492,8 @@ callback_invoke(ffi_cif* cif, void* retval, void** parameters, void* user_data)
|
|
494
492
|
cb.next = async_cb_list;
|
495
493
|
async_cb_list = &cb;
|
496
494
|
|
497
|
-
#if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL))
|
498
|
-
pthread_mutex_unlock(&async_cb_mutex);
|
499
|
-
/* Only signal if the list was empty */
|
500
|
-
if (empty) {
|
501
|
-
char c;
|
502
|
-
write(async_cb_pipe[1], &c, 1);
|
503
|
-
}
|
504
|
-
#else
|
505
495
|
pthread_cond_signal(&async_cb_cond);
|
506
496
|
pthread_mutex_unlock(&async_cb_mutex);
|
507
|
-
#endif
|
508
497
|
|
509
498
|
/* Wait for the thread executing the ruby callback to signal it is done */
|
510
499
|
pthread_mutex_lock(&cb.async_mutex);
|
@@ -528,15 +517,7 @@ callback_invoke(ffi_cif* cif, void* retval, void** parameters, void* user_data)
|
|
528
517
|
async_cb_list = &cb;
|
529
518
|
LeaveCriticalSection(&async_cb_lock);
|
530
519
|
|
531
|
-
#if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL))
|
532
|
-
/* Only signal if the list was empty */
|
533
|
-
if (empty) {
|
534
|
-
char c;
|
535
|
-
write(async_cb_pipe[1], &c, 1);
|
536
|
-
}
|
537
|
-
#else
|
538
520
|
SetEvent(async_cb_cond);
|
539
|
-
#endif
|
540
521
|
|
541
522
|
/* Wait for the thread executing the ruby callback to signal it is done */
|
542
523
|
WaitForSingleObject(cb.async_event, INFINITE);
|
@@ -554,7 +535,6 @@ struct async_wait {
|
|
554
535
|
static void * async_cb_wait(void *);
|
555
536
|
static void async_cb_stop(void *);
|
556
537
|
|
557
|
-
#if defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
|
558
538
|
static VALUE
|
559
539
|
async_cb_event(void* unused)
|
560
540
|
{
|
@@ -562,82 +542,17 @@ async_cb_event(void* unused)
|
|
562
542
|
|
563
543
|
w.stop = false;
|
564
544
|
while (!w.stop) {
|
565
|
-
#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
|
566
545
|
rb_thread_call_without_gvl(async_cb_wait, &w, async_cb_stop, &w);
|
567
|
-
#else
|
568
|
-
rb_thread_blocking_region(async_cb_wait, &w, async_cb_stop, &w);
|
569
|
-
#endif
|
570
546
|
if (w.cb != NULL) {
|
571
547
|
/* Start up a new ruby thread to run the ruby callback */
|
572
|
-
rb_thread_create(async_cb_call, w.cb);
|
573
|
-
|
574
|
-
|
575
|
-
|
576
|
-
return Qnil;
|
577
|
-
}
|
578
|
-
|
579
|
-
#elif defined(_WIN32)
|
580
|
-
static VALUE
|
581
|
-
async_cb_event(void* unused)
|
582
|
-
{
|
583
|
-
while (true) {
|
584
|
-
struct gvl_callback* cb;
|
585
|
-
char buf[64];
|
586
|
-
fd_set rfds;
|
587
|
-
|
588
|
-
FD_ZERO(&rfds);
|
589
|
-
FD_SET(async_cb_pipe[0], &rfds);
|
590
|
-
rb_thread_select(async_cb_pipe[0] + 1, &rfds, NULL, NULL, NULL);
|
591
|
-
read(async_cb_pipe[0], buf, sizeof(buf));
|
592
|
-
|
593
|
-
EnterCriticalSection(&async_cb_lock);
|
594
|
-
cb = async_cb_list;
|
595
|
-
async_cb_list = NULL;
|
596
|
-
LeaveCriticalSection(&async_cb_lock);
|
597
|
-
|
598
|
-
while (cb != NULL) {
|
599
|
-
struct gvl_callback* next = cb->next;
|
600
|
-
/* Start up a new ruby thread to run the ruby callback */
|
601
|
-
rb_thread_create(async_cb_call, cb);
|
602
|
-
cb = next;
|
548
|
+
VALUE new_thread = rb_thread_create(async_cb_call, w.cb);
|
549
|
+
/* Name thread, for better debugging */
|
550
|
+
rb_funcall(new_thread, rb_intern("name="), 1, rb_str_new2("FFI Callback Runner"));
|
603
551
|
}
|
604
552
|
}
|
605
553
|
|
606
554
|
return Qnil;
|
607
555
|
}
|
608
|
-
#else
|
609
|
-
static VALUE
|
610
|
-
async_cb_event(void* unused)
|
611
|
-
{
|
612
|
-
while (true) {
|
613
|
-
struct gvl_callback* cb;
|
614
|
-
char buf[64];
|
615
|
-
|
616
|
-
if (read(async_cb_pipe[0], buf, sizeof(buf)) < 0) {
|
617
|
-
rb_thread_wait_fd(async_cb_pipe[0]);
|
618
|
-
while (read(async_cb_pipe[0], buf, sizeof (buf)) < 0) {
|
619
|
-
if (rb_io_wait_readable(async_cb_pipe[0]) != Qtrue) {
|
620
|
-
return Qfalse;
|
621
|
-
}
|
622
|
-
}
|
623
|
-
}
|
624
|
-
|
625
|
-
pthread_mutex_lock(&async_cb_mutex);
|
626
|
-
cb = async_cb_list;
|
627
|
-
async_cb_list = NULL;
|
628
|
-
pthread_mutex_unlock(&async_cb_mutex);
|
629
|
-
|
630
|
-
while (cb != NULL) {
|
631
|
-
struct gvl_callback* next = cb->next;
|
632
|
-
/* Start up a new ruby thread to run the ruby callback */
|
633
|
-
rb_thread_create(async_cb_call, cb);
|
634
|
-
cb = next;
|
635
|
-
}
|
636
|
-
}
|
637
|
-
|
638
|
-
return Qnil;
|
639
|
-
}
|
640
|
-
#endif
|
641
556
|
|
642
557
|
#ifdef _WIN32
|
643
558
|
static void *
|
@@ -742,7 +657,7 @@ callback_with_gvl(void* data)
|
|
742
657
|
}
|
743
658
|
|
744
659
|
static VALUE
|
745
|
-
invoke_callback(
|
660
|
+
invoke_callback(VALUE data)
|
746
661
|
{
|
747
662
|
struct gvl_callback* cb = (struct gvl_callback *) data;
|
748
663
|
|
@@ -805,10 +720,10 @@ invoke_callback(void* data)
|
|
805
720
|
param = rb_float_new(*(double *) parameters[i]);
|
806
721
|
break;
|
807
722
|
case NATIVE_LONGDOUBLE:
|
808
|
-
|
723
|
+
param = rbffi_longdouble_new(*(long double *) parameters[i]);
|
809
724
|
break;
|
810
725
|
case NATIVE_STRING:
|
811
|
-
param = (*(void **) parameters[i] != NULL) ?
|
726
|
+
param = (*(void **) parameters[i] != NULL) ? rb_str_new2(*(char **) parameters[i]) : Qnil;
|
812
727
|
break;
|
813
728
|
case NATIVE_POINTER:
|
814
729
|
param = rbffi_Pointer_NewInstance(*(void **) parameters[i]);
|
@@ -818,7 +733,6 @@ invoke_callback(void* data)
|
|
818
733
|
break;
|
819
734
|
|
820
735
|
case NATIVE_FUNCTION:
|
821
|
-
case NATIVE_CALLBACK:
|
822
736
|
case NATIVE_STRUCT:
|
823
737
|
param = rbffi_NativeValue_ToRuby(paramType, rbParamType, parameters[i]);
|
824
738
|
break;
|
@@ -877,6 +791,9 @@ invoke_callback(void* data)
|
|
877
791
|
case NATIVE_FLOAT64:
|
878
792
|
*((double *) retval) = NUM2DBL(rbReturnValue);
|
879
793
|
break;
|
794
|
+
case NATIVE_LONGDOUBLE:
|
795
|
+
*((long double *) retval) = rbffi_num2longdouble(rbReturnValue);
|
796
|
+
break;
|
880
797
|
case NATIVE_POINTER:
|
881
798
|
if (TYPE(rbReturnValue) == T_DATA && rb_obj_is_kind_of(rbReturnValue, rbffi_PointerClass)) {
|
882
799
|
*((void **) retval) = ((AbstractMemory *) DATA_PTR(rbReturnValue))->address;
|
@@ -891,7 +808,6 @@ invoke_callback(void* data)
|
|
891
808
|
break;
|
892
809
|
|
893
810
|
case NATIVE_FUNCTION:
|
894
|
-
case NATIVE_CALLBACK:
|
895
811
|
if (TYPE(rbReturnValue) == T_DATA && rb_obj_is_kind_of(rbReturnValue, rbffi_PointerClass)) {
|
896
812
|
|
897
813
|
*((void **) retval) = ((AbstractMemory *) DATA_PTR(rbReturnValue))->address;
|
@@ -932,7 +848,7 @@ invoke_callback(void* data)
|
|
932
848
|
}
|
933
849
|
|
934
850
|
static VALUE
|
935
|
-
save_callback_exception(
|
851
|
+
save_callback_exception(VALUE data, VALUE exc)
|
936
852
|
{
|
937
853
|
struct gvl_callback* cb = (struct gvl_callback *) data;
|
938
854
|
|
@@ -948,9 +864,9 @@ callback_prep(void* ctx, void* code, Closure* closure, char* errmsg, size_t errm
|
|
948
864
|
FunctionType* fnInfo = (FunctionType *) ctx;
|
949
865
|
ffi_status ffiStatus;
|
950
866
|
|
951
|
-
ffiStatus =
|
867
|
+
ffiStatus = ffi_prep_closure_loc(closure->pcl, &fnInfo->ffi_cif, callback_invoke, closure, code);
|
952
868
|
if (ffiStatus != FFI_OK) {
|
953
|
-
snprintf(errmsg, errmsgsize, "
|
869
|
+
snprintf(errmsg, errmsgsize, "ffi_prep_closure_loc failed. status=%#x", ffiStatus);
|
954
870
|
return false;
|
955
871
|
}
|
956
872
|
|
data/ext/ffi_c/Function.h
CHANGED
data/ext/ffi_c/FunctionInfo.c
CHANGED
@@ -33,12 +33,8 @@
|
|
33
33
|
#include <sys/types.h>
|
34
34
|
#include <stdio.h>
|
35
35
|
|
36
|
-
#
|
37
|
-
#
|
38
|
-
# include <stdbool.h>
|
39
|
-
#else
|
40
|
-
# include "win32/stdbool.h"
|
41
|
-
#endif
|
36
|
+
#include <stdint.h>
|
37
|
+
#include <stdbool.h>
|
42
38
|
|
43
39
|
#include <errno.h>
|
44
40
|
#include <ruby.h>
|
@@ -172,7 +168,7 @@ fntype_initialize(int argc, VALUE* argv, VALUE self)
|
|
172
168
|
VALUE typeName = rb_funcall2(rbReturnType, rb_intern("inspect"), 0, NULL);
|
173
169
|
rb_raise(rb_eTypeError, "Invalid return type (%s)", RSTRING_PTR(typeName));
|
174
170
|
}
|
175
|
-
|
171
|
+
|
176
172
|
if (rb_obj_is_kind_of(fnInfo->rbReturnType, rbffi_StructByValueClass)) {
|
177
173
|
fnInfo->hasStruct = true;
|
178
174
|
}
|
@@ -180,7 +176,6 @@ fntype_initialize(int argc, VALUE* argv, VALUE self)
|
|
180
176
|
Data_Get_Struct(fnInfo->rbReturnType, Type, fnInfo->returnType);
|
181
177
|
fnInfo->ffiReturnType = fnInfo->returnType->ffiType;
|
182
178
|
|
183
|
-
|
184
179
|
#if defined(X86_WIN32)
|
185
180
|
rbConventionStr = (rbConvention != Qnil) ? rb_funcall2(rbConvention, rb_intern("to_s"), 0, NULL) : Qnil;
|
186
181
|
fnInfo->abi = (rbConventionStr != Qnil && strcmp(StringValueCStr(rbConventionStr), "stdcall") == 0)
|
data/ext/ffi_c/LastError.c
CHANGED
@@ -33,12 +33,8 @@
|
|
33
33
|
#endif
|
34
34
|
#include <sys/types.h>
|
35
35
|
#include <stdio.h>
|
36
|
-
#
|
37
|
-
#
|
38
|
-
# include <stdbool.h>
|
39
|
-
#else
|
40
|
-
# include "win32/stdbool.h"
|
41
|
-
#endif
|
36
|
+
#include <stdint.h>
|
37
|
+
#include <stdbool.h>
|
42
38
|
#include <errno.h>
|
43
39
|
#include <ruby.h>
|
44
40
|
|
data/ext/ffi_c/LongDouble.c
CHANGED
@@ -3,15 +3,15 @@
|
|
3
3
|
#include <stdarg.h>
|
4
4
|
#include <float.h>
|
5
5
|
|
6
|
-
#if defined (__CYGWIN__) || defined(__INTERIX)
|
6
|
+
#if defined (__CYGWIN__) || defined(__INTERIX) || defined(_MSC_VER)
|
7
7
|
# define strtold(str, endptr) ((long double) strtod((str), (endptr)))
|
8
8
|
#endif /* defined (__CYGWIN__) */
|
9
9
|
|
10
10
|
static VALUE rb_cBigDecimal = Qnil;
|
11
11
|
static VALUE bigdecimal_load(VALUE unused);
|
12
|
-
static VALUE bigdecimal_failed(VALUE value);
|
12
|
+
static VALUE bigdecimal_failed(VALUE value, VALUE exc);
|
13
13
|
|
14
|
-
VALUE
|
14
|
+
VALUE
|
15
15
|
rbffi_longdouble_new(long double ld)
|
16
16
|
{
|
17
17
|
if (!RTEST(rb_cBigDecimal)) {
|
@@ -21,27 +21,29 @@ rbffi_longdouble_new(long double ld)
|
|
21
21
|
|
22
22
|
if (RTEST(rb_cBigDecimal) && rb_cBigDecimal != rb_cObject) {
|
23
23
|
char buf[128];
|
24
|
-
return rb_funcall(
|
24
|
+
return rb_funcall(rb_mKernel, rb_intern("BigDecimal"), 1, rb_str_new(buf, sprintf(buf, "%.35Le", ld)));
|
25
25
|
}
|
26
26
|
|
27
27
|
/* Fall through to handling as a float */
|
28
28
|
return rb_float_new(ld);
|
29
29
|
}
|
30
30
|
|
31
|
-
long double
|
31
|
+
long double
|
32
32
|
rbffi_num2longdouble(VALUE value)
|
33
33
|
{
|
34
34
|
if (TYPE(value) == T_FLOAT) {
|
35
35
|
return rb_num2dbl(value);
|
36
36
|
}
|
37
|
-
|
37
|
+
|
38
38
|
if (!RTEST(rb_cBigDecimal) && rb_const_defined(rb_cObject, rb_intern("BigDecimal"))) {
|
39
39
|
rb_cBigDecimal = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
|
40
40
|
}
|
41
41
|
|
42
42
|
if (RTEST(rb_cBigDecimal) && rb_cBigDecimal != rb_cObject && RTEST(rb_obj_is_kind_of(value, rb_cBigDecimal))) {
|
43
43
|
VALUE s = rb_funcall(value, rb_intern("to_s"), 1, rb_str_new2("E"));
|
44
|
-
|
44
|
+
long double ret = strtold(RSTRING_PTR(s), NULL);
|
45
|
+
RB_GC_GUARD(s);
|
46
|
+
return ret;
|
45
47
|
}
|
46
48
|
|
47
49
|
/* Fall through to handling as a float */
|
@@ -49,15 +51,15 @@ rbffi_num2longdouble(VALUE value)
|
|
49
51
|
}
|
50
52
|
|
51
53
|
|
52
|
-
static VALUE
|
54
|
+
static VALUE
|
53
55
|
bigdecimal_load(VALUE unused)
|
54
56
|
{
|
55
57
|
rb_require("bigdecimal");
|
56
58
|
return rb_const_get(rb_cObject, rb_intern("BigDecimal"));
|
57
59
|
}
|
58
60
|
|
59
|
-
static VALUE
|
60
|
-
bigdecimal_failed(VALUE value)
|
61
|
+
static VALUE
|
62
|
+
bigdecimal_failed(VALUE value, VALUE exc)
|
61
63
|
{
|
62
64
|
return value;
|
63
65
|
}
|
data/ext/ffi_c/LongDouble.h
CHANGED
data/ext/ffi_c/MemoryPointer.c
CHANGED
@@ -28,13 +28,8 @@
|
|
28
28
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
29
29
|
*/
|
30
30
|
|
31
|
-
#
|
32
|
-
#
|
33
|
-
# include <stdint.h>
|
34
|
-
#else
|
35
|
-
# include "win32/stdbool.h"
|
36
|
-
# include "win32/stdint.h"
|
37
|
-
#endif
|
31
|
+
#include <stdbool.h>
|
32
|
+
#include <stdint.h>
|
38
33
|
#include <limits.h>
|
39
34
|
#include <ruby.h>
|
40
35
|
#include "rbffi.h"
|
@@ -112,7 +107,7 @@ memptr_malloc(VALUE self, long size, long count, bool clear)
|
|
112
107
|
p->memory.typeSize = (int) size;
|
113
108
|
p->memory.size = msize;
|
114
109
|
/* ensure the memory is aligned on at least a 8 byte boundary */
|
115
|
-
p->memory.address = (char *) (((uintptr_t) p->storage + 0x7) & (uintptr_t) ~
|
110
|
+
p->memory.address = (char *) (((uintptr_t) p->storage + 0x7) & (uintptr_t) ~0x7ULL);
|
116
111
|
p->allocated = true;
|
117
112
|
|
118
113
|
if (clear && p->memory.size > 0) {
|
data/ext/ffi_c/MemoryPointer.h
CHANGED
data/ext/ffi_c/MethodHandle.c
CHANGED
@@ -34,13 +34,8 @@
|
|
34
34
|
# include <sys/mman.h>
|
35
35
|
#endif
|
36
36
|
#include <stdio.h>
|
37
|
-
#
|
38
|
-
#
|
39
|
-
# include <stdbool.h>
|
40
|
-
#else
|
41
|
-
# include "win32/stdint.h"
|
42
|
-
# include "win32/stdbool.h"
|
43
|
-
#endif
|
37
|
+
#include <stdint.h>
|
38
|
+
#include <stdbool.h>
|
44
39
|
#ifndef _WIN32
|
45
40
|
# include <unistd.h>
|
46
41
|
#endif
|
@@ -68,9 +63,6 @@
|
|
68
63
|
#ifndef roundup
|
69
64
|
# define roundup(x, y) ((((x)+((y)-1))/(y))*(y))
|
70
65
|
#endif
|
71
|
-
#ifdef _WIN32
|
72
|
-
typedef char* caddr_t;
|
73
|
-
#endif
|
74
66
|
|
75
67
|
#ifdef USE_RAW
|
76
68
|
# define METHOD_CLOSURE ffi_raw_closure
|
@@ -120,23 +112,19 @@ rbffi_MethodHandle_Free(MethodHandle* handle)
|
|
120
112
|
{
|
121
113
|
if (handle != NULL) {
|
122
114
|
rbffi_Closure_Free(handle->closure);
|
115
|
+
xfree(handle);
|
123
116
|
}
|
124
117
|
}
|
125
118
|
|
126
|
-
|
127
|
-
rbffi_MethodHandle_CodeAddress(MethodHandle* handle)
|
119
|
+
rbffi_function_anyargs rbffi_MethodHandle_CodeAddress(MethodHandle* handle)
|
128
120
|
{
|
129
|
-
return handle->closure->code;
|
121
|
+
return (rbffi_function_anyargs) handle->closure->code;
|
130
122
|
}
|
131
123
|
|
132
124
|
#ifndef CUSTOM_TRAMPOLINE
|
133
125
|
static void attached_method_invoke(ffi_cif* cif, void* retval, METHOD_PARAMS parameters, void* user_data);
|
134
126
|
|
135
|
-
static ffi_type* methodHandleParamTypes[]
|
136
|
-
&ffi_type_sint,
|
137
|
-
&ffi_type_pointer,
|
138
|
-
&ffi_type_ulong,
|
139
|
-
};
|
127
|
+
static ffi_type* methodHandleParamTypes[3];
|
140
128
|
|
141
129
|
static ffi_cif mh_cif;
|
142
130
|
|
@@ -148,10 +136,10 @@ prep_trampoline(void* ctx, void* code, Closure* closure, char* errmsg, size_t er
|
|
148
136
|
#if defined(USE_RAW)
|
149
137
|
ffiStatus = ffi_prep_raw_closure(code, &mh_cif, attached_method_invoke, closure);
|
150
138
|
#else
|
151
|
-
ffiStatus =
|
139
|
+
ffiStatus = ffi_prep_closure_loc(closure->pcl, &mh_cif, attached_method_invoke, closure, code);
|
152
140
|
#endif
|
153
141
|
if (ffiStatus != FFI_OK) {
|
154
|
-
snprintf(errmsg, errmsgsize, "
|
142
|
+
snprintf(errmsg, errmsgsize, "ffi_prep_closure_loc failed. status=%#x", ffiStatus);
|
155
143
|
return false;
|
156
144
|
}
|
157
145
|
|
@@ -237,7 +225,7 @@ custom_trampoline(int argc, VALUE* argv, VALUE self, Closure* handle)
|
|
237
225
|
|
238
226
|
#elif defined(__i386__) && 0
|
239
227
|
|
240
|
-
static VALUE custom_trampoline(
|
228
|
+
static VALUE custom_trampoline(void *args, Closure*);
|
241
229
|
#define TRAMPOLINE_CTX_MAGIC (0xfee1dead)
|
242
230
|
#define TRAMPOLINE_FUN_MAGIC (0xbeefcafe)
|
243
231
|
|
@@ -269,7 +257,7 @@ __asm__(
|
|
269
257
|
);
|
270
258
|
|
271
259
|
static VALUE
|
272
|
-
custom_trampoline(
|
260
|
+
custom_trampoline(void *args, Closure* handle)
|
273
261
|
{
|
274
262
|
FunctionType* fnInfo = (FunctionType *) handle->info;
|
275
263
|
return (*fnInfo->invoke)(*(int *) args, *(VALUE **) (args + 4), handle->function, fnInfo);
|
@@ -286,10 +274,10 @@ static long trampoline_ctx_offset, trampoline_func_offset;
|
|
286
274
|
static long
|
287
275
|
trampoline_offset(int off, const long value)
|
288
276
|
{
|
289
|
-
|
290
|
-
for (ptr = (
|
277
|
+
char *ptr;
|
278
|
+
for (ptr = (char *) &ffi_trampoline + off; ptr < (char *) &ffi_trampoline_end; ++ptr) {
|
291
279
|
if (*(long *) ptr == value) {
|
292
|
-
return ptr - (
|
280
|
+
return ptr - (char *) &ffi_trampoline;
|
293
281
|
}
|
294
282
|
}
|
295
283
|
|
@@ -315,12 +303,10 @@ trampoline_offsets(long* ctxOffset, long* fnOffset)
|
|
315
303
|
static bool
|
316
304
|
prep_trampoline(void* ctx, void* code, Closure* closure, char* errmsg, size_t errmsgsize)
|
317
305
|
{
|
318
|
-
|
319
|
-
|
320
|
-
memcpy(ptr, &ffi_trampoline, trampoline_size());
|
306
|
+
memcpy(code, (void*) &ffi_trampoline, trampoline_size());
|
321
307
|
/* Patch the context and function addresses into the stub code */
|
322
|
-
*(intptr_t *)(
|
323
|
-
*(intptr_t *)(
|
308
|
+
*(intptr_t *)((char*)code + trampoline_ctx_offset) = (intptr_t) closure;
|
309
|
+
*(intptr_t *)((char*)code + trampoline_func_offset) = (intptr_t) custom_trampoline;
|
324
310
|
|
325
311
|
return true;
|
326
312
|
}
|
@@ -328,7 +314,7 @@ prep_trampoline(void* ctx, void* code, Closure* closure, char* errmsg, size_t er
|
|
328
314
|
static long
|
329
315
|
trampoline_size(void)
|
330
316
|
{
|
331
|
-
return (
|
317
|
+
return (char *) &ffi_trampoline_end - (char *) &ffi_trampoline;
|
332
318
|
}
|
333
319
|
|
334
320
|
#endif /* CUSTOM_TRAMPOLINE */
|
@@ -348,6 +334,10 @@ rbffi_MethodHandle_Init(VALUE module)
|
|
348
334
|
rb_raise(rb_eFatal, "Could not locate offsets in trampoline code");
|
349
335
|
}
|
350
336
|
#else
|
337
|
+
methodHandleParamTypes[0] = &ffi_type_sint;
|
338
|
+
methodHandleParamTypes[1] = &ffi_type_pointer;
|
339
|
+
methodHandleParamTypes[2] = &ffi_type_ulong;
|
340
|
+
|
351
341
|
ffiStatus = ffi_prep_cif(&mh_cif, FFI_DEFAULT_ABI, 3, &ffi_type_ulong,
|
352
342
|
methodHandleParamTypes);
|
353
343
|
if (ffiStatus != FFI_OK) {
|
data/ext/ffi_c/MethodHandle.h
CHANGED
@@ -37,14 +37,15 @@ extern "C" {
|
|
37
37
|
#include <ruby.h>
|
38
38
|
#include "Function.h"
|
39
39
|
|
40
|
-
|
40
|
+
|
41
41
|
typedef struct MethodHandlePool MethodHandlePool;
|
42
42
|
typedef struct MethodHandle MethodHandle;
|
43
|
+
typedef VALUE (*rbffi_function_anyargs)(int argc, VALUE* argv, VALUE self);
|
43
44
|
|
44
45
|
|
45
46
|
MethodHandle* rbffi_MethodHandle_Alloc(FunctionType* fnInfo, void* function);
|
46
47
|
void rbffi_MethodHandle_Free(MethodHandle* handle);
|
47
|
-
|
48
|
+
rbffi_function_anyargs rbffi_MethodHandle_CodeAddress(MethodHandle* handle);
|
48
49
|
void rbffi_MethodHandle_Init(VALUE module);
|
49
50
|
|
50
51
|
#ifdef __cplusplus
|