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/Rakefile
CHANGED
@@ -1,106 +1,24 @@
|
|
1
|
-
require 'rubygems/tasks'
|
2
1
|
require 'rbconfig'
|
3
|
-
require 'rake/clean'
|
4
|
-
require File.expand_path("./lib/ffi/version")
|
5
|
-
|
6
|
-
USE_RAKE_COMPILER = (RUBY_PLATFORM =~ /java/) ? false : true
|
7
|
-
if USE_RAKE_COMPILER
|
8
|
-
require 'rake/extensiontask'
|
9
|
-
end
|
10
|
-
|
11
2
|
require 'date'
|
12
3
|
require 'fileutils'
|
13
4
|
require 'rbconfig'
|
14
5
|
require 'rspec/core/rake_task'
|
15
6
|
require 'rubygems/package_task'
|
7
|
+
require 'rake/extensiontask'
|
8
|
+
require_relative "lib/ffi/version"
|
9
|
+
require_relative "rakelib/ffi_gem_helper"
|
16
10
|
|
17
|
-
LIBEXT = case RbConfig::CONFIG['host_os'].downcase
|
18
|
-
when /darwin/
|
19
|
-
"dylib"
|
20
|
-
when /mswin|mingw/
|
21
|
-
"dll"
|
22
|
-
else
|
23
|
-
RbConfig::CONFIG['DLEXT']
|
24
|
-
end
|
25
|
-
|
26
|
-
CPU = case RbConfig::CONFIG['host_cpu'].downcase
|
27
|
-
when /i[3456]86/
|
28
|
-
# Darwin always reports i686, even when running in 64bit mode
|
29
|
-
if RbConfig::CONFIG['host_os'] =~ /darwin/ && 0xfee1deadbeef.is_a?(Fixnum)
|
30
|
-
"x86_64"
|
31
|
-
else
|
32
|
-
"i386"
|
33
|
-
end
|
34
|
-
|
35
|
-
when /amd64|x86_64/
|
36
|
-
"x86_64"
|
37
|
-
|
38
|
-
when /ppc64|powerpc64/
|
39
|
-
"powerpc64"
|
40
|
-
|
41
|
-
when /ppc|powerpc/
|
42
|
-
"powerpc"
|
43
|
-
|
44
|
-
when /^arm/
|
45
|
-
"arm"
|
46
|
-
|
47
|
-
else
|
48
|
-
RbConfig::CONFIG['host_cpu']
|
49
|
-
end
|
50
|
-
|
51
|
-
OS = case RbConfig::CONFIG['host_os'].downcase
|
52
|
-
when /linux/
|
53
|
-
"linux"
|
54
|
-
when /darwin/
|
55
|
-
"darwin"
|
56
|
-
when /freebsd/
|
57
|
-
"freebsd"
|
58
|
-
when /openbsd/
|
59
|
-
"openbsd"
|
60
|
-
when /sunos|solaris/
|
61
|
-
"solaris"
|
62
|
-
when /mswin|mingw/
|
63
|
-
"win32"
|
64
|
-
else
|
65
|
-
RbConfig::CONFIG['host_os'].downcase
|
66
|
-
end
|
67
|
-
|
68
|
-
def which(name)
|
69
|
-
exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
|
70
|
-
ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
|
71
|
-
exts.each do |ext|
|
72
|
-
app = File.join(path, name+ext)
|
73
|
-
return app if File.executable? app
|
74
|
-
end
|
75
|
-
end
|
76
|
-
nil
|
77
|
-
end
|
78
|
-
|
79
|
-
GMAKE = which('gmake').nil? ? 'make' : 'gmake'
|
80
|
-
|
81
|
-
LIBTEST = "build/libtest.#{LIBEXT}"
|
82
11
|
BUILD_DIR = "build"
|
83
12
|
BUILD_EXT_DIR = File.join(BUILD_DIR, "#{RbConfig::CONFIG['arch']}", 'ffi_c', RUBY_VERSION)
|
84
13
|
|
85
|
-
|
86
|
-
@gem_spec ||= Gem::Specification.load('ffi.gemspec')
|
87
|
-
end
|
14
|
+
gem_spec = Bundler.load_gemspec('ffi.gemspec')
|
88
15
|
|
89
|
-
|
90
|
-
|
91
|
-
RSpec::Core::RakeTask.new(:spec) do |config|
|
92
|
-
config.rspec_opts = YAML.load_file 'spec/spec.opts'
|
93
|
-
end
|
94
|
-
else
|
95
|
-
RSpec::Core::RakeTask.new(:spec => :compile) do |config|
|
96
|
-
config.rspec_opts = YAML.load_file 'spec/spec.opts'
|
97
|
-
end
|
98
|
-
|
99
|
-
TEST_DEPS.unshift :compile
|
16
|
+
RSpec::Core::RakeTask.new(:spec => :compile) do |config|
|
17
|
+
config.rspec_opts = YAML.load_file 'spec/spec.opts'
|
100
18
|
end
|
101
19
|
|
102
20
|
desc "Build all packages"
|
103
|
-
task :package => %w[ gem:java gem:
|
21
|
+
task :package => %w[ gem:java gem:native ]
|
104
22
|
|
105
23
|
CLOBBER.include 'lib/ffi/types.conf'
|
106
24
|
CLOBBER.include 'pkg'
|
@@ -110,21 +28,20 @@ CLEAN.include 'build'
|
|
110
28
|
CLEAN.include 'conftest.dSYM'
|
111
29
|
CLEAN.include 'spec/ffi/fixtures/libtest.{dylib,so,dll}'
|
112
30
|
CLEAN.include 'spec/ffi/fixtures/*.o'
|
31
|
+
CLEAN.include 'spec/ffi/embed-test/ext/*.{o,def}'
|
32
|
+
CLEAN.include 'spec/ffi/embed-test/ext/Makefile'
|
113
33
|
CLEAN.include "pkg/ffi-*-{mingw32,java}"
|
114
34
|
CLEAN.include 'lib/1.*'
|
115
35
|
CLEAN.include 'lib/2.*'
|
116
|
-
CLEAN.include 'bin'
|
117
|
-
|
118
|
-
task :distclean => :clobber
|
119
|
-
|
120
|
-
desc "Build the native test lib"
|
121
|
-
file "build/libtest.#{LIBEXT}" => FileList['libtest/**/*.[ch]'] do
|
122
|
-
sh %{#{GMAKE} -f libtest/GNUmakefile CPU=#{CPU} OS=#{OS} }
|
123
|
-
end
|
124
36
|
|
37
|
+
# clean all shipped files, that are not in git
|
38
|
+
CLEAN.include(
|
39
|
+
gem_spec.files -
|
40
|
+
`git --git-dir ext/ffi_c/libffi/.git ls-files -z`.split("\x0").map { |f| File.join("ext/ffi_c/libffi", f) } -
|
41
|
+
`git ls-files -z`.split("\x0")
|
42
|
+
)
|
125
43
|
|
126
|
-
|
127
|
-
task :libtest => "build/libtest.#{LIBEXT}"
|
44
|
+
task :distclean => :clobber
|
128
45
|
|
129
46
|
desc "Test the extension"
|
130
47
|
task :test => [ :spec ]
|
@@ -132,37 +49,29 @@ task :test => [ :spec ]
|
|
132
49
|
|
133
50
|
namespace :bench do
|
134
51
|
ITER = ENV['ITER'] ? ENV['ITER'].to_i : 100000
|
135
|
-
|
136
|
-
bench_files = Dir["bench/bench_*.rb"].reject { |f| f == "bench_helper.rb" }
|
52
|
+
bench_files = Dir["bench/bench_*.rb"].sort.reject { |f| f == "bench/bench_helper.rb" }
|
137
53
|
bench_files.each do |bench|
|
138
|
-
task File.basename(bench, ".rb")[6..-1] =>
|
139
|
-
sh %{#{Gem.ruby} #{
|
54
|
+
task File.basename(bench, ".rb")[6..-1] => :compile do
|
55
|
+
sh %{#{Gem.ruby} #{bench} #{ITER}}
|
140
56
|
end
|
141
57
|
end
|
142
|
-
task :all =>
|
58
|
+
task :all => :compile do
|
143
59
|
bench_files.each do |bench|
|
144
|
-
sh %{#{Gem.ruby} #{
|
60
|
+
sh %{#{Gem.ruby} #{bench}}
|
145
61
|
end
|
146
62
|
end
|
147
63
|
end
|
148
64
|
|
149
|
-
task 'spec:run' =>
|
150
|
-
task 'spec:specdoc' =>
|
65
|
+
task 'spec:run' => :compile
|
66
|
+
task 'spec:specdoc' => :compile
|
151
67
|
|
152
68
|
task :default => :spec
|
153
69
|
|
154
70
|
namespace 'java' do
|
155
71
|
|
156
|
-
java_gem_spec =
|
157
|
-
s.
|
158
|
-
s.
|
159
|
-
s.author = gem_spec.author
|
160
|
-
s.email = gem_spec.email
|
161
|
-
s.homepage = gem_spec.homepage
|
162
|
-
s.summary = gem_spec.summary
|
163
|
-
s.description = gem_spec.description
|
164
|
-
s.files = %w(LICENSE COPYING README.md CHANGELOG.md Rakefile)
|
165
|
-
s.license = gem_spec.license
|
72
|
+
java_gem_spec = gem_spec.dup.tap do |s|
|
73
|
+
s.files.reject! { |f| File.fnmatch?("ext/*", f) }
|
74
|
+
s.extensions = []
|
166
75
|
s.platform = 'java'
|
167
76
|
end
|
168
77
|
|
@@ -175,36 +84,49 @@ end
|
|
175
84
|
|
176
85
|
task 'gem:java' => 'java:gem'
|
177
86
|
|
87
|
+
FfiGemHelper.install_tasks
|
88
|
+
# Register windows gems to be pushed to rubygems.org
|
89
|
+
Bundler::GemHelper.instance.cross_platforms = %w[x86-mingw32 x64-mingw-ucrt x64-mingw32]
|
178
90
|
|
179
|
-
if
|
91
|
+
if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
|
92
|
+
require 'rake/extensiontask'
|
180
93
|
Rake::ExtensionTask.new('ffi_c', gem_spec) do |ext|
|
181
94
|
ext.name = 'ffi_c' # indicate the name of the extension.
|
182
95
|
# ext.lib_dir = BUILD_DIR # put binaries into this folder.
|
183
96
|
ext.tmp_dir = BUILD_DIR # temporary folder used during compilation.
|
184
97
|
ext.cross_compile = true # enable cross compilation (requires cross compile toolchain)
|
185
|
-
ext.cross_platform =
|
98
|
+
ext.cross_platform = Bundler::GemHelper.instance.cross_platforms
|
186
99
|
ext.cross_compiling do |spec|
|
187
100
|
spec.files.reject! { |path| File.fnmatch?('ext/*', path) }
|
188
101
|
end
|
102
|
+
|
189
103
|
end
|
104
|
+
else
|
105
|
+
task :compile do
|
106
|
+
STDERR.puts "Nothing to compile on #{RUBY_ENGINE}"
|
107
|
+
end
|
108
|
+
end
|
190
109
|
|
191
|
-
# To reduce the gem file size strip mingw32 dlls before packaging
|
192
|
-
ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
|
193
|
-
task "build/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so" do |t|
|
194
|
-
sh "i686-w64-mingw32-strip -S build/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
|
195
|
-
end
|
196
110
|
|
197
|
-
|
198
|
-
|
199
|
-
|
111
|
+
namespace "gem" do
|
112
|
+
task 'prepare' do
|
113
|
+
require 'rake_compiler_dock'
|
114
|
+
sh "bundle package --all"
|
200
115
|
end
|
201
|
-
end
|
202
116
|
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
117
|
+
Bundler::GemHelper.instance.cross_platforms.each do |plat|
|
118
|
+
desc "Build all native binary gems in parallel"
|
119
|
+
multitask 'native' => plat
|
120
|
+
|
121
|
+
desc "Build the native gem for #{plat}"
|
122
|
+
task plat => ['prepare', 'build'] do
|
123
|
+
RakeCompilerDock.sh <<-EOT, platform: plat
|
124
|
+
sudo apt-get update &&
|
125
|
+
sudo apt-get install -y libltdl-dev && bundle --local &&
|
126
|
+
rake cross native gem MAKE='nice make -j`nproc`' RUBY_CC_VERSION=${RUBY_CC_VERSION/:2.2.2/}
|
127
|
+
EOT
|
128
|
+
end
|
129
|
+
end
|
208
130
|
end
|
209
131
|
|
210
132
|
directory "ext/ffi_c/libffi"
|
@@ -212,10 +134,11 @@ file "ext/ffi_c/libffi/autogen.sh" => "ext/ffi_c/libffi" do
|
|
212
134
|
warn "Downloading libffi ..."
|
213
135
|
sh "git submodule update --init --recursive"
|
214
136
|
end
|
137
|
+
task :libffi => "ext/ffi_c/libffi/autogen.sh"
|
215
138
|
|
216
139
|
LIBFFI_GIT_FILES = `git --git-dir ext/ffi_c/libffi/.git ls-files -z`.split("\x0")
|
217
140
|
|
218
|
-
# Generate files in gemspec but not in libffi's git repo by running autogen.sh
|
141
|
+
# Generate files which are in the gemspec but not in libffi's git repo by running autogen.sh
|
219
142
|
gem_spec.files.select do |f|
|
220
143
|
f =~ /ext\/ffi_c\/libffi\/(.*)/ && !LIBFFI_GIT_FILES.include?($1)
|
221
144
|
end.each do |f|
|
@@ -231,16 +154,20 @@ end.each do |f|
|
|
231
154
|
end
|
232
155
|
end
|
233
156
|
|
234
|
-
|
235
|
-
|
157
|
+
# Make sure we have all gemspec files before packaging
|
158
|
+
task :build => gem_spec.files
|
159
|
+
task :gem => :build
|
160
|
+
|
161
|
+
|
162
|
+
require_relative "lib/ffi/platform"
|
236
163
|
types_conf = File.expand_path(File.join(FFI::Platform::CONF_DIR, 'types.conf'))
|
237
164
|
logfile = File.join(File.dirname(__FILE__), 'types_log')
|
238
165
|
|
239
|
-
|
166
|
+
task types_conf do |task|
|
240
167
|
require 'fileutils'
|
241
|
-
|
168
|
+
require_relative "lib/ffi/tools/types_generator"
|
242
169
|
options = {}
|
243
|
-
FileUtils.mkdir_p(File.dirname(task.name),
|
170
|
+
FileUtils.mkdir_p(File.dirname(task.name), mode: 0755 )
|
244
171
|
File.open(task.name, File::CREAT|File::TRUNC|File::RDWR, 0644) do |f|
|
245
172
|
f.puts FFI::TypesGenerator.generate(options)
|
246
173
|
end
|
@@ -249,12 +176,8 @@ file types_conf => File.join("lib", "ffi", "version.rb") do |task|
|
|
249
176
|
end
|
250
177
|
end
|
251
178
|
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
Gem::Tasks.new do |t|
|
256
|
-
t.scm.tag.format = '%s'
|
257
|
-
end
|
179
|
+
desc "Create or update type information for platform #{FFI::Platform::NAME}"
|
180
|
+
task :types_conf => types_conf
|
258
181
|
|
259
182
|
begin
|
260
183
|
require 'yard'
|
data/ext/ffi_c/AbstractMemory.c
CHANGED
@@ -32,12 +32,9 @@
|
|
32
32
|
#include <sys/types.h>
|
33
33
|
#ifndef _MSC_VER
|
34
34
|
# include <sys/param.h>
|
35
|
-
# include <stdint.h>
|
36
|
-
# include <stdbool.h>
|
37
|
-
#else
|
38
|
-
# include "win32/stdbool.h"
|
39
|
-
# include "win32/stdint.h"
|
40
35
|
#endif
|
36
|
+
#include <stdint.h>
|
37
|
+
#include <stdbool.h>
|
41
38
|
|
42
39
|
#include <limits.h>
|
43
40
|
#include <ruby.h>
|
@@ -135,11 +132,13 @@ static VALUE memory_put_array_of_##name(VALUE self, VALUE offset, VALUE ary); \
|
|
135
132
|
static VALUE \
|
136
133
|
memory_put_array_of_##name(VALUE self, VALUE offset, VALUE ary) \
|
137
134
|
{ \
|
138
|
-
long count
|
135
|
+
long count; \
|
139
136
|
long off = NUM2LONG(offset); \
|
140
137
|
AbstractMemory* memory = MEMORY(self); \
|
141
138
|
long i; \
|
142
|
-
|
139
|
+
Check_Type(ary, T_ARRAY); \
|
140
|
+
count = RARRAY_LEN(ary); \
|
141
|
+
if (likely(count > 0)) checkWrite(memory); \
|
143
142
|
checkBounds(memory, off, count * sizeof(type)); \
|
144
143
|
for (i = 0; i < count; i++) { \
|
145
144
|
type tmp = (type) VAL(toNative(RARRAY_PTR(ary)[i]), swap); \
|
@@ -162,7 +161,7 @@ memory_get_array_of_##name(VALUE self, VALUE offset, VALUE length) \
|
|
162
161
|
AbstractMemory* memory = MEMORY(self); \
|
163
162
|
VALUE retVal = rb_ary_new2(count); \
|
164
163
|
long i; \
|
165
|
-
checkRead(memory); \
|
164
|
+
if (likely(count > 0)) checkRead(memory); \
|
166
165
|
checkBounds(memory, off, count * sizeof(type)); \
|
167
166
|
for (i = 0; i < count; ++i) { \
|
168
167
|
type tmp; \
|
@@ -209,13 +208,13 @@ SWAPU16(uint16_t x)
|
|
209
208
|
((x >> 40) & 0x000000000000ff00ULL) | \
|
210
209
|
((x >> 56) & 0x00000000000000ffULL))
|
211
210
|
|
212
|
-
static inline int32_t
|
211
|
+
static inline int32_t
|
213
212
|
SWAPS32(int32_t x)
|
214
213
|
{
|
215
214
|
return bswap32(x);
|
216
215
|
}
|
217
216
|
|
218
|
-
static inline uint32_t
|
217
|
+
static inline uint32_t
|
219
218
|
SWAPU32(uint32_t x)
|
220
219
|
{
|
221
220
|
return bswap32(x);
|
@@ -417,7 +416,7 @@ memory_get_string(int argc, VALUE* argv, VALUE self)
|
|
417
416
|
checkBounds(ptr, off, len);
|
418
417
|
|
419
418
|
end = memchr(ptr->address + off, 0, len);
|
420
|
-
return
|
419
|
+
return rb_str_new((char *) ptr->address + off,
|
421
420
|
(end != NULL ? end - ptr->address - off : len));
|
422
421
|
}
|
423
422
|
|
@@ -450,10 +449,10 @@ memory_get_array_of_string(int argc, VALUE* argv, VALUE self)
|
|
450
449
|
int i;
|
451
450
|
|
452
451
|
checkBounds(ptr, off, count * sizeof (char*));
|
453
|
-
|
452
|
+
|
454
453
|
for (i = 0; i < count; ++i) {
|
455
454
|
const char* strptr = *((const char**) (ptr->address + off) + i);
|
456
|
-
rb_ary_push(retVal, (strptr == NULL ? Qnil :
|
455
|
+
rb_ary_push(retVal, (strptr == NULL ? Qnil : rb_str_new2(strptr)));
|
457
456
|
}
|
458
457
|
|
459
458
|
} else {
|
@@ -463,7 +462,7 @@ memory_get_array_of_string(int argc, VALUE* argv, VALUE self)
|
|
463
462
|
if (strptr == NULL) {
|
464
463
|
break;
|
465
464
|
}
|
466
|
-
rb_ary_push(retVal,
|
465
|
+
rb_ary_push(retVal, rb_str_new2(strptr));
|
467
466
|
}
|
468
467
|
}
|
469
468
|
|
@@ -477,7 +476,7 @@ memory_get_array_of_string(int argc, VALUE* argv, VALUE self)
|
|
477
476
|
* @param [Numeric] count number of strings to get. If nil, return all strings
|
478
477
|
* @return [Array<String>]
|
479
478
|
*/
|
480
|
-
static VALUE
|
479
|
+
static VALUE
|
481
480
|
memory_read_array_of_string(int argc, VALUE* argv, VALUE self)
|
482
481
|
{
|
483
482
|
VALUE* rargv = ALLOCA_N(VALUE, argc + 1);
|
@@ -535,14 +534,14 @@ memory_get_bytes(VALUE self, VALUE offset, VALUE length)
|
|
535
534
|
{
|
536
535
|
AbstractMemory* ptr = MEMORY(self);
|
537
536
|
long off, len;
|
538
|
-
|
537
|
+
|
539
538
|
off = NUM2LONG(offset);
|
540
539
|
len = NUM2LONG(length);
|
541
540
|
|
542
541
|
checkRead(ptr);
|
543
542
|
checkBounds(ptr, off, len);
|
544
|
-
|
545
|
-
return
|
543
|
+
|
544
|
+
return rb_str_new((char *) ptr->address + off, len);
|
546
545
|
}
|
547
546
|
|
548
547
|
/*
|
@@ -583,10 +582,6 @@ memory_put_bytes(int argc, VALUE* argv, VALUE self)
|
|
583
582
|
checkWrite(ptr);
|
584
583
|
checkBounds(ptr, off, len);
|
585
584
|
|
586
|
-
if (rb_safe_level() >= 1 && OBJ_TAINTED(str)) {
|
587
|
-
rb_raise(rb_eSecurityError, "Writing unsafe string to memory");
|
588
|
-
return Qnil;
|
589
|
-
}
|
590
585
|
memcpy(ptr->address + off, RSTRING_PTR(str) + idx, len);
|
591
586
|
|
592
587
|
return self;
|
@@ -599,7 +594,7 @@ memory_put_bytes(int argc, VALUE* argv, VALUE self)
|
|
599
594
|
* equivalent to :
|
600
595
|
* memory.get_bytes(0, length)
|
601
596
|
*/
|
602
|
-
static VALUE
|
597
|
+
static VALUE
|
603
598
|
memory_read_bytes(VALUE self, VALUE length)
|
604
599
|
{
|
605
600
|
return memory_get_bytes(self, INT2FIX(0), length);
|
@@ -614,7 +609,7 @@ memory_read_bytes(VALUE self, VALUE length)
|
|
614
609
|
* equivalent to :
|
615
610
|
* memory.put_bytes(0, str, index, length)
|
616
611
|
*/
|
617
|
-
static VALUE
|
612
|
+
static VALUE
|
618
613
|
memory_write_bytes(int argc, VALUE* argv, VALUE self)
|
619
614
|
{
|
620
615
|
VALUE* wargv = ALLOCA_N(VALUE, argc + 1);
|
@@ -647,7 +642,7 @@ memory_type_size(VALUE self)
|
|
647
642
|
* Document-method: []
|
648
643
|
* call-seq: memory[idx]
|
649
644
|
* @param [Numeric] idx index to access in memory
|
650
|
-
* @return
|
645
|
+
* @return
|
651
646
|
* Memory read accessor.
|
652
647
|
*/
|
653
648
|
static VALUE
|
@@ -718,7 +713,7 @@ memory_op_get_strptr(AbstractMemory* ptr, long offset)
|
|
718
713
|
memcpy(&tmp, ptr->address + offset, sizeof(tmp));
|
719
714
|
}
|
720
715
|
|
721
|
-
return tmp != NULL ?
|
716
|
+
return tmp != NULL ? rb_str_new2(tmp) : Qnil;
|
722
717
|
}
|
723
718
|
|
724
719
|
static void
|
@@ -752,9 +747,9 @@ MemoryOps rbffi_AbstractMemoryOps = {
|
|
752
747
|
void
|
753
748
|
rbffi_AbstractMemory_Init(VALUE moduleFFI)
|
754
749
|
{
|
755
|
-
/*
|
750
|
+
/*
|
756
751
|
* Document-class: FFI::AbstractMemory
|
757
|
-
*
|
752
|
+
*
|
758
753
|
* {AbstractMemory} is the base class for many memory management classes such as {Buffer}.
|
759
754
|
*
|
760
755
|
* This class has a lot of methods to work with integers :
|
@@ -782,8 +777,8 @@ rbffi_AbstractMemory_Init(VALUE moduleFFI)
|
|
782
777
|
*/
|
783
778
|
VALUE classMemory = rb_define_class_under(moduleFFI, "AbstractMemory", rb_cObject);
|
784
779
|
rbffi_AbstractMemoryClass = classMemory;
|
785
|
-
/*
|
786
|
-
* Document-variable: FFI::AbstractMemory
|
780
|
+
/*
|
781
|
+
* Document-variable: FFI::AbstractMemory
|
787
782
|
*/
|
788
783
|
rb_global_variable(&rbffi_AbstractMemoryClass);
|
789
784
|
rb_define_alloc_func(classMemory, memory_allocate);
|
@@ -811,13 +806,13 @@ rbffi_AbstractMemory_Init(VALUE moduleFFI)
|
|
811
806
|
rb_define_method(classMemory, "read_array_of_" #type, memory_read_array_of_##type, 1); \
|
812
807
|
rb_define_method(classMemory, "write_array_of_u" #type, memory_write_array_of_u##type, 1); \
|
813
808
|
rb_define_method(classMemory, "read_array_of_u" #type, memory_read_array_of_u##type, 1);
|
814
|
-
|
809
|
+
|
815
810
|
INT(int8);
|
816
811
|
INT(int16);
|
817
812
|
INT(int32);
|
818
813
|
INT(int64);
|
819
814
|
INT(long);
|
820
|
-
|
815
|
+
|
821
816
|
#define ALIAS(name, old) \
|
822
817
|
rb_define_alias(classMemory, "put_" #name, "put_" #old); \
|
823
818
|
rb_define_alias(classMemory, "get_" #name, "get_" #old); \
|
@@ -835,12 +830,12 @@ rbffi_AbstractMemory_Init(VALUE moduleFFI)
|
|
835
830
|
rb_define_alias(classMemory, "read_array_of_" #name, "read_array_of_" #old); \
|
836
831
|
rb_define_alias(classMemory, "write_array_of_u" #name, "write_array_of_u" #old); \
|
837
832
|
rb_define_alias(classMemory, "read_array_of_u" #name, "read_array_of_u" #old);
|
838
|
-
|
833
|
+
|
839
834
|
ALIAS(char, int8);
|
840
835
|
ALIAS(short, int16);
|
841
836
|
ALIAS(int, int32);
|
842
837
|
ALIAS(long_long, int64);
|
843
|
-
|
838
|
+
|
844
839
|
/*
|
845
840
|
* Document-method: put_float32
|
846
841
|
* call-seq: memory.put_float32offset, value)
|
data/ext/ffi_c/Buffer.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 <stdbool.h>
|
34
|
-
#else
|
35
|
-
# include "win32/stdbool.h"
|
36
|
-
# include "win32/stdint.h"
|
37
|
-
#endif
|
31
|
+
#include <stdint.h>
|
32
|
+
#include <stdbool.h>
|
38
33
|
#include <limits.h>
|
39
34
|
#include <ruby.h>
|
40
35
|
#include "rbffi.h"
|
@@ -114,7 +109,7 @@ buffer_initialize(int argc, VALUE* argv, VALUE self)
|
|
114
109
|
}
|
115
110
|
|
116
111
|
/* ensure the memory is aligned on at least a 8 byte boundary */
|
117
|
-
p->memory.address = (void *) (((uintptr_t) p->data.storage + 0x7) & (uintptr_t) ~
|
112
|
+
p->memory.address = (void *) (((uintptr_t) p->data.storage + 0x7) & (uintptr_t) ~0x7ULL);
|
118
113
|
|
119
114
|
if (p->memory.size > 0 && (nargs < 3 || RTEST(rbClear))) {
|
120
115
|
memset(p->memory.address, 0, p->memory.size);
|
@@ -154,7 +149,7 @@ buffer_initialize_copy(VALUE self, VALUE other)
|
|
154
149
|
return Qnil;
|
155
150
|
}
|
156
151
|
|
157
|
-
dst->memory.address = (void *) (((uintptr_t) dst->data.storage + 0x7) & (uintptr_t) ~
|
152
|
+
dst->memory.address = (void *) (((uintptr_t) dst->data.storage + 0x7) & (uintptr_t) ~0x7ULL);
|
158
153
|
dst->memory.size = src->size;
|
159
154
|
dst->memory.typeSize = src->typeSize;
|
160
155
|
|