ffi 1.9.24 → 1.16.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data/CHANGELOG.md +348 -0
- data/Gemfile +4 -5
- data/README.md +44 -17
- data/Rakefile +74 -148
- data/ext/ffi_c/AbstractMemory.c +89 -70
- data/ext/ffi_c/AbstractMemory.h +3 -2
- data/ext/ffi_c/ArrayType.c +49 -13
- data/ext/ffi_c/ArrayType.h +1 -0
- data/ext/ffi_c/Buffer.c +90 -38
- data/ext/ffi_c/Call.c +55 -56
- data/ext/ffi_c/Call.h +12 -6
- data/ext/ffi_c/ClosurePool.c +333 -0
- data/ext/ffi_c/{Closure.h → ClosurePool.h} +25 -13
- data/ext/ffi_c/DynamicLibrary.c +91 -33
- data/ext/ffi_c/Function.c +306 -235
- data/ext/ffi_c/Function.h +3 -5
- data/ext/ffi_c/FunctionInfo.c +87 -32
- data/ext/ffi_c/LastError.c +74 -15
- data/ext/ffi_c/LongDouble.c +12 -10
- data/ext/ffi_c/LongDouble.h +0 -4
- data/ext/ffi_c/MappedType.c +66 -23
- data/ext/ffi_c/MappedType.h +0 -2
- data/ext/ffi_c/MemoryPointer.c +37 -15
- data/ext/ffi_c/MemoryPointer.h +0 -4
- data/ext/ffi_c/MethodHandle.c +265 -38
- data/ext/ffi_c/MethodHandle.h +3 -2
- data/ext/ffi_c/Platform.c +5 -56
- data/ext/ffi_c/Pointer.c +93 -55
- data/ext/ffi_c/Pointer.h +1 -4
- data/ext/ffi_c/Struct.c +202 -134
- data/ext/ffi_c/Struct.h +18 -9
- data/ext/ffi_c/StructByValue.c +50 -23
- data/ext/ffi_c/StructLayout.c +135 -64
- data/ext/ffi_c/Thread.c +4 -228
- data/ext/ffi_c/Thread.h +1 -20
- data/ext/ffi_c/Type.c +105 -55
- data/ext/ffi_c/Type.h +3 -2
- data/ext/ffi_c/Types.c +8 -9
- data/ext/ffi_c/Types.h +3 -4
- data/ext/ffi_c/Variadic.c +88 -47
- data/ext/ffi_c/compat.h +26 -22
- data/ext/ffi_c/extconf.rb +75 -32
- data/ext/ffi_c/ffi.c +9 -10
- data/ext/ffi_c/libffi/.appveyor/site.exp +16 -0
- data/ext/ffi_c/libffi/.appveyor/unix-noexec.exp +7 -0
- data/ext/ffi_c/libffi/.appveyor.yml +53 -19
- data/ext/ffi_c/libffi/.ci/bfin-sim.exp +58 -0
- data/ext/ffi_c/libffi/.ci/build-cross-in-container.sh +18 -0
- data/ext/ffi_c/libffi/.ci/build-in-container.sh +10 -0
- data/ext/ffi_c/libffi/.ci/build.sh +124 -0
- data/ext/ffi_c/libffi/.ci/install.sh +78 -0
- data/ext/ffi_c/libffi/.ci/m32r-sim.exp +58 -0
- data/ext/ffi_c/libffi/{.travis → .ci}/moxie-sim.exp +1 -1
- data/ext/ffi_c/libffi/.ci/msvs-detect +1103 -0
- data/ext/ffi_c/libffi/.ci/or1k-sim.exp +58 -0
- data/ext/ffi_c/libffi/.ci/powerpc-eabisim.exp +58 -0
- data/ext/ffi_c/libffi/.ci/site.exp +29 -0
- data/ext/ffi_c/libffi/.ci/wine-sim.exp +55 -0
- data/ext/ffi_c/libffi/.circleci/config.yml +156 -0
- data/ext/ffi_c/libffi/.gitattributes +4 -0
- data/ext/ffi_c/libffi/.github/workflows/build.yml +460 -0
- data/ext/ffi_c/libffi/.github/workflows/emscripten.yml +171 -0
- data/ext/ffi_c/libffi/.gitignore +10 -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 +64 -73
- data/ext/ffi_c/libffi/Makefile.in +553 -235
- data/ext/ffi_c/libffi/README.md +165 -100
- data/ext/ffi_c/libffi/acinclude.m4 +10 -112
- data/ext/ffi_c/libffi/compile +348 -0
- data/ext/ffi_c/libffi/config.guess +950 -662
- data/ext/ffi_c/libffi/config.sub +1362 -1306
- data/ext/ffi_c/libffi/configure +4909 -4096
- data/ext/ffi_c/libffi/configure.ac +93 -32
- data/ext/ffi_c/libffi/configure.host +76 -28
- data/ext/ffi_c/libffi/doc/Makefile.in +15 -8
- data/ext/ffi_c/libffi/doc/libffi.texi +107 -46
- data/ext/ffi_c/libffi/doc/version.texi +4 -4
- data/ext/ffi_c/libffi/fficonfig.h.in +22 -44
- data/ext/ffi_c/libffi/generate-darwin-source-and-headers.py +165 -56
- data/ext/ffi_c/libffi/include/Makefile.am +1 -1
- data/ext/ffi_c/libffi/include/Makefile.in +17 -12
- data/ext/ffi_c/libffi/include/ffi.h.in +64 -48
- data/ext/ffi_c/libffi/include/ffi_cfi.h +21 -0
- data/ext/ffi_c/libffi/include/ffi_common.h +34 -1
- data/ext/ffi_c/libffi/include/tramp.h +45 -0
- data/ext/ffi_c/libffi/install-sh +107 -74
- 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 +2 -2
- data/ext/ffi_c/libffi/ltmain.sh +576 -284
- 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_cc_maxopt.m4 +18 -14
- data/ext/ffi_c/libffi/m4/ax_cflags_warn_all.m4 +108 -72
- data/ext/ffi_c/libffi/m4/ax_check_compile_flag.m4 +5 -26
- data/ext/ffi_c/libffi/m4/ax_compiler_vendor.m4 +76 -44
- 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/m4/ax_prepend_flag.m4 +51 -0
- data/ext/ffi_c/libffi/make_sunver.pl +333 -0
- data/ext/ffi_c/libffi/man/Makefile.in +15 -8
- 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 +39 -14
- data/ext/ffi_c/libffi/src/aarch64/ffi.c +286 -98
- data/ext/ffi_c/libffi/src/aarch64/ffitarget.h +19 -3
- data/ext/ffi_c/libffi/src/aarch64/internal.h +33 -0
- data/ext/ffi_c/libffi/src/aarch64/sysv.S +142 -37
- data/ext/ffi_c/libffi/src/aarch64/win64_armasm.S +506 -0
- data/ext/ffi_c/libffi/src/arc/arcompact.S +169 -94
- data/ext/ffi_c/libffi/src/arc/ffi.c +325 -148
- data/ext/ffi_c/libffi/src/arc/ffitarget.h +14 -0
- data/ext/ffi_c/libffi/src/arm/ffi.c +112 -10
- data/ext/ffi_c/libffi/src/arm/ffitarget.h +8 -1
- data/ext/ffi_c/libffi/src/arm/internal.h +10 -0
- data/ext/ffi_c/libffi/src/arm/sysv.S +117 -44
- data/ext/ffi_c/libffi/src/arm/sysv_msvc_arm32.S +311 -0
- data/ext/ffi_c/libffi/src/closures.c +189 -48
- 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 +6 -1
- data/ext/ffi_c/libffi/src/frv/ffi.c +1 -1
- data/ext/ffi_c/libffi/src/ia64/ffi.c +12 -0
- data/ext/ffi_c/libffi/src/ia64/unix.S +20 -2
- 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/loongarch64/ffi.c +621 -0
- data/ext/ffi_c/libffi/src/loongarch64/ffitarget.h +82 -0
- data/ext/ffi_c/libffi/src/loongarch64/sysv.S +327 -0
- data/ext/ffi_c/libffi/src/m32r/ffi.c +31 -14
- data/ext/ffi_c/libffi/src/metag/ffi.c +1 -1
- data/ext/ffi_c/libffi/src/mips/ffi.c +245 -66
- data/ext/ffi_c/libffi/src/mips/ffitarget.h +8 -1
- data/ext/ffi_c/libffi/src/mips/n32.S +137 -28
- data/ext/ffi_c/libffi/src/mips/o32.S +63 -4
- data/ext/ffi_c/libffi/src/moxie/ffi.c +48 -23
- data/ext/ffi_c/libffi/src/or1k/ffi.c +25 -12
- data/ext/ffi_c/libffi/src/pa/ffi.c +62 -108
- data/ext/ffi_c/libffi/src/pa/ffi64.c +614 -0
- data/ext/ffi_c/libffi/src/pa/ffitarget.h +20 -11
- data/ext/ffi_c/libffi/src/pa/hpux32.S +87 -38
- data/ext/ffi_c/libffi/src/pa/hpux64.S +681 -0
- data/ext/ffi_c/libffi/src/pa/linux.S +109 -39
- 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 +93 -28
- data/ext/ffi_c/libffi/src/powerpc/linux64_closure.S +83 -5
- data/ext/ffi_c/libffi/src/powerpc/sysv.S +5 -7
- data/ext/ffi_c/libffi/src/powerpc/t-aix +5 -0
- data/ext/ffi_c/libffi/src/prep_cif.c +26 -4
- data/ext/ffi_c/libffi/src/riscv/ffi.c +79 -10
- 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/sparc/ffi64.c +16 -0
- data/ext/ffi_c/libffi/src/tramp.c +716 -0
- data/ext/ffi_c/libffi/src/wasm32/ffi.c +934 -0
- data/ext/ffi_c/libffi/src/wasm32/ffitarget.h +62 -0
- data/ext/ffi_c/libffi/src/x86/ffi.c +128 -49
- data/ext/ffi_c/libffi/src/x86/ffi64.c +89 -23
- data/ext/ffi_c/libffi/src/x86/ffitarget.h +21 -4
- data/ext/ffi_c/libffi/src/x86/ffiw64.c +63 -10
- data/ext/ffi_c/libffi/src/x86/internal.h +14 -0
- data/ext/ffi_c/libffi/src/x86/internal64.h +14 -0
- data/ext/ffi_c/libffi/src/x86/sysv.S +274 -45
- data/ext/ffi_c/libffi/src/x86/sysv_intel.S +998 -0
- data/ext/ffi_c/libffi/src/x86/unix64.S +190 -4
- data/ext/ffi_c/libffi/src/x86/win64.S +32 -10
- data/ext/ffi_c/libffi/src/x86/win64_intel.S +3 -2
- data/ext/ffi_c/libffi/src/xtensa/ffi.c +16 -8
- data/ext/ffi_c/libffi/src/xtensa/ffitarget.h +4 -0
- data/ext/ffi_c/libffi/src/xtensa/sysv.S +26 -16
- data/ext/ffi_c/libffi/testsuite/Makefile.am +127 -109
- data/ext/ffi_c/libffi/testsuite/Makefile.in +144 -88
- data/ext/ffi_c/libffi/testsuite/emscripten/build-tests.sh +54 -0
- data/ext/ffi_c/libffi/testsuite/emscripten/build.sh +63 -0
- data/ext/ffi_c/libffi/testsuite/emscripten/conftest.py +80 -0
- data/ext/ffi_c/libffi/testsuite/emscripten/node-tests.sh +48 -0
- data/ext/ffi_c/libffi/testsuite/emscripten/test.html +7 -0
- data/ext/ffi_c/libffi/testsuite/emscripten/test_libffi.py +51 -0
- data/ext/ffi_c/libffi/testsuite/lib/libffi.exp +71 -25
- data/ext/ffi_c/libffi/testsuite/lib/target-libpath.exp +2 -2
- data/ext/ffi_c/libffi/testsuite/libffi.bhaible/bhaible.exp +7 -2
- data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-call.c +5 -4
- data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-callback.c +2 -2
- data/ext/ffi_c/libffi/testsuite/libffi.bhaible/testcases.c +5 -1
- data/ext/ffi_c/libffi/testsuite/libffi.call/bpo_38748.c +41 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/call.exp +12 -1
- data/ext/ffi_c/libffi/testsuite/libffi.call/ffitest.h +28 -3
- data/ext/ffi_c/libffi/testsuite/libffi.call/float2.c +9 -8
- data/ext/ffi_c/libffi/testsuite/libffi.call/float_va.c +3 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/return_ll1.c +5 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/return_sl.c +4 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/return_ul.c +4 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/s55.c +60 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/strlen.c +8 -9
- data/ext/ffi_c/libffi/testsuite/libffi.call/strlen2.c +2 -2
- data/ext/ffi_c/libffi/testsuite/libffi.call/strlen3.c +2 -2
- data/ext/ffi_c/libffi/testsuite/libffi.call/strlen4.c +2 -2
- data/ext/ffi_c/libffi/testsuite/libffi.call/struct10.c +1 -1
- data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_2.c +63 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_3.c +65 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_3f.c +65 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_4.c +67 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_4f.c +67 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_big.c +93 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_small.c +61 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/struct_return_2H.c +63 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/struct_return_8H.c +90 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/va_1.c +1 -119
- data/ext/ffi_c/libffi/testsuite/libffi.call/va_2.c +220 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/va_3.c +154 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct1.c +13 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct2.c +11 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct3.c +15 -0
- data/ext/ffi_c/libffi/testsuite/libffi.closures/closure.exp +67 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn0.c +3 -2
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn1.c +2 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn2.c +2 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn3.c +21 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn4.c +2 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn5.c +2 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn6.c +2 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_loc_fn0.c +7 -6
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_simple.c +6 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_12byte.c +18 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_16byte.c +22 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_18byte.c +24 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_19byte.c +29 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_1_1byte.c +4 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_20byte.c +19 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_20byte1.c +21 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_24byte.c +35 -3
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_2byte.c +13 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3_1byte.c +19 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3byte1.c +13 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3byte2.c +13 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3float.c +18 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_4_1byte.c +22 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_4byte.c +13 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_5_1_byte.c +29 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_5byte.c +19 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_64byte.c +24 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_6_1_byte.c +28 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_6byte.c +24 -2
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_7_1_byte.c +39 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_7byte.c +25 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_8byte.c +14 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_9byte1.c +14 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_9byte2.c +14 -2
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_double.c +19 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_float.c +19 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_longdouble.c +20 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_longdouble_split.c +40 -25
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_longdouble_split2.c +40 -3
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_pointer.c +19 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint16.c +18 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint32.c +18 -3
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint64.c +18 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint16.c +18 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint32.c +19 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint64.c +19 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_dbls_struct.c +3 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_double_va.c +9 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_float.c +4 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_longdouble.c +11 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_longdouble_va.c +22 -3
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_schar.c +5 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_sshort.c +6 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_sshortchar.c +9 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_uchar.c +9 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_ushort.c +6 -2
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_ushortchar.c +9 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_pointer.c +5 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_pointer_stack.c +10 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_schar.c +3 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_sint.c +2 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_sshort.c +3 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_struct_va1.c +11 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uchar.c +3 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uint.c +4 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uint_va.c +4 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ulong_va.c +4 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ulonglong.c +2 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ushort.c +3 -0
- data/ext/ffi_c/libffi/testsuite/libffi.closures/ffitest.h +1 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/huge_struct.c +24 -22
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct.c +32 -9
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct1.c +1 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct10.c +12 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct11.c +21 -5
- data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct12.c +86 -0
- data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct13.c +115 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct2.c +10 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct3.c +10 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct4.c +9 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct5.c +9 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct6.c +11 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct7.c +9 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct8.c +11 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct9.c +11 -0
- data/ext/ffi_c/libffi/testsuite/libffi.closures/single_entry_structs1.c +86 -0
- data/ext/ffi_c/libffi/testsuite/libffi.closures/single_entry_structs2.c +102 -0
- data/ext/ffi_c/libffi/testsuite/libffi.closures/single_entry_structs3.c +101 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_medium.c +1 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_medium2.c +1 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/testclosure.c +6 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/unwindtest.cc +2 -1
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/unwindtest_ffi_call.cc +1 -0
- data/ext/ffi_c/libffi.bsd.mk +2 -2
- data/ext/ffi_c/libffi.darwin.mk +1 -1
- data/ext/ffi_c/libffi.gnu.mk +2 -2
- data/ext/ffi_c/rbffi.h +1 -3
- data/ffi.gemspec +15 -9
- data/lib/ffi/abstract_memory.rb +44 -0
- data/lib/ffi/autopointer.rb +8 -23
- data/lib/ffi/compat.rb +43 -0
- data/lib/ffi/data_converter.rb +67 -0
- data/lib/ffi/dynamic_library.rb +89 -0
- data/lib/ffi/enum.rb +18 -11
- data/lib/ffi/ffi.rb +6 -0
- data/lib/ffi/function.rb +71 -0
- data/lib/ffi/io.rb +3 -3
- data/lib/ffi/library.rb +65 -77
- data/lib/ffi/library_path.rb +109 -0
- data/lib/ffi/managedstruct.rb +3 -3
- data/lib/ffi/platform/aarch64-darwin/types.conf +130 -0
- data/lib/ffi/platform/aarch64-freebsd/types.conf +128 -0
- data/lib/ffi/platform/aarch64-freebsd12/types.conf +181 -0
- data/lib/ffi/platform/aarch64-linux/types.conf +81 -81
- data/lib/ffi/platform/aarch64-openbsd/types.conf +134 -0
- data/lib/ffi/platform/aarch64-windows/types.conf +52 -0
- data/lib/ffi/platform/arm-freebsd/types.conf +152 -0
- data/lib/ffi/platform/arm-freebsd12/types.conf +152 -0
- data/lib/ffi/platform/arm-linux/types.conf +110 -82
- data/lib/ffi/platform/hppa1.1-linux/types.conf +178 -0
- data/lib/ffi/platform/hppa2.0-linux/types.conf +178 -0
- 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 +89 -89
- data/lib/ffi/platform/i386-freebsd12/types.conf +152 -0
- 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/loongarch64-linux/types.conf +141 -0
- 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/sparcv9-openbsd/types.conf +156 -0
- data/lib/ffi/platform/sparcv9-solaris/types.conf +103 -103
- data/lib/ffi/platform/sw_64-linux/types.conf +141 -0
- 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 +90 -90
- data/lib/ffi/platform/x86_64-freebsd12/types.conf +158 -0
- 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 +43 -20
- data/lib/ffi/pointer.rb +26 -20
- data/lib/ffi/struct.rb +14 -68
- data/lib/ffi/struct_by_reference.rb +72 -0
- data/lib/ffi/struct_layout.rb +96 -0
- data/lib/ffi/struct_layout_builder.rb +1 -1
- 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 +33 -7
- data/lib/ffi/variadic.rb +20 -18
- 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/hello_ractor.rb +11 -0
- data/samples/inotify.rb +1 -1
- data/samples/pty.rb +1 -2
- data/samples/qsort.rb +0 -1
- data/samples/qsort_ractor.rb +28 -0
- data.tar.gz.sig +0 -0
- metadata +252 -153
- metadata.gz.sig +0 -0
- data/.gitignore +0 -22
- data/.gitmodules +0 -3
- data/.travis.yml +0 -52
- data/.yardopts +0 -5
- data/appveyor.yml +0 -22
- data/ext/ffi_c/Closure.c +0 -54
- 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/.travis/build.sh +0 -34
- data/ext/ffi_c/libffi/.travis/install.sh +0 -22
- data/ext/ffi_c/libffi/.travis/site.exp +0 -18
- data/ext/ffi_c/libffi/.travis.yml +0 -34
- 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/libffi/testsuite/libffi.call/cls_uchar_va.c +0 -44
- data/ext/ffi_c/libffi/testsuite/libffi.call/cls_ushort_va.c +0 -44
- 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/{.travis → .ci}/ar-lib +0 -0
- data/ext/ffi_c/libffi/{.travis → .ci}/compile +0 -0
- data/ext/ffi_c/libffi/testsuite/libffi.call/{pyobjc-tc.c → pyobjc_tc.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_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}/err_bad_abi.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/lib/ffi/platform/{sparc64-linux → sparcv9-linux}/types.conf +79 -79
@@ -1,5 +1,6 @@
|
|
1
1
|
/* -----------------------------------------------------------------------
|
2
|
-
closures.c - Copyright (c)
|
2
|
+
closures.c - Copyright (c) 2019, 2022 Anthony Green
|
3
|
+
Copyright (c) 2007, 2009, 2010 Red Hat, Inc.
|
3
4
|
Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc
|
4
5
|
Copyright (c) 2011 Plausible Labs Cooperative, Inc.
|
5
6
|
|
@@ -26,13 +27,16 @@
|
|
26
27
|
DEALINGS IN THE SOFTWARE.
|
27
28
|
----------------------------------------------------------------------- */
|
28
29
|
|
29
|
-
#if defined __linux__ && !defined _GNU_SOURCE
|
30
|
+
#if (defined __linux__ || defined __CYGWIN__) && !defined _GNU_SOURCE
|
30
31
|
#define _GNU_SOURCE 1
|
31
32
|
#endif
|
32
33
|
|
34
|
+
#ifndef __EMSCRIPTEN__
|
35
|
+
|
33
36
|
#include <fficonfig.h>
|
34
37
|
#include <ffi.h>
|
35
38
|
#include <ffi_common.h>
|
39
|
+
#include <tramp.h>
|
36
40
|
|
37
41
|
#ifdef __NetBSD__
|
38
42
|
#include <sys/param.h>
|
@@ -44,6 +48,9 @@
|
|
44
48
|
|
45
49
|
#include <stddef.h>
|
46
50
|
#include <unistd.h>
|
51
|
+
#ifdef HAVE_SYS_MEMFD_H
|
52
|
+
#include <sys/memfd.h>
|
53
|
+
#endif
|
47
54
|
|
48
55
|
static const size_t overhead =
|
49
56
|
(sizeof(max_align_t) > sizeof(void *) + sizeof(size_t)) ?
|
@@ -108,6 +115,12 @@ ffi_closure_free (void *ptr)
|
|
108
115
|
munmap(dataseg, rounded_size);
|
109
116
|
munmap(codeseg, rounded_size);
|
110
117
|
}
|
118
|
+
|
119
|
+
int
|
120
|
+
ffi_tramp_is_present (__attribute__((unused)) void *ptr)
|
121
|
+
{
|
122
|
+
return 0;
|
123
|
+
}
|
111
124
|
#else /* !NetBSD with PROT_MPROTECT */
|
112
125
|
|
113
126
|
#if !FFI_MMAP_EXEC_WRIT && !FFI_EXEC_TRAMPOLINE_TABLE
|
@@ -122,22 +135,26 @@ ffi_closure_free (void *ptr)
|
|
122
135
|
# define FFI_MMAP_EXEC_WRIT 1
|
123
136
|
# define HAVE_MNTENT 1
|
124
137
|
# endif
|
125
|
-
# if defined(
|
126
|
-
/* Windows systems may have Data Execution Protection (DEP) enabled,
|
138
|
+
# if defined(__CYGWIN__) || defined(_WIN32) || defined(__OS2__)
|
139
|
+
/* Windows systems may have Data Execution Protection (DEP) enabled,
|
127
140
|
which requires the use of VirtualMalloc/VirtualFree to alloc/free
|
128
141
|
executable memory. */
|
129
142
|
# define FFI_MMAP_EXEC_WRIT 1
|
130
143
|
# endif
|
131
144
|
#endif
|
132
145
|
|
133
|
-
#if FFI_MMAP_EXEC_WRIT && !defined
|
134
|
-
# if defined
|
146
|
+
#if FFI_MMAP_EXEC_WRIT && defined(__linux__) && !defined(__ANDROID__)
|
147
|
+
# if !defined FFI_MMAP_EXEC_SELINUX
|
135
148
|
/* When defined to 1 check for SELinux and if SELinux is active,
|
136
149
|
don't attempt PROT_EXEC|PROT_WRITE mapping at all, as that
|
137
150
|
might cause audit messages. */
|
138
151
|
# define FFI_MMAP_EXEC_SELINUX 1
|
139
|
-
# endif
|
140
|
-
#
|
152
|
+
# endif /* !defined FFI_MMAP_EXEC_SELINUX */
|
153
|
+
# if !defined FFI_MMAP_PAX
|
154
|
+
/* Also check for PaX MPROTECT */
|
155
|
+
# define FFI_MMAP_PAX 1
|
156
|
+
# endif /* !defined FFI_MMAP_PAX */
|
157
|
+
#endif /* FFI_MMAP_EXEC_WRIT && defined(__linux__) && !defined(__ANDROID__) */
|
141
158
|
|
142
159
|
#if FFI_CLOSURES
|
143
160
|
|
@@ -147,6 +164,9 @@ ffi_closure_free (void *ptr)
|
|
147
164
|
|
148
165
|
#include <mach/mach.h>
|
149
166
|
#include <pthread.h>
|
167
|
+
#ifdef HAVE_PTRAUTH
|
168
|
+
#include <ptrauth.h>
|
169
|
+
#endif
|
150
170
|
#include <stdio.h>
|
151
171
|
#include <stdlib.h>
|
152
172
|
|
@@ -159,7 +179,6 @@ struct ffi_trampoline_table
|
|
159
179
|
{
|
160
180
|
/* contiguous writable and executable pages */
|
161
181
|
vm_address_t config_page;
|
162
|
-
vm_address_t trampoline_page;
|
163
182
|
|
164
183
|
/* free list tracking */
|
165
184
|
uint16_t free_count;
|
@@ -172,7 +191,7 @@ struct ffi_trampoline_table
|
|
172
191
|
|
173
192
|
struct ffi_trampoline_table_entry
|
174
193
|
{
|
175
|
-
void *(*trampoline) ();
|
194
|
+
void *(*trampoline) (void);
|
176
195
|
ffi_trampoline_table_entry *next;
|
177
196
|
};
|
178
197
|
|
@@ -203,7 +222,13 @@ ffi_trampoline_table_alloc (void)
|
|
203
222
|
|
204
223
|
/* Remap the trampoline table on top of the placeholder page */
|
205
224
|
trampoline_page = config_page + PAGE_MAX_SIZE;
|
225
|
+
|
226
|
+
#ifdef HAVE_PTRAUTH
|
227
|
+
trampoline_page_template = (vm_address_t)(uintptr_t)ptrauth_auth_data((void *)&ffi_closure_trampoline_table_page, ptrauth_key_function_pointer, 0);
|
228
|
+
#else
|
206
229
|
trampoline_page_template = (vm_address_t)&ffi_closure_trampoline_table_page;
|
230
|
+
#endif
|
231
|
+
|
207
232
|
#ifdef __arm__
|
208
233
|
/* ffi_closure_trampoline_table_page can be thumb-biased on some ARM archs */
|
209
234
|
trampoline_page_template &= ~1UL;
|
@@ -217,11 +242,22 @@ ffi_trampoline_table_alloc (void)
|
|
217
242
|
return NULL;
|
218
243
|
}
|
219
244
|
|
245
|
+
if (!(cur_prot & VM_PROT_EXECUTE))
|
246
|
+
{
|
247
|
+
/* If VM_PROT_EXECUTE isn't set on the remapped trampoline page, set it */
|
248
|
+
kt = vm_protect (mach_task_self (), trampoline_page, PAGE_MAX_SIZE,
|
249
|
+
FALSE, cur_prot | VM_PROT_EXECUTE);
|
250
|
+
if (kt != KERN_SUCCESS)
|
251
|
+
{
|
252
|
+
vm_deallocate (mach_task_self (), config_page, PAGE_MAX_SIZE * 2);
|
253
|
+
return NULL;
|
254
|
+
}
|
255
|
+
}
|
256
|
+
|
220
257
|
/* We have valid trampoline and config pages */
|
221
258
|
table = calloc (1, sizeof (ffi_trampoline_table));
|
222
259
|
table->free_count = FFI_TRAMPOLINE_COUNT;
|
223
260
|
table->config_page = config_page;
|
224
|
-
table->trampoline_page = trampoline_page;
|
225
261
|
|
226
262
|
/* Create and initialize the free list */
|
227
263
|
table->free_list_pool =
|
@@ -231,7 +267,10 @@ ffi_trampoline_table_alloc (void)
|
|
231
267
|
{
|
232
268
|
ffi_trampoline_table_entry *entry = &table->free_list_pool[i];
|
233
269
|
entry->trampoline =
|
234
|
-
(void *) (
|
270
|
+
(void *) (trampoline_page + (i * FFI_TRAMPOLINE_SIZE));
|
271
|
+
#ifdef HAVE_PTRAUTH
|
272
|
+
entry->trampoline = ptrauth_sign_unauthenticated(entry->trampoline, ptrauth_key_function_pointer, 0);
|
273
|
+
#endif
|
235
274
|
|
236
275
|
if (i < table->free_count - 1)
|
237
276
|
entry->next = &table->free_list_pool[i + 1];
|
@@ -385,7 +424,7 @@ ffi_closure_free (void *ptr)
|
|
385
424
|
#endif
|
386
425
|
#include <string.h>
|
387
426
|
#include <stdio.h>
|
388
|
-
#if !defined(
|
427
|
+
#if !defined(_WIN32)
|
389
428
|
#ifdef HAVE_MNTENT
|
390
429
|
#include <mntent.h>
|
391
430
|
#endif /* HAVE_MNTENT */
|
@@ -446,14 +485,18 @@ selinux_enabled_check (void)
|
|
446
485
|
|
447
486
|
#endif /* !FFI_MMAP_EXEC_SELINUX */
|
448
487
|
|
449
|
-
/* On PaX enable kernels that have MPROTECT
|
450
|
-
#
|
488
|
+
/* On PaX enable kernels that have MPROTECT enabled we can't use PROT_EXEC. */
|
489
|
+
#if defined FFI_MMAP_PAX
|
451
490
|
#include <stdlib.h>
|
452
491
|
|
453
|
-
|
492
|
+
enum {
|
493
|
+
PAX_MPROTECT = (1 << 0),
|
494
|
+
PAX_EMUTRAMP = (1 << 1),
|
495
|
+
};
|
496
|
+
static int cached_pax_flags = -1;
|
454
497
|
|
455
498
|
static int
|
456
|
-
|
499
|
+
pax_flags_check (void)
|
457
500
|
{
|
458
501
|
char *buf = NULL;
|
459
502
|
size_t len = 0;
|
@@ -467,9 +510,10 @@ emutramp_enabled_check (void)
|
|
467
510
|
while (getline (&buf, &len, f) != -1)
|
468
511
|
if (!strncmp (buf, "PaX:", 4))
|
469
512
|
{
|
470
|
-
|
471
|
-
|
472
|
-
|
513
|
+
if (NULL != strchr (buf + 4, 'M'))
|
514
|
+
ret |= PAX_MPROTECT;
|
515
|
+
if (NULL != strchr (buf + 4, 'E'))
|
516
|
+
ret |= PAX_EMUTRAMP;
|
473
517
|
break;
|
474
518
|
}
|
475
519
|
free (buf);
|
@@ -477,9 +521,13 @@ emutramp_enabled_check (void)
|
|
477
521
|
return ret;
|
478
522
|
}
|
479
523
|
|
480
|
-
#define
|
481
|
-
: (
|
482
|
-
#
|
524
|
+
#define get_pax_flags() (cached_pax_flags >= 0 ? cached_pax_flags \
|
525
|
+
: (cached_pax_flags = pax_flags_check ()))
|
526
|
+
#define has_pax_flags(flags) ((flags) == ((flags) & get_pax_flags ()))
|
527
|
+
#define is_mprotect_enabled() (has_pax_flags (PAX_MPROTECT))
|
528
|
+
#define is_emutramp_enabled() (has_pax_flags (PAX_EMUTRAMP))
|
529
|
+
|
530
|
+
#endif /* defined FFI_MMAP_PAX */
|
483
531
|
|
484
532
|
#elif defined (__CYGWIN__) || defined(__INTERIX)
|
485
533
|
|
@@ -490,9 +538,10 @@ emutramp_enabled_check (void)
|
|
490
538
|
|
491
539
|
#endif /* !defined(X86_WIN32) && !defined(X86_WIN64) */
|
492
540
|
|
493
|
-
#
|
494
|
-
#define
|
495
|
-
#
|
541
|
+
#if !defined FFI_MMAP_PAX
|
542
|
+
# define is_mprotect_enabled() 0
|
543
|
+
# define is_emutramp_enabled() 0
|
544
|
+
#endif /* !defined FFI_MMAP_PAX */
|
496
545
|
|
497
546
|
/* Declare all functions defined in dlmalloc.c as static. */
|
498
547
|
static void *dlmalloc(size_t);
|
@@ -511,11 +560,11 @@ static int dlmalloc_trim(size_t) MAYBE_UNUSED;
|
|
511
560
|
static size_t dlmalloc_usable_size(void*) MAYBE_UNUSED;
|
512
561
|
static void dlmalloc_stats(void) MAYBE_UNUSED;
|
513
562
|
|
514
|
-
#if !(defined(
|
563
|
+
#if !(defined(_WIN32) || defined(__OS2__)) || defined (__CYGWIN__) || defined(__INTERIX)
|
515
564
|
/* Use these for mmap and munmap within dlmalloc.c. */
|
516
565
|
static void *dlmmap(void *, size_t, int, int, int, off_t);
|
517
566
|
static int dlmunmap(void *, size_t);
|
518
|
-
#endif /* !(defined(
|
567
|
+
#endif /* !(defined(_WIN32) || defined(__OS2__)) || defined (__CYGWIN__) || defined(__INTERIX) */
|
519
568
|
|
520
569
|
#define mmap dlmmap
|
521
570
|
#define munmap dlmunmap
|
@@ -525,7 +574,7 @@ static int dlmunmap(void *, size_t);
|
|
525
574
|
#undef mmap
|
526
575
|
#undef munmap
|
527
576
|
|
528
|
-
#if !(defined(
|
577
|
+
#if !(defined(_WIN32) || defined(__OS2__)) || defined (__CYGWIN__) || defined(__INTERIX)
|
529
578
|
|
530
579
|
/* A mutex used to synchronize access to *exec* variables in this file. */
|
531
580
|
static pthread_mutex_t open_temp_exec_file_mutex = PTHREAD_MUTEX_INITIALIZER;
|
@@ -537,6 +586,17 @@ static int execfd = -1;
|
|
537
586
|
/* The amount of space already allocated from the temporary file. */
|
538
587
|
static size_t execsize = 0;
|
539
588
|
|
589
|
+
#ifdef HAVE_MEMFD_CREATE
|
590
|
+
/* Open a temporary file name, and immediately unlink it. */
|
591
|
+
static int
|
592
|
+
open_temp_exec_file_memfd (const char *name)
|
593
|
+
{
|
594
|
+
int fd;
|
595
|
+
fd = memfd_create (name, MFD_CLOEXEC);
|
596
|
+
return fd;
|
597
|
+
}
|
598
|
+
#endif
|
599
|
+
|
540
600
|
/* Open a temporary file name, and immediately unlink it. */
|
541
601
|
static int
|
542
602
|
open_temp_exec_file_name (char *name, int flags)
|
@@ -664,6 +724,10 @@ static struct
|
|
664
724
|
const char *arg;
|
665
725
|
int repeat;
|
666
726
|
} open_temp_exec_file_opts[] = {
|
727
|
+
#ifdef HAVE_MEMFD_CREATE
|
728
|
+
{ open_temp_exec_file_memfd, "libffi", 0 },
|
729
|
+
#endif
|
730
|
+
{ open_temp_exec_file_env, "LIBFFI_TMPDIR", 0 },
|
667
731
|
{ open_temp_exec_file_env, "TMPDIR", 0 },
|
668
732
|
{ open_temp_exec_file_dir, "/tmp", 0 },
|
669
733
|
{ open_temp_exec_file_dir, "/var/tmp", 0 },
|
@@ -701,7 +765,7 @@ open_temp_exec_file_opts_next (void)
|
|
701
765
|
|
702
766
|
/* Return a file descriptor of a temporary zero-sized file in a
|
703
767
|
writable and executable filesystem. */
|
704
|
-
|
768
|
+
int
|
705
769
|
open_temp_exec_file (void)
|
706
770
|
{
|
707
771
|
int fd;
|
@@ -733,7 +797,7 @@ open_temp_exec_file (void)
|
|
733
797
|
static int
|
734
798
|
allocate_space (int fd, off_t offset, off_t len)
|
735
799
|
{
|
736
|
-
static
|
800
|
+
static long page_size;
|
737
801
|
|
738
802
|
/* Obtain system page size. */
|
739
803
|
if (!page_size)
|
@@ -789,7 +853,13 @@ dlmmap_locked (void *start, size_t length, int prot, int flags, off_t offset)
|
|
789
853
|
close (execfd);
|
790
854
|
goto retry_open;
|
791
855
|
}
|
792
|
-
ftruncate (execfd, offset)
|
856
|
+
if (ftruncate (execfd, offset) != 0)
|
857
|
+
{
|
858
|
+
/* Fixme : Error logs can be added here. Returning an error for
|
859
|
+
* ftruncte() will not add any advantage as it is being
|
860
|
+
* validating in the error case. */
|
861
|
+
}
|
862
|
+
|
793
863
|
return MFAIL;
|
794
864
|
}
|
795
865
|
else if (!offset
|
@@ -801,7 +871,12 @@ dlmmap_locked (void *start, size_t length, int prot, int flags, off_t offset)
|
|
801
871
|
if (start == MFAIL)
|
802
872
|
{
|
803
873
|
munmap (ptr, length);
|
804
|
-
ftruncate (execfd, offset)
|
874
|
+
if (ftruncate (execfd, offset) != 0)
|
875
|
+
{
|
876
|
+
/* Fixme : Error logs can be added here. Returning an error for
|
877
|
+
* ftruncte() will not add any advantage as it is being
|
878
|
+
* validating in the error case. */
|
879
|
+
}
|
805
880
|
return start;
|
806
881
|
}
|
807
882
|
|
@@ -825,13 +900,29 @@ dlmmap (void *start, size_t length, int prot,
|
|
825
900
|
&& flags == (MAP_PRIVATE | MAP_ANONYMOUS)
|
826
901
|
&& fd == -1 && offset == 0);
|
827
902
|
|
828
|
-
if (execfd == -1 &&
|
903
|
+
if (execfd == -1 && ffi_tramp_is_supported ())
|
829
904
|
{
|
830
905
|
ptr = mmap (start, length, prot & ~PROT_EXEC, flags, fd, offset);
|
831
906
|
return ptr;
|
832
907
|
}
|
833
908
|
|
834
|
-
|
909
|
+
/* -1 != execfd hints that we already decided to use dlmmap_locked
|
910
|
+
last time. */
|
911
|
+
if (execfd == -1 && is_mprotect_enabled ())
|
912
|
+
{
|
913
|
+
#ifdef FFI_MMAP_EXEC_EMUTRAMP_PAX
|
914
|
+
if (is_emutramp_enabled ())
|
915
|
+
{
|
916
|
+
/* emutramp requires the kernel recognizing the trampoline pattern
|
917
|
+
generated by ffi_prep_closure_loc; there is no way to test
|
918
|
+
in advance whether this will work, so this is experimental. */
|
919
|
+
ptr = mmap (start, length, prot & ~PROT_EXEC, flags, fd, offset);
|
920
|
+
return ptr;
|
921
|
+
}
|
922
|
+
#endif
|
923
|
+
/* fallback to dlmmap_locked. */
|
924
|
+
}
|
925
|
+
else if (execfd == -1 && !is_selinux_enabled ())
|
835
926
|
{
|
836
927
|
ptr = mmap (start, length, prot | PROT_EXEC, flags, fd, offset);
|
837
928
|
|
@@ -844,16 +935,11 @@ dlmmap (void *start, size_t length, int prot,
|
|
844
935
|
MREMAP_DUP and prot at this point. */
|
845
936
|
}
|
846
937
|
|
847
|
-
|
848
|
-
|
849
|
-
|
850
|
-
ptr = dlmmap_locked (start, length, prot, flags, offset);
|
851
|
-
pthread_mutex_unlock (&open_temp_exec_file_mutex);
|
852
|
-
|
853
|
-
return ptr;
|
854
|
-
}
|
938
|
+
pthread_mutex_lock (&open_temp_exec_file_mutex);
|
939
|
+
ptr = dlmmap_locked (start, length, prot, flags, offset);
|
940
|
+
pthread_mutex_unlock (&open_temp_exec_file_mutex);
|
855
941
|
|
856
|
-
return
|
942
|
+
return ptr;
|
857
943
|
}
|
858
944
|
|
859
945
|
/* Release memory at the given address, as well as the corresponding
|
@@ -896,7 +982,7 @@ segment_holding_code (mstate m, char* addr)
|
|
896
982
|
}
|
897
983
|
#endif
|
898
984
|
|
899
|
-
#endif /* !(defined(
|
985
|
+
#endif /* !(defined(_WIN32) || defined(__OS2__)) || defined (__CYGWIN__) || defined(__INTERIX) */
|
900
986
|
|
901
987
|
/* Allocate a chunk of memory with the given size. Returns a pointer
|
902
988
|
to the writable address, and sets *CODE to the executable
|
@@ -904,7 +990,7 @@ segment_holding_code (mstate m, char* addr)
|
|
904
990
|
void *
|
905
991
|
ffi_closure_alloc (size_t size, void **code)
|
906
992
|
{
|
907
|
-
void *ptr;
|
993
|
+
void *ptr, *ftramp;
|
908
994
|
|
909
995
|
if (!code)
|
910
996
|
return NULL;
|
@@ -915,12 +1001,41 @@ ffi_closure_alloc (size_t size, void **code)
|
|
915
1001
|
{
|
916
1002
|
msegmentptr seg = segment_holding (gm, ptr);
|
917
1003
|
|
918
|
-
*code = add_segment_exec_offset (ptr, seg);
|
1004
|
+
*code = FFI_FN (add_segment_exec_offset (ptr, seg));
|
1005
|
+
if (!ffi_tramp_is_supported ())
|
1006
|
+
return ptr;
|
1007
|
+
|
1008
|
+
ftramp = ffi_tramp_alloc (0);
|
1009
|
+
if (ftramp == NULL)
|
1010
|
+
{
|
1011
|
+
dlfree (ptr);
|
1012
|
+
return NULL;
|
1013
|
+
}
|
1014
|
+
*code = FFI_FN (ffi_tramp_get_addr (ftramp));
|
1015
|
+
((ffi_closure *) ptr)->ftramp = ftramp;
|
919
1016
|
}
|
920
1017
|
|
921
1018
|
return ptr;
|
922
1019
|
}
|
923
1020
|
|
1021
|
+
void *
|
1022
|
+
ffi_data_to_code_pointer (void *data)
|
1023
|
+
{
|
1024
|
+
msegmentptr seg = segment_holding (gm, data);
|
1025
|
+
/* We expect closures to be allocated with ffi_closure_alloc(), in
|
1026
|
+
which case seg will be non-NULL. However, some users take on the
|
1027
|
+
burden of managing this memory themselves, in which case this
|
1028
|
+
we'll just return data. */
|
1029
|
+
if (seg)
|
1030
|
+
{
|
1031
|
+
if (!ffi_tramp_is_supported ())
|
1032
|
+
return add_segment_exec_offset (data, seg);
|
1033
|
+
return ffi_tramp_get_addr (((ffi_closure *) data)->ftramp);
|
1034
|
+
}
|
1035
|
+
else
|
1036
|
+
return data;
|
1037
|
+
}
|
1038
|
+
|
924
1039
|
/* Release a chunk of memory allocated with ffi_closure_alloc. If
|
925
1040
|
FFI_CLOSURE_FREE_CODE is nonzero, the given address can be the
|
926
1041
|
writable or the executable address given. Otherwise, only the
|
@@ -934,10 +1049,19 @@ ffi_closure_free (void *ptr)
|
|
934
1049
|
if (seg)
|
935
1050
|
ptr = sub_segment_exec_offset (ptr, seg);
|
936
1051
|
#endif
|
1052
|
+
if (ffi_tramp_is_supported ())
|
1053
|
+
ffi_tramp_free (((ffi_closure *) ptr)->ftramp);
|
937
1054
|
|
938
1055
|
dlfree (ptr);
|
939
1056
|
}
|
940
1057
|
|
1058
|
+
int
|
1059
|
+
ffi_tramp_is_present (void *ptr)
|
1060
|
+
{
|
1061
|
+
msegmentptr seg = segment_holding (gm, ptr);
|
1062
|
+
return seg != NULL && ffi_tramp_is_supported();
|
1063
|
+
}
|
1064
|
+
|
941
1065
|
# else /* ! FFI_MMAP_EXEC_WRIT */
|
942
1066
|
|
943
1067
|
/* On many systems, memory returned by malloc is writable and
|
@@ -948,10 +1072,14 @@ ffi_closure_free (void *ptr)
|
|
948
1072
|
void *
|
949
1073
|
ffi_closure_alloc (size_t size, void **code)
|
950
1074
|
{
|
1075
|
+
void *c;
|
1076
|
+
|
951
1077
|
if (!code)
|
952
1078
|
return NULL;
|
953
1079
|
|
954
|
-
|
1080
|
+
c = malloc (size);
|
1081
|
+
*code = FFI_FN (c);
|
1082
|
+
return c;
|
955
1083
|
}
|
956
1084
|
|
957
1085
|
void
|
@@ -960,7 +1088,20 @@ ffi_closure_free (void *ptr)
|
|
960
1088
|
free (ptr);
|
961
1089
|
}
|
962
1090
|
|
1091
|
+
void *
|
1092
|
+
ffi_data_to_code_pointer (void *data)
|
1093
|
+
{
|
1094
|
+
return data;
|
1095
|
+
}
|
1096
|
+
|
1097
|
+
int
|
1098
|
+
ffi_tramp_is_present (__attribute__((unused)) void *ptr)
|
1099
|
+
{
|
1100
|
+
return 0;
|
1101
|
+
}
|
1102
|
+
|
963
1103
|
# endif /* ! FFI_MMAP_EXEC_WRIT */
|
964
1104
|
#endif /* FFI_CLOSURES */
|
965
1105
|
|
966
1106
|
#endif /* NetBSD with PROT_MPROTECT */
|
1107
|
+
#endif /* __EMSCRIPTEN__ */
|