ffi 1.9.25 → 1.12.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/{appveyor.yml → .appveyor.yml} +7 -2
- data/.gitignore +3 -0
- data/.gitmodules +1 -0
- data/.travis.yml +22 -30
- data/CHANGELOG.md +107 -0
- data/Gemfile +2 -2
- data/README.md +29 -17
- data/Rakefile +17 -89
- data/ext/ffi_c/AbstractMemory.c +5 -9
- data/ext/ffi_c/Call.c +18 -39
- data/ext/ffi_c/Call.h +4 -7
- data/ext/ffi_c/DynamicLibrary.c +1 -1
- data/ext/ffi_c/Function.c +29 -113
- data/ext/ffi_c/LastError.c +47 -2
- data/ext/ffi_c/LongDouble.c +7 -7
- data/ext/ffi_c/Platform.c +0 -47
- data/ext/ffi_c/Struct.c +47 -51
- data/ext/ffi_c/Struct.h +12 -6
- data/ext/ffi_c/StructLayout.c +13 -12
- data/ext/ffi_c/Thread.c +6 -222
- data/ext/ffi_c/Thread.h +2 -13
- data/ext/ffi_c/Type.c +0 -18
- data/ext/ffi_c/Type.h +0 -1
- data/ext/ffi_c/Types.c +1 -1
- data/ext/ffi_c/Variadic.c +9 -15
- data/ext/ffi_c/extconf.rb +34 -21
- 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 +112 -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/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 +47 -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 +33 -40
- data/ext/ffi_c/libffi/Makefile.in +392 -176
- data/ext/ffi_c/libffi/README.md +23 -8
- data/ext/ffi_c/libffi/configure +319 -343
- data/ext/ffi_c/libffi/configure.ac +6 -2
- data/ext/ffi_c/libffi/configure.host +26 -9
- 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 +4 -0
- data/ext/ffi_c/libffi/generate-darwin-source-and-headers.py +1 -3
- data/ext/ffi_c/libffi/include/Makefile.in +10 -6
- data/ext/ffi_c/libffi/include/ffi.h.in +11 -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.xcodeproj/project.pbxproj +2 -48
- data/ext/ffi_c/libffi/ltmain.sh +153 -60
- 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 +27 -2
- data/ext/ffi_c/libffi/src/aarch64/ffi.c +126 -58
- data/ext/ffi_c/libffi/src/aarch64/ffitarget.h +13 -2
- data/ext/ffi_c/libffi/src/aarch64/sysv.S +8 -6
- data/ext/ffi_c/libffi/src/aarch64/win64_armasm.S +506 -0
- data/ext/ffi_c/libffi/src/arm/ffi.c +40 -5
- data/ext/ffi_c/libffi/src/arm/ffitarget.h +8 -1
- data/ext/ffi_c/libffi/src/arm/sysv.S +2 -0
- data/ext/ffi_c/libffi/src/arm/sysv_msvc_arm32.S +311 -0
- data/ext/ffi_c/libffi/src/closures.c +41 -9
- data/ext/ffi_c/libffi/src/frv/ffi.c +1 -1
- data/ext/ffi_c/libffi/src/metag/ffi.c +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/linux.S +23 -2
- data/ext/ffi_c/libffi/src/powerpc/ffi.c +6 -4
- 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 +83 -28
- data/ext/ffi_c/libffi/src/powerpc/linux64_closure.S +68 -4
- 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 +14 -6
- data/ext/ffi_c/libffi/src/x86/ffi64.c +5 -3
- data/ext/ffi_c/libffi/src/x86/ffiw64.c +5 -2
- data/ext/ffi_c/libffi/src/x86/sysv.S +90 -4
- data/ext/ffi_c/libffi/src/x86/sysv_intel.S +995 -0
- data/ext/ffi_c/libffi/src/x86/unix64.S +41 -0
- data/ext/ffi_c/libffi/src/x86/win64.S +5 -0
- 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 +26 -22
- data/ext/ffi_c/libffi/testsuite/libffi.bhaible/bhaible.exp +7 -2
- data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-call.c +1 -1
- data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-callback.c +1 -1
- 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 +1 -1
- data/ext/ffi_c/libffi.darwin.mk +1 -1
- data/ext/ffi_c/rbffi.h +0 -2
- data/ffi.gemspec +12 -5
- data/lib/ffi/data_converter.rb +67 -0
- data/lib/ffi/ffi.rb +2 -0
- data/lib/ffi/library.rb +6 -6
- data/lib/ffi/platform/aarch64-freebsd/types.conf +128 -0
- data/lib/ffi/platform/aarch64-freebsd12/types.conf +128 -0
- data/lib/ffi/platform/aarch64-linux/types.conf +81 -81
- 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 +79 -79
- 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 +84 -84
- 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 +77 -77
- data/lib/ffi/platform/powerpc64-linux/types.conf +81 -81
- 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-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 +84 -84
- data/lib/ffi/platform/x86_64-dragonflybsd/types.conf +148 -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-linux/types.conf +86 -77
- 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 +99 -99
- data/lib/ffi/platform.rb +13 -2
- data/lib/ffi/pointer.rb +5 -6
- data/lib/ffi/struct.rb +5 -66
- data/lib/ffi/struct_by_reference.rb +72 -0
- data/lib/ffi/struct_layout.rb +96 -0
- data/lib/ffi/tools/const_generator.rb +5 -4
- data/lib/ffi/tools/generator.rb +47 -2
- data/lib/ffi/tools/generator_task.rb +13 -17
- data/lib/ffi/tools/struct_generator.rb +4 -4
- data/lib/ffi/tools/types_generator.rb +5 -4
- data/lib/ffi/types.rb +1 -1
- data/lib/ffi/version.rb +1 -1
- metadata +144 -115
- 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/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
@@ -0,0 +1,311 @@
|
|
1
|
+
/* -----------------------------------------------------------------------
|
2
|
+
sysv.S - Copyright (c) 1998, 2008, 2011 Red Hat, Inc.
|
3
|
+
Copyright (c) 2011 Plausible Labs Cooperative, Inc.
|
4
|
+
Copyright (c) 2019 Microsoft Corporation.
|
5
|
+
|
6
|
+
ARM Foreign Function Interface
|
7
|
+
|
8
|
+
Permission is hereby granted, free of charge, to any person obtaining
|
9
|
+
a copy of this software and associated documentation files (the
|
10
|
+
``Software''), to deal in the Software without restriction, including
|
11
|
+
without limitation the rights to use, copy, modify, merge, publish,
|
12
|
+
distribute, sublicense, and/or sell copies of the Software, and to
|
13
|
+
permit persons to whom the Software is furnished to do so, subject to
|
14
|
+
the following conditions:
|
15
|
+
|
16
|
+
The above copyright notice and this permission notice shall be included
|
17
|
+
in all copies or substantial portions of the Software.
|
18
|
+
|
19
|
+
THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
|
20
|
+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
21
|
+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
22
|
+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
23
|
+
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
24
|
+
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
25
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
26
|
+
DEALINGS IN THE SOFTWARE.
|
27
|
+
----------------------------------------------------------------------- */
|
28
|
+
|
29
|
+
#define LIBFFI_ASM
|
30
|
+
#include <fficonfig.h>
|
31
|
+
#include <ffi.h>
|
32
|
+
#include <ffi_cfi.h>
|
33
|
+
#include "internal.h"
|
34
|
+
#include "ksarm.h"
|
35
|
+
|
36
|
+
|
37
|
+
; 8 byte aligned AREA to support 8 byte aligned jump tables
|
38
|
+
MACRO
|
39
|
+
NESTED_ENTRY_FFI $FuncName, $AreaName, $ExceptHandler
|
40
|
+
|
41
|
+
; compute the function's labels
|
42
|
+
__DeriveFunctionLabels $FuncName
|
43
|
+
|
44
|
+
; determine the area we will put the function into
|
45
|
+
__FuncArea SETS "|.text|"
|
46
|
+
IF "$AreaName" != ""
|
47
|
+
__FuncArea SETS "$AreaName"
|
48
|
+
ENDIF
|
49
|
+
|
50
|
+
; set up the exception handler itself
|
51
|
+
__FuncExceptionHandler SETS ""
|
52
|
+
IF "$ExceptHandler" != ""
|
53
|
+
__FuncExceptionHandler SETS "|$ExceptHandler|"
|
54
|
+
ENDIF
|
55
|
+
|
56
|
+
; switch to the specified area, jump tables require 8 byte alignment
|
57
|
+
AREA $__FuncArea,CODE,CODEALIGN,ALIGN=3,READONLY
|
58
|
+
|
59
|
+
; export the function name
|
60
|
+
__ExportProc $FuncName
|
61
|
+
|
62
|
+
; flush any pending literal pool stuff
|
63
|
+
ROUT
|
64
|
+
|
65
|
+
; reset the state of the unwind code tracking
|
66
|
+
__ResetUnwindState
|
67
|
+
|
68
|
+
MEND
|
69
|
+
|
70
|
+
; MACRO
|
71
|
+
; TABLE_ENTRY $Type, $Table
|
72
|
+
;$Type_$Table
|
73
|
+
; MEND
|
74
|
+
|
75
|
+
#define E(index,table) return_##index##_##table
|
76
|
+
|
77
|
+
; r0: stack
|
78
|
+
; r1: frame
|
79
|
+
; r2: fn
|
80
|
+
; r3: vfp_used
|
81
|
+
|
82
|
+
; fake entry point exists only to generate exists only to
|
83
|
+
; generate .pdata for exception unwinding
|
84
|
+
NESTED_ENTRY_FFI ffi_call_VFP_fake
|
85
|
+
PROLOG_PUSH {r11, lr} ; save fp and lr for unwind
|
86
|
+
|
87
|
+
ALTERNATE_ENTRY ffi_call_VFP
|
88
|
+
cmp r3, #3 ; load only d0 if possible
|
89
|
+
vldrle d0, [r0]
|
90
|
+
vldmgt r0, {d0-d7}
|
91
|
+
add r0, r0, #64 ; discard the vfp register args
|
92
|
+
b ffi_call_SYSV
|
93
|
+
NESTED_END ffi_call_VFP_fake
|
94
|
+
|
95
|
+
; fake entry point exists only to generate exists only to
|
96
|
+
; generate .pdata for exception unwinding
|
97
|
+
NESTED_ENTRY_FFI ffi_call_SYSV_fake
|
98
|
+
PROLOG_PUSH {r11, lr} ; save fp and lr for unwind
|
99
|
+
|
100
|
+
ALTERNATE_ENTRY ffi_call_SYSV
|
101
|
+
stm r1, {fp, lr}
|
102
|
+
mov fp, r1
|
103
|
+
|
104
|
+
mov sp, r0 ; install the stack pointer
|
105
|
+
mov lr, r2 ; move the fn pointer out of the way
|
106
|
+
ldr ip, [fp, #16] ; install the static chain
|
107
|
+
ldmia sp!, {r0-r3} ; move first 4 parameters in registers.
|
108
|
+
blx lr ; call fn
|
109
|
+
|
110
|
+
; Load r2 with the pointer to storage for the return value
|
111
|
+
; Load r3 with the return type code
|
112
|
+
ldr r2, [fp, #8]
|
113
|
+
ldr r3, [fp, #12]
|
114
|
+
|
115
|
+
; Deallocate the stack with the arguments.
|
116
|
+
mov sp, fp
|
117
|
+
|
118
|
+
; Store values stored in registers.
|
119
|
+
ALIGN 8
|
120
|
+
lsl r3, #3
|
121
|
+
add r3, r3, pc
|
122
|
+
add r3, #8
|
123
|
+
mov pc, r3
|
124
|
+
|
125
|
+
|
126
|
+
E(ARM_TYPE_VFP_S, ffi_call)
|
127
|
+
ALIGN 8
|
128
|
+
vstr s0, [r2]
|
129
|
+
pop {fp,pc}
|
130
|
+
E(ARM_TYPE_VFP_D, ffi_call)
|
131
|
+
ALIGN 8
|
132
|
+
vstr d0, [r2]
|
133
|
+
pop {fp,pc}
|
134
|
+
E(ARM_TYPE_VFP_N, ffi_call)
|
135
|
+
ALIGN 8
|
136
|
+
vstm r2, {d0-d3}
|
137
|
+
pop {fp,pc}
|
138
|
+
E(ARM_TYPE_INT64, ffi_call)
|
139
|
+
ALIGN 8
|
140
|
+
str r1, [r2, #4]
|
141
|
+
nop
|
142
|
+
E(ARM_TYPE_INT, ffi_call)
|
143
|
+
ALIGN 8
|
144
|
+
str r0, [r2]
|
145
|
+
pop {fp,pc}
|
146
|
+
E(ARM_TYPE_VOID, ffi_call)
|
147
|
+
ALIGN 8
|
148
|
+
pop {fp,pc}
|
149
|
+
nop
|
150
|
+
E(ARM_TYPE_STRUCT, ffi_call)
|
151
|
+
ALIGN 8
|
152
|
+
cmp r3, #ARM_TYPE_STRUCT
|
153
|
+
pop {fp,pc}
|
154
|
+
NESTED_END ffi_call_SYSV_fake
|
155
|
+
|
156
|
+
IMPORT |ffi_closure_inner_SYSV|
|
157
|
+
/*
|
158
|
+
int ffi_closure_inner_SYSV
|
159
|
+
(
|
160
|
+
cif, ; r0
|
161
|
+
fun, ; r1
|
162
|
+
user_data, ; r2
|
163
|
+
frame ; r3
|
164
|
+
)
|
165
|
+
*/
|
166
|
+
|
167
|
+
NESTED_ENTRY_FFI ffi_go_closure_SYSV
|
168
|
+
stmdb sp!, {r0-r3} ; save argument regs
|
169
|
+
ldr r0, [ip, #4] ; load cif
|
170
|
+
ldr r1, [ip, #8] ; load fun
|
171
|
+
mov r2, ip ; load user_data
|
172
|
+
b ffi_go_closure_SYSV_0
|
173
|
+
NESTED_END ffi_go_closure_SYSV
|
174
|
+
|
175
|
+
; r3: ffi_closure
|
176
|
+
|
177
|
+
; fake entry point exists only to generate exists only to
|
178
|
+
; generate .pdata for exception unwinding
|
179
|
+
NESTED_ENTRY_FFI ffi_closure_SYSV_fake
|
180
|
+
PROLOG_PUSH {r11, lr} ; save fp and lr for unwind
|
181
|
+
ALTERNATE_ENTRY ffi_closure_SYSV
|
182
|
+
ldmfd sp!, {ip,r0} ; restore fp (r0 is used for stack alignment)
|
183
|
+
stmdb sp!, {r0-r3} ; save argument regs
|
184
|
+
|
185
|
+
ldr r0, [ip, #FFI_TRAMPOLINE_CLOSURE_OFFSET] ; ffi_closure->cif
|
186
|
+
ldr r1, [ip, #FFI_TRAMPOLINE_CLOSURE_OFFSET+4] ; ffi_closure->fun
|
187
|
+
ldr r2, [ip, #FFI_TRAMPOLINE_CLOSURE_OFFSET+8] ; ffi_closure->user_data
|
188
|
+
|
189
|
+
ALTERNATE_ENTRY ffi_go_closure_SYSV_0
|
190
|
+
add ip, sp, #16 ; compute entry sp
|
191
|
+
|
192
|
+
sub sp, sp, #64+32 ; allocate frame parameter (sizeof(vfp_space) = 64, sizeof(result) = 32)
|
193
|
+
mov r3, sp ; set frame parameter
|
194
|
+
stmdb sp!, {ip,lr}
|
195
|
+
|
196
|
+
bl ffi_closure_inner_SYSV ; call the Python closure
|
197
|
+
|
198
|
+
; Load values returned in registers.
|
199
|
+
add r2, sp, #64+8 ; address of closure_frame->result
|
200
|
+
bl ffi_closure_ret ; move result to correct register or memory for type
|
201
|
+
|
202
|
+
ldmfd sp!, {ip,lr}
|
203
|
+
mov sp, ip ; restore stack pointer
|
204
|
+
mov pc, lr
|
205
|
+
NESTED_END ffi_closure_SYSV_fake
|
206
|
+
|
207
|
+
IMPORT |ffi_closure_inner_VFP|
|
208
|
+
/*
|
209
|
+
int ffi_closure_inner_VFP
|
210
|
+
(
|
211
|
+
cif, ; r0
|
212
|
+
fun, ; r1
|
213
|
+
user_data, ; r2
|
214
|
+
frame ; r3
|
215
|
+
)
|
216
|
+
*/
|
217
|
+
|
218
|
+
NESTED_ENTRY_FFI ffi_go_closure_VFP
|
219
|
+
stmdb sp!, {r0-r3} ; save argument regs
|
220
|
+
ldr r0, [ip, #4] ; load cif
|
221
|
+
ldr r1, [ip, #8] ; load fun
|
222
|
+
mov r2, ip ; load user_data
|
223
|
+
b ffi_go_closure_VFP_0
|
224
|
+
NESTED_END ffi_go_closure_VFP
|
225
|
+
|
226
|
+
; fake entry point exists only to generate exists only to
|
227
|
+
; generate .pdata for exception unwinding
|
228
|
+
; r3: closure
|
229
|
+
NESTED_ENTRY_FFI ffi_closure_VFP_fake
|
230
|
+
PROLOG_PUSH {r11, lr} ; save fp and lr for unwind
|
231
|
+
|
232
|
+
ALTERNATE_ENTRY ffi_closure_VFP
|
233
|
+
ldmfd sp!, {ip,r0} ; restore fp (r0 is used for stack alignment)
|
234
|
+
stmdb sp!, {r0-r3} ; save argument regs
|
235
|
+
|
236
|
+
ldr r0, [ip, #FFI_TRAMPOLINE_CLOSURE_OFFSET] ; load cif
|
237
|
+
ldr r1, [ip, #FFI_TRAMPOLINE_CLOSURE_OFFSET+4] ; load fun
|
238
|
+
ldr r2, [ip, #FFI_TRAMPOLINE_CLOSURE_OFFSET+8] ; load user_data
|
239
|
+
|
240
|
+
ALTERNATE_ENTRY ffi_go_closure_VFP_0
|
241
|
+
add ip, sp, #16 ; compute entry sp
|
242
|
+
sub sp, sp, #32 ; save space for closure_frame->result
|
243
|
+
vstmdb sp!, {d0-d7} ; push closure_frame->vfp_space
|
244
|
+
|
245
|
+
mov r3, sp ; save closure_frame
|
246
|
+
stmdb sp!, {ip,lr}
|
247
|
+
|
248
|
+
bl ffi_closure_inner_VFP
|
249
|
+
|
250
|
+
; Load values returned in registers.
|
251
|
+
add r2, sp, #64+8 ; load result
|
252
|
+
bl ffi_closure_ret
|
253
|
+
ldmfd sp!, {ip,lr}
|
254
|
+
mov sp, ip ; restore stack pointer
|
255
|
+
mov pc, lr
|
256
|
+
NESTED_END ffi_closure_VFP_fake
|
257
|
+
|
258
|
+
/* Load values returned in registers for both closure entry points.
|
259
|
+
Note that we use LDM with SP in the register set. This is deprecated
|
260
|
+
by ARM, but not yet unpredictable. */
|
261
|
+
|
262
|
+
NESTED_ENTRY_FFI ffi_closure_ret
|
263
|
+
stmdb sp!, {fp,lr}
|
264
|
+
|
265
|
+
ALIGN 8
|
266
|
+
lsl r0, #3
|
267
|
+
add r0, r0, pc
|
268
|
+
add r0, #8
|
269
|
+
mov pc, r0
|
270
|
+
|
271
|
+
E(ARM_TYPE_VFP_S, ffi_closure)
|
272
|
+
ALIGN 8
|
273
|
+
vldr s0, [r2]
|
274
|
+
b call_epilogue
|
275
|
+
E(ARM_TYPE_VFP_D, ffi_closure)
|
276
|
+
ALIGN 8
|
277
|
+
vldr d0, [r2]
|
278
|
+
b call_epilogue
|
279
|
+
E(ARM_TYPE_VFP_N, ffi_closure)
|
280
|
+
ALIGN 8
|
281
|
+
vldm r2, {d0-d3}
|
282
|
+
b call_epilogue
|
283
|
+
E(ARM_TYPE_INT64, ffi_closure)
|
284
|
+
ALIGN 8
|
285
|
+
ldr r1, [r2, #4]
|
286
|
+
nop
|
287
|
+
E(ARM_TYPE_INT, ffi_closure)
|
288
|
+
ALIGN 8
|
289
|
+
ldr r0, [r2]
|
290
|
+
b call_epilogue
|
291
|
+
E(ARM_TYPE_VOID, ffi_closure)
|
292
|
+
ALIGN 8
|
293
|
+
b call_epilogue
|
294
|
+
nop
|
295
|
+
E(ARM_TYPE_STRUCT, ffi_closure)
|
296
|
+
ALIGN 8
|
297
|
+
b call_epilogue
|
298
|
+
call_epilogue
|
299
|
+
ldmfd sp!, {fp,pc}
|
300
|
+
NESTED_END ffi_closure_ret
|
301
|
+
|
302
|
+
AREA |.trampoline|, DATA, THUMB, READONLY
|
303
|
+
EXPORT |ffi_arm_trampoline|
|
304
|
+
|ffi_arm_trampoline| DATA
|
305
|
+
thisproc adr ip, thisproc
|
306
|
+
stmdb sp!, {ip, r0}
|
307
|
+
ldr pc, [pc, #0]
|
308
|
+
DCD 0
|
309
|
+
;ENDP
|
310
|
+
|
311
|
+
END
|
@@ -1,5 +1,6 @@
|
|
1
1
|
/* -----------------------------------------------------------------------
|
2
|
-
closures.c - Copyright (c)
|
2
|
+
closures.c - Copyright (c) 2019 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
|
|
@@ -122,7 +123,7 @@ ffi_closure_free (void *ptr)
|
|
122
123
|
# define FFI_MMAP_EXEC_WRIT 1
|
123
124
|
# define HAVE_MNTENT 1
|
124
125
|
# endif
|
125
|
-
# if defined(X86_WIN32) || defined(X86_WIN64) || defined(__OS2__)
|
126
|
+
# if defined(X86_WIN32) || defined(X86_WIN64) || defined(_M_ARM64) || defined(__OS2__)
|
126
127
|
/* Windows systems may have Data Execution Protection (DEP) enabled,
|
127
128
|
which requires the use of VirtualMalloc/VirtualFree to alloc/free
|
128
129
|
executable memory. */
|
@@ -172,7 +173,7 @@ struct ffi_trampoline_table
|
|
172
173
|
|
173
174
|
struct ffi_trampoline_table_entry
|
174
175
|
{
|
175
|
-
void *(*trampoline) ();
|
176
|
+
void *(*trampoline) (void);
|
176
177
|
ffi_trampoline_table_entry *next;
|
177
178
|
};
|
178
179
|
|
@@ -385,7 +386,7 @@ ffi_closure_free (void *ptr)
|
|
385
386
|
#endif
|
386
387
|
#include <string.h>
|
387
388
|
#include <stdio.h>
|
388
|
-
#if !defined(X86_WIN32) && !defined(X86_WIN64)
|
389
|
+
#if !defined(X86_WIN32) && !defined(X86_WIN64) && !defined(_M_ARM64)
|
389
390
|
#ifdef HAVE_MNTENT
|
390
391
|
#include <mntent.h>
|
391
392
|
#endif /* HAVE_MNTENT */
|
@@ -511,7 +512,7 @@ static int dlmalloc_trim(size_t) MAYBE_UNUSED;
|
|
511
512
|
static size_t dlmalloc_usable_size(void*) MAYBE_UNUSED;
|
512
513
|
static void dlmalloc_stats(void) MAYBE_UNUSED;
|
513
514
|
|
514
|
-
#if !(defined(X86_WIN32) || defined(X86_WIN64) || defined(__OS2__)) || defined (__CYGWIN__) || defined(__INTERIX)
|
515
|
+
#if !(defined(X86_WIN32) || defined(X86_WIN64) || defined(_M_ARM64) || defined(__OS2__)) || defined (__CYGWIN__) || defined(__INTERIX)
|
515
516
|
/* Use these for mmap and munmap within dlmalloc.c. */
|
516
517
|
static void *dlmmap(void *, size_t, int, int, int, off_t);
|
517
518
|
static int dlmunmap(void *, size_t);
|
@@ -525,7 +526,7 @@ static int dlmunmap(void *, size_t);
|
|
525
526
|
#undef mmap
|
526
527
|
#undef munmap
|
527
528
|
|
528
|
-
#if !(defined(X86_WIN32) || defined(X86_WIN64) || defined(__OS2__)) || defined (__CYGWIN__) || defined(__INTERIX)
|
529
|
+
#if !(defined(X86_WIN32) || defined(X86_WIN64) || defined(_M_ARM64) || defined(__OS2__)) || defined (__CYGWIN__) || defined(__INTERIX)
|
529
530
|
|
530
531
|
/* A mutex used to synchronize access to *exec* variables in this file. */
|
531
532
|
static pthread_mutex_t open_temp_exec_file_mutex = PTHREAD_MUTEX_INITIALIZER;
|
@@ -789,7 +790,13 @@ dlmmap_locked (void *start, size_t length, int prot, int flags, off_t offset)
|
|
789
790
|
close (execfd);
|
790
791
|
goto retry_open;
|
791
792
|
}
|
792
|
-
ftruncate (execfd, offset)
|
793
|
+
if (ftruncate (execfd, offset) != 0)
|
794
|
+
{
|
795
|
+
/* Fixme : Error logs can be added here. Returning an error for
|
796
|
+
* ftruncte() will not add any advantage as it is being
|
797
|
+
* validating in the error case. */
|
798
|
+
}
|
799
|
+
|
793
800
|
return MFAIL;
|
794
801
|
}
|
795
802
|
else if (!offset
|
@@ -801,7 +808,12 @@ dlmmap_locked (void *start, size_t length, int prot, int flags, off_t offset)
|
|
801
808
|
if (start == MFAIL)
|
802
809
|
{
|
803
810
|
munmap (ptr, length);
|
804
|
-
ftruncate (execfd, offset)
|
811
|
+
if (ftruncate (execfd, offset) != 0)
|
812
|
+
{
|
813
|
+
/* Fixme : Error logs can be added here. Returning an error for
|
814
|
+
* ftruncte() will not add any advantage as it is being
|
815
|
+
* validating in the error case. */
|
816
|
+
}
|
805
817
|
return start;
|
806
818
|
}
|
807
819
|
|
@@ -896,7 +908,7 @@ segment_holding_code (mstate m, char* addr)
|
|
896
908
|
}
|
897
909
|
#endif
|
898
910
|
|
899
|
-
#endif /* !(defined(X86_WIN32) || defined(X86_WIN64) || defined(__OS2__)) || defined (__CYGWIN__) || defined(__INTERIX) */
|
911
|
+
#endif /* !(defined(X86_WIN32) || defined(X86_WIN64) || defined(_M_ARM64) || defined(__OS2__)) || defined (__CYGWIN__) || defined(__INTERIX) */
|
900
912
|
|
901
913
|
/* Allocate a chunk of memory with the given size. Returns a pointer
|
902
914
|
to the writable address, and sets *CODE to the executable
|
@@ -921,6 +933,20 @@ ffi_closure_alloc (size_t size, void **code)
|
|
921
933
|
return ptr;
|
922
934
|
}
|
923
935
|
|
936
|
+
void *
|
937
|
+
ffi_data_to_code_pointer (void *data)
|
938
|
+
{
|
939
|
+
msegmentptr seg = segment_holding (gm, data);
|
940
|
+
/* We expect closures to be allocated with ffi_closure_alloc(), in
|
941
|
+
which case seg will be non-NULL. However, some users take on the
|
942
|
+
burden of managing this memory themselves, in which case this
|
943
|
+
we'll just return data. */
|
944
|
+
if (seg)
|
945
|
+
return add_segment_exec_offset (data, seg);
|
946
|
+
else
|
947
|
+
return data;
|
948
|
+
}
|
949
|
+
|
924
950
|
/* Release a chunk of memory allocated with ffi_closure_alloc. If
|
925
951
|
FFI_CLOSURE_FREE_CODE is nonzero, the given address can be the
|
926
952
|
writable or the executable address given. Otherwise, only the
|
@@ -960,6 +986,12 @@ ffi_closure_free (void *ptr)
|
|
960
986
|
free (ptr);
|
961
987
|
}
|
962
988
|
|
989
|
+
void *
|
990
|
+
ffi_data_to_code_pointer (void *data)
|
991
|
+
{
|
992
|
+
return data;
|
993
|
+
}
|
994
|
+
|
963
995
|
# endif /* ! FFI_MMAP_EXEC_WRIT */
|
964
996
|
#endif /* FFI_CLOSURES */
|
965
997
|
|
@@ -107,7 +107,7 @@ void *ffi_prep_args(char *stack, extended_cif *ecif)
|
|
107
107
|
count += z;
|
108
108
|
}
|
109
109
|
|
110
|
-
return (stack + ((count > 24) ? 24 :
|
110
|
+
return (stack + ((count > 24) ? 24 : FFI_ALIGN_DOWN(count, 8)));
|
111
111
|
}
|
112
112
|
|
113
113
|
/* Perform machine dependent cif processing */
|
@@ -61,7 +61,7 @@ unsigned int ffi_prep_args(char *stack, extended_cif *ecif)
|
|
61
61
|
argp -= z;
|
62
62
|
|
63
63
|
/* Align if necessary */
|
64
|
-
argp = (char *)
|
64
|
+
argp = (char *) FFI_ALIGN_DOWN(FFI_ALIGN_DOWN(argp, (*p_arg)->alignment), 4);
|
65
65
|
|
66
66
|
if (z < sizeof(int)) {
|
67
67
|
z = sizeof(int);
|
@@ -282,9 +282,11 @@ $LCFI12:
|
|
282
282
|
li $13, 1 # FFI_O32
|
283
283
|
bne $16, $13, 1f # Skip fp save if FFI_O32_SOFT_FLOAT
|
284
284
|
|
285
|
+
#ifndef __mips_soft_float
|
285
286
|
# Store all possible float/double registers.
|
286
287
|
s.d $f12, FA_0_0_OFF2($fp)
|
287
288
|
s.d $f14, FA_1_0_OFF2($fp)
|
289
|
+
#endif
|
288
290
|
1:
|
289
291
|
# prepare arguments for ffi_closure_mips_inner_O32
|
290
292
|
REG_L a0, 4($15) # cif
|
@@ -100,7 +100,7 @@ void *ffi_prep_args(char *stack, extended_cif *ecif)
|
|
100
100
|
count += z;
|
101
101
|
}
|
102
102
|
|
103
|
-
return (stack + ((count > 24) ? 24 :
|
103
|
+
return (stack + ((count > 24) ? 24 : FFI_ALIGN_DOWN(count, 8)));
|
104
104
|
}
|
105
105
|
|
106
106
|
/* Perform machine dependent cif processing */
|
@@ -297,10 +297,18 @@ ffi_closure_pa32:
|
|
297
297
|
.LSCIE1:
|
298
298
|
.word 0x0 ;# CIE Identifier Tag
|
299
299
|
.byte 0x1 ;# CIE Version
|
300
|
+
#ifdef __PIC__
|
301
|
+
.ascii "zR\0" ;# CIE Augmentation: 'z' - data, 'R' - DW_EH_PE_... data
|
302
|
+
#else
|
300
303
|
.ascii "\0" ;# CIE Augmentation
|
304
|
+
#endif
|
301
305
|
.uleb128 0x1 ;# CIE Code Alignment Factor
|
302
306
|
.sleb128 4 ;# CIE Data Alignment Factor
|
303
307
|
.byte 0x2 ;# CIE RA Column
|
308
|
+
#ifdef __PIC__
|
309
|
+
.uleb128 0x1 ;# Augmentation size
|
310
|
+
.byte 0x1b ;# FDE Encoding (DW_EH_PE_pcrel|DW_EH_PE_sdata4)
|
311
|
+
#endif
|
304
312
|
.byte 0xc ;# DW_CFA_def_cfa
|
305
313
|
.uleb128 0x1e
|
306
314
|
.uleb128 0x0
|
@@ -310,9 +318,15 @@ ffi_closure_pa32:
|
|
310
318
|
.word .LEFDE1-.LASFDE1 ;# FDE Length
|
311
319
|
.LASFDE1:
|
312
320
|
.word .LASFDE1-.Lframe1 ;# FDE CIE offset
|
313
|
-
|
321
|
+
#ifdef __PIC__
|
322
|
+
.word .LFB1-. ;# FDE initial location
|
323
|
+
#else
|
324
|
+
.word .LFB1 ;# FDE initial location
|
325
|
+
#endif
|
314
326
|
.word .LFE1-.LFB1 ;# FDE address range
|
315
|
-
|
327
|
+
#ifdef __PIC__
|
328
|
+
.uleb128 0x0 ;# Augmentation size: no data
|
329
|
+
#endif
|
316
330
|
.byte 0x4 ;# DW_CFA_advance_loc4
|
317
331
|
.word .LCFI11-.LFB1
|
318
332
|
.byte 0x83 ;# DW_CFA_offset, column 0x3
|
@@ -338,8 +352,15 @@ ffi_closure_pa32:
|
|
338
352
|
.word .LEFDE2-.LASFDE2 ;# FDE Length
|
339
353
|
.LASFDE2:
|
340
354
|
.word .LASFDE2-.Lframe1 ;# FDE CIE offset
|
355
|
+
#ifdef __PIC__
|
356
|
+
.word .LFB2-. ;# FDE initial location
|
357
|
+
#else
|
341
358
|
.word .LFB2 ;# FDE initial location
|
359
|
+
#endif
|
342
360
|
.word .LFE2-.LFB2 ;# FDE address range
|
361
|
+
#ifdef __PIC__
|
362
|
+
.uleb128 0x0 ;# Augmentation size: no data
|
363
|
+
#endif
|
343
364
|
.byte 0x4 ;# DW_CFA_advance_loc4
|
344
365
|
.word .LCFI21-.LFB2
|
345
366
|
.byte 0x83 ;# DW_CFA_offset, column 0x3
|
@@ -85,8 +85,9 @@ ffi_call_int (ffi_cif *cif,
|
|
85
85
|
can write r3 and r4 to memory without worrying about struct size.
|
86
86
|
|
87
87
|
For ELFv2 ABI, use a bounce buffer for homogeneous structs too,
|
88
|
-
for similar reasons.
|
89
|
-
|
88
|
+
for similar reasons. This bounce buffer must be aligned to 16
|
89
|
+
bytes for use with homogeneous structs of vectors (float128). */
|
90
|
+
float128 smst_buffer[8];
|
90
91
|
extended_cif ecif;
|
91
92
|
|
92
93
|
ecif.cif = cif;
|
@@ -121,8 +122,9 @@ ffi_call_int (ffi_cif *cif,
|
|
121
122
|
# endif
|
122
123
|
/* The SYSV ABI returns a structure of up to 8 bytes in size
|
123
124
|
left-padded in r3/r4, and the ELFv2 ABI similarly returns a
|
124
|
-
structure of up to 8 bytes in size left-padded in r3.
|
125
|
-
|
125
|
+
structure of up to 8 bytes in size left-padded in r3. But
|
126
|
+
note that a structure of a single float is not paddded. */
|
127
|
+
if (rsize <= 8 && (cif->flags & FLAG_RETURNS_FP) == 0)
|
126
128
|
memcpy (rvalue, (char *) smst_buffer + 8 - rsize, rsize);
|
127
129
|
else
|
128
130
|
#endif
|