ffi 1.11.1 → 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 +207 -0
- data/Gemfile +3 -4
- data/README.md +24 -3
- data/Rakefile +65 -69
- data/ext/ffi_c/AbstractMemory.c +29 -34
- data/ext/ffi_c/Buffer.c +4 -9
- data/ext/ffi_c/Call.c +6 -22
- data/ext/ffi_c/Call.h +2 -2
- 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 +43 -43
- 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 -9
- 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 +0 -8
- data/ext/ffi_c/Thread.h +1 -9
- data/ext/ffi_c/Type.c +1 -1
- data/ext/ffi_c/Types.c +7 -8
- data/ext/ffi_c/Types.h +3 -4
- data/ext/ffi_c/Variadic.c +14 -9
- data/ext/ffi_c/compat.h +4 -0
- data/ext/ffi_c/extconf.rb +36 -24
- 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 +32 -11
- 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 +4 -0
- 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 +151 -67
- 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/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/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/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/x86/ffi.c +28 -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 +21 -11
- data/ext/ffi_c/libffi/src/x86/sysv.S +17 -8
- data/ext/ffi_c/libffi/src/x86/sysv_intel.S +995 -0
- data/ext/ffi_c/libffi/src/x86/unix64.S +59 -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/ffi.gemspec +5 -6
- data/lib/ffi/abstract_memory.rb +44 -0
- data/lib/ffi/autopointer.rb +1 -1
- data/lib/ffi/ffi.rb +2 -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 +22 -9
- data/lib/ffi/pointer.rb +21 -14
- data/lib/ffi/struct.rb +10 -5
- data/lib/ffi/tools/const_generator.rb +6 -4
- data/lib/ffi/tools/struct_generator.rb +2 -1
- data/lib/ffi/tools/types_generator.rb +7 -4
- 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 +147 -134
- data/.gitignore +0 -25
- data/.gitmodules +0 -4
- data/.travis.yml +0 -42
- data/.yardopts +0 -5
- data/appveyor.yml +0 -27
- 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
@@ -36,8 +36,10 @@
|
|
36
36
|
.cfi_startproc
|
37
37
|
# if _CALL_ELF == 2
|
38
38
|
ffi_call_LINUX64:
|
39
|
+
# ifndef __PCREL__
|
39
40
|
addis %r2, %r12, .TOC.-ffi_call_LINUX64@ha
|
40
41
|
addi %r2, %r2, .TOC.-ffi_call_LINUX64@l
|
42
|
+
# endif
|
41
43
|
.localentry ffi_call_LINUX64, . - ffi_call_LINUX64
|
42
44
|
# else
|
43
45
|
.section ".opd","aw"
|
@@ -89,9 +91,15 @@ ffi_call_LINUX64:
|
|
89
91
|
/* Call ffi_prep_args64. */
|
90
92
|
mr %r4, %r1
|
91
93
|
# if defined _CALL_LINUX || _CALL_ELF == 2
|
94
|
+
# ifdef __PCREL__
|
95
|
+
bl ffi_prep_args64@notoc
|
96
|
+
# else
|
92
97
|
bl ffi_prep_args64
|
98
|
+
nop
|
99
|
+
# endif
|
93
100
|
# else
|
94
101
|
bl .ffi_prep_args64
|
102
|
+
nop
|
95
103
|
# endif
|
96
104
|
|
97
105
|
# if _CALL_ELF == 2
|
@@ -101,40 +109,70 @@ ffi_call_LINUX64:
|
|
101
109
|
ld %r2, 8(%r29)
|
102
110
|
# endif
|
103
111
|
/* Now do the call. */
|
104
|
-
/* Set up cr1 with bits
|
105
|
-
mtcrf
|
112
|
+
/* Set up cr1 with bits 3-7 of the flags. */
|
113
|
+
mtcrf 0xc0, %r31
|
106
114
|
|
107
115
|
/* Get the address to call into CTR. */
|
108
116
|
mtctr %r12
|
109
117
|
/* Load all those argument registers. */
|
110
|
-
|
111
|
-
ld %
|
112
|
-
ld %
|
113
|
-
ld %
|
118
|
+
addi %r29, %r28, -32-(8*8)
|
119
|
+
ld %r3, (0*8)(%r29)
|
120
|
+
ld %r4, (1*8)(%r29)
|
121
|
+
ld %r5, (2*8)(%r29)
|
122
|
+
ld %r6, (3*8)(%r29)
|
114
123
|
bf- 5, 1f
|
115
|
-
ld %r7,
|
116
|
-
ld %r8,
|
117
|
-
ld %r9,
|
118
|
-
ld %r10,
|
124
|
+
ld %r7, (4*8)(%r29)
|
125
|
+
ld %r8, (5*8)(%r29)
|
126
|
+
ld %r9, (6*8)(%r29)
|
127
|
+
ld %r10, (7*8)(%r29)
|
119
128
|
1:
|
120
129
|
|
121
130
|
/* Load all the FP registers. */
|
122
131
|
bf- 6, 2f
|
123
|
-
|
124
|
-
lfd %
|
125
|
-
lfd %
|
126
|
-
lfd %
|
127
|
-
lfd %
|
128
|
-
lfd %
|
129
|
-
lfd %
|
130
|
-
lfd %
|
131
|
-
lfd %
|
132
|
-
lfd %
|
133
|
-
lfd %
|
134
|
-
lfd %
|
135
|
-
lfd %
|
132
|
+
addi %r29, %r29, -(14*8)
|
133
|
+
lfd %f1, ( 1*8)(%r29)
|
134
|
+
lfd %f2, ( 2*8)(%r29)
|
135
|
+
lfd %f3, ( 3*8)(%r29)
|
136
|
+
lfd %f4, ( 4*8)(%r29)
|
137
|
+
lfd %f5, ( 5*8)(%r29)
|
138
|
+
lfd %f6, ( 6*8)(%r29)
|
139
|
+
lfd %f7, ( 7*8)(%r29)
|
140
|
+
lfd %f8, ( 8*8)(%r29)
|
141
|
+
lfd %f9, ( 9*8)(%r29)
|
142
|
+
lfd %f10, (10*8)(%r29)
|
143
|
+
lfd %f11, (11*8)(%r29)
|
144
|
+
lfd %f12, (12*8)(%r29)
|
145
|
+
lfd %f13, (13*8)(%r29)
|
136
146
|
2:
|
137
147
|
|
148
|
+
/* Load all the vector registers. */
|
149
|
+
bf- 3, 3f
|
150
|
+
addi %r29, %r29, -16
|
151
|
+
lvx %v13, 0, %r29
|
152
|
+
addi %r29, %r29, -16
|
153
|
+
lvx %v12, 0, %r29
|
154
|
+
addi %r29, %r29, -16
|
155
|
+
lvx %v11, 0, %r29
|
156
|
+
addi %r29, %r29, -16
|
157
|
+
lvx %v10, 0, %r29
|
158
|
+
addi %r29, %r29, -16
|
159
|
+
lvx %v9, 0, %r29
|
160
|
+
addi %r29, %r29, -16
|
161
|
+
lvx %v8, 0, %r29
|
162
|
+
addi %r29, %r29, -16
|
163
|
+
lvx %v7, 0, %r29
|
164
|
+
addi %r29, %r29, -16
|
165
|
+
lvx %v6, 0, %r29
|
166
|
+
addi %r29, %r29, -16
|
167
|
+
lvx %v5, 0, %r29
|
168
|
+
addi %r29, %r29, -16
|
169
|
+
lvx %v4, 0, %r29
|
170
|
+
addi %r29, %r29, -16
|
171
|
+
lvx %v3, 0, %r29
|
172
|
+
addi %r29, %r29, -16
|
173
|
+
lvx %v2, 0, %r29
|
174
|
+
3:
|
175
|
+
|
138
176
|
/* Make the call. */
|
139
177
|
ld %r11, 8(%r28)
|
140
178
|
bctrl
|
@@ -152,6 +190,7 @@ ffi_call_LINUX64:
|
|
152
190
|
bt 31, .Lstruct_return_value
|
153
191
|
bt 30, .Ldone_return_value
|
154
192
|
bt 29, .Lfp_return_value
|
193
|
+
bt 28, .Lvec_return_value
|
155
194
|
std %r3, 0(%r30)
|
156
195
|
/* Fall through... */
|
157
196
|
|
@@ -167,12 +206,16 @@ ffi_call_LINUX64:
|
|
167
206
|
ld %r31, -8(%r1)
|
168
207
|
blr
|
169
208
|
|
209
|
+
.Lvec_return_value:
|
210
|
+
stvx %v2, 0, %r30
|
211
|
+
b .Ldone_return_value
|
212
|
+
|
170
213
|
.Lfp_return_value:
|
171
214
|
.cfi_def_cfa_register 28
|
172
|
-
bf 28, .Lfloat_return_value
|
173
|
-
stfd %f1, 0(%r30)
|
174
215
|
mtcrf 0x02, %r31 /* cr6 */
|
175
|
-
bf 27, .
|
216
|
+
bf 27, .Lfloat_return_value
|
217
|
+
stfd %f1, 0(%r30)
|
218
|
+
bf 26, .Ldone_return_value
|
176
219
|
stfd %f2, 8(%r30)
|
177
220
|
b .Ldone_return_value
|
178
221
|
.Lfloat_return_value:
|
@@ -180,8 +223,9 @@ ffi_call_LINUX64:
|
|
180
223
|
b .Ldone_return_value
|
181
224
|
|
182
225
|
.Lstruct_return_value:
|
183
|
-
bf 29, .
|
184
|
-
|
226
|
+
bf 29, .Lvec_homog_or_small_struct
|
227
|
+
mtcrf 0x02, %r31 /* cr6 */
|
228
|
+
bf 27, .Lfloat_homog_return_value
|
185
229
|
stfd %f1, 0(%r30)
|
186
230
|
stfd %f2, 8(%r30)
|
187
231
|
stfd %f3, 16(%r30)
|
@@ -203,6 +247,25 @@ ffi_call_LINUX64:
|
|
203
247
|
stfs %f8, 28(%r30)
|
204
248
|
b .Ldone_return_value
|
205
249
|
|
250
|
+
.Lvec_homog_or_small_struct:
|
251
|
+
bf 28, .Lsmall_struct
|
252
|
+
stvx %v2, 0, %r30
|
253
|
+
addi %r30, %r30, 16
|
254
|
+
stvx %v3, 0, %r30
|
255
|
+
addi %r30, %r30, 16
|
256
|
+
stvx %v4, 0, %r30
|
257
|
+
addi %r30, %r30, 16
|
258
|
+
stvx %v5, 0, %r30
|
259
|
+
addi %r30, %r30, 16
|
260
|
+
stvx %v6, 0, %r30
|
261
|
+
addi %r30, %r30, 16
|
262
|
+
stvx %v7, 0, %r30
|
263
|
+
addi %r30, %r30, 16
|
264
|
+
stvx %v8, 0, %r30
|
265
|
+
addi %r30, %r30, 16
|
266
|
+
stvx %v9, 0, %r30
|
267
|
+
b .Ldone_return_value
|
268
|
+
|
206
269
|
.Lsmall_struct:
|
207
270
|
std %r3, 0(%r30)
|
208
271
|
std %r4, 8(%r30)
|
@@ -37,8 +37,10 @@
|
|
37
37
|
.cfi_startproc
|
38
38
|
# if _CALL_ELF == 2
|
39
39
|
ffi_closure_LINUX64:
|
40
|
+
# ifndef __PCREL__
|
40
41
|
addis %r2, %r12, .TOC.-ffi_closure_LINUX64@ha
|
41
42
|
addi %r2, %r2, .TOC.-ffi_closure_LINUX64@l
|
43
|
+
# endif
|
42
44
|
.localentry ffi_closure_LINUX64, . - ffi_closure_LINUX64
|
43
45
|
# else
|
44
46
|
.section ".opd","aw"
|
@@ -61,9 +63,15 @@ ffi_closure_LINUX64:
|
|
61
63
|
# endif
|
62
64
|
|
63
65
|
# if _CALL_ELF == 2
|
64
|
-
#
|
65
|
-
#
|
66
|
-
#
|
66
|
+
# ifdef __VEC__
|
67
|
+
# 32 byte special reg save area + 64 byte parm save area
|
68
|
+
# + 128 byte retval area + 13*8 fpr save area + 12*16 vec save area + round to 16
|
69
|
+
# define STACKFRAME 528
|
70
|
+
# else
|
71
|
+
# 32 byte special reg save area + 64 byte parm save area
|
72
|
+
# + 64 byte retval area + 13*8 fpr save area + round to 16
|
73
|
+
# define STACKFRAME 272
|
74
|
+
# endif
|
67
75
|
# define PARMSAVE 32
|
68
76
|
# define RETVAL PARMSAVE+64
|
69
77
|
# else
|
@@ -143,9 +151,38 @@ ffi_closure_LINUX64:
|
|
143
151
|
stfd %f12, -104+(11*8)(%r1)
|
144
152
|
stfd %f13, -104+(12*8)(%r1)
|
145
153
|
|
146
|
-
# load up the pointer to the saved fpr registers
|
154
|
+
# load up the pointer to the saved fpr registers
|
147
155
|
addi %r8, %r1, -104
|
148
156
|
|
157
|
+
# ifdef __VEC__
|
158
|
+
# load up the pointer to the saved vector registers
|
159
|
+
# 8 bytes padding for 16-byte alignment at -112(%r1)
|
160
|
+
addi %r9, %r8, -24
|
161
|
+
stvx %v13, 0, %r9
|
162
|
+
addi %r9, %r9, -16
|
163
|
+
stvx %v12, 0, %r9
|
164
|
+
addi %r9, %r9, -16
|
165
|
+
stvx %v11, 0, %r9
|
166
|
+
addi %r9, %r9, -16
|
167
|
+
stvx %v10, 0, %r9
|
168
|
+
addi %r9, %r9, -16
|
169
|
+
stvx %v9, 0, %r9
|
170
|
+
addi %r9, %r9, -16
|
171
|
+
stvx %v8, 0, %r9
|
172
|
+
addi %r9, %r9, -16
|
173
|
+
stvx %v7, 0, %r9
|
174
|
+
addi %r9, %r9, -16
|
175
|
+
stvx %v6, 0, %r9
|
176
|
+
addi %r9, %r9, -16
|
177
|
+
stvx %v5, 0, %r9
|
178
|
+
addi %r9, %r9, -16
|
179
|
+
stvx %v4, 0, %r9
|
180
|
+
addi %r9, %r9, -16
|
181
|
+
stvx %v3, 0, %r9
|
182
|
+
addi %r9, %r9, -16
|
183
|
+
stvx %v2, 0, %r9
|
184
|
+
# endif
|
185
|
+
|
149
186
|
# load up the pointer to the result storage
|
150
187
|
addi %r6, %r1, -STACKFRAME+RETVAL
|
151
188
|
|
@@ -155,11 +192,19 @@ ffi_closure_LINUX64:
|
|
155
192
|
|
156
193
|
# make the call
|
157
194
|
# if defined _CALL_LINUX || _CALL_ELF == 2
|
195
|
+
# ifdef __PCREL__
|
196
|
+
bl ffi_closure_helper_LINUX64@notoc
|
197
|
+
.Lret:
|
198
|
+
# else
|
158
199
|
bl ffi_closure_helper_LINUX64
|
200
|
+
.Lret:
|
201
|
+
nop
|
202
|
+
# endif
|
159
203
|
# else
|
160
204
|
bl .ffi_closure_helper_LINUX64
|
161
|
-
# endif
|
162
205
|
.Lret:
|
206
|
+
nop
|
207
|
+
# endif
|
163
208
|
|
164
209
|
# now r3 contains the return type
|
165
210
|
# so use it to look up in a table
|
@@ -313,6 +358,16 @@ ffi_closure_LINUX64:
|
|
313
358
|
.cfi_def_cfa_offset 0
|
314
359
|
blr
|
315
360
|
.cfi_def_cfa_offset STACKFRAME
|
361
|
+
# case FFI_V2_TYPE_VECTOR
|
362
|
+
addi %r3, %r1, RETVAL
|
363
|
+
lvx %v2, 0, %r3
|
364
|
+
mtlr %r0
|
365
|
+
b .Lfinish
|
366
|
+
# case FFI_V2_TYPE_VECTOR_HOMOG
|
367
|
+
addi %r3, %r1, RETVAL
|
368
|
+
lvx %v2, 0, %r3
|
369
|
+
addi %r3, %r3, 16
|
370
|
+
b .Lmorevector
|
316
371
|
# case FFI_V2_TYPE_FLOAT_HOMOG
|
317
372
|
lfs %f1, RETVAL+0(%r1)
|
318
373
|
lfs %f2, RETVAL+4(%r1)
|
@@ -332,6 +387,25 @@ ffi_closure_LINUX64:
|
|
332
387
|
.cfi_def_cfa_offset 0
|
333
388
|
blr
|
334
389
|
.cfi_def_cfa_offset STACKFRAME
|
390
|
+
.Lmorevector:
|
391
|
+
lvx %v3, 0, %r3
|
392
|
+
addi %r3, %r3, 16
|
393
|
+
lvx %v4, 0, %r3
|
394
|
+
addi %r3, %r3, 16
|
395
|
+
lvx %v5, 0, %r3
|
396
|
+
mtlr %r0
|
397
|
+
addi %r3, %r3, 16
|
398
|
+
lvx %v6, 0, %r3
|
399
|
+
addi %r3, %r3, 16
|
400
|
+
lvx %v7, 0, %r3
|
401
|
+
addi %r3, %r3, 16
|
402
|
+
lvx %v8, 0, %r3
|
403
|
+
addi %r3, %r3, 16
|
404
|
+
lvx %v9, 0, %r3
|
405
|
+
addi %r1, %r1, STACKFRAME
|
406
|
+
.cfi_def_cfa_offset 0
|
407
|
+
blr
|
408
|
+
.cfi_def_cfa_offset STACKFRAME
|
335
409
|
.Lmorefloat:
|
336
410
|
lfs %f4, RETVAL+12(%r1)
|
337
411
|
mtlr %r0
|
@@ -396,8 +470,10 @@ ffi_closure_LINUX64:
|
|
396
470
|
.cfi_startproc
|
397
471
|
# if _CALL_ELF == 2
|
398
472
|
ffi_go_closure_linux64:
|
473
|
+
# ifndef __PCREL__
|
399
474
|
addis %r2, %r12, .TOC.-ffi_go_closure_linux64@ha
|
400
475
|
addi %r2, %r2, .TOC.-ffi_go_closure_linux64@l
|
476
|
+
# endif
|
401
477
|
.localentry ffi_go_closure_linux64, . - ffi_go_closure_linux64
|
402
478
|
# else
|
403
479
|
.section ".opd","aw"
|
@@ -104,17 +104,16 @@ ENTRY(ffi_call_SYSV)
|
|
104
104
|
bctrl
|
105
105
|
|
106
106
|
/* Now, deal with the return value. */
|
107
|
-
mtcrf
|
107
|
+
mtcrf 0x03,%r31 /* cr6-cr7 */
|
108
108
|
bt- 31,L(small_struct_return_value)
|
109
109
|
bt- 30,L(done_return_value)
|
110
110
|
#ifndef __NO_FPRS__
|
111
111
|
bt- 29,L(fp_return_value)
|
112
112
|
#endif
|
113
113
|
stw %r3,0(%r30)
|
114
|
-
bf+
|
114
|
+
bf+ 27,L(done_return_value)
|
115
115
|
stw %r4,4(%r30)
|
116
|
-
|
117
|
-
bf 27,L(done_return_value)
|
116
|
+
bf 26,L(done_return_value)
|
118
117
|
stw %r5,8(%r30)
|
119
118
|
stw %r6,12(%r30)
|
120
119
|
/* Fall through... */
|
@@ -145,10 +144,9 @@ L(done_return_value):
|
|
145
144
|
#ifndef __NO_FPRS__
|
146
145
|
L(fp_return_value):
|
147
146
|
.cfi_restore_state
|
148
|
-
bf
|
147
|
+
bf 27,L(float_return_value)
|
149
148
|
stfd %f1,0(%r30)
|
150
|
-
|
151
|
-
bf 27,L(done_return_value)
|
149
|
+
bf 26,L(done_return_value)
|
152
150
|
stfd %f2,8(%r30)
|
153
151
|
b L(done_return_value)
|
154
152
|
L(float_return_value):
|
@@ -129,7 +129,9 @@ ffi_status FFI_HIDDEN ffi_prep_cif_core(ffi_cif *cif, ffi_abi abi,
|
|
129
129
|
cif->rtype = rtype;
|
130
130
|
|
131
131
|
cif->flags = 0;
|
132
|
-
|
132
|
+
#if (defined(_M_ARM64) || defined(__aarch64__)) && defined(_WIN32)
|
133
|
+
cif->is_variadic = isvariadic;
|
134
|
+
#endif
|
133
135
|
#if HAVE_LONG_DOUBLE_VARIANT
|
134
136
|
ffi_prep_types (abi);
|
135
137
|
#endif
|
@@ -199,7 +201,7 @@ ffi_status FFI_HIDDEN ffi_prep_cif_core(ffi_cif *cif, ffi_abi abi,
|
|
199
201
|
bytes = 6*4;
|
200
202
|
#endif
|
201
203
|
|
202
|
-
bytes += STACK_ARG_SIZE((*ptr)->size);
|
204
|
+
bytes += (unsigned int)STACK_ARG_SIZE((*ptr)->size);
|
203
205
|
}
|
204
206
|
#endif
|
205
207
|
}
|
@@ -29,7 +29,7 @@
|
|
29
29
|
DEALINGS IN THE SOFTWARE.
|
30
30
|
----------------------------------------------------------------------- */
|
31
31
|
|
32
|
-
#
|
32
|
+
#if defined(__i386__) || defined(_M_IX86)
|
33
33
|
#include <ffi.h>
|
34
34
|
#include <ffi_common.h>
|
35
35
|
#include <stdint.h>
|
@@ -51,6 +51,13 @@
|
|
51
51
|
# define __declspec(x) __attribute__((x))
|
52
52
|
#endif
|
53
53
|
|
54
|
+
#if defined(_MSC_VER) && defined(_M_IX86)
|
55
|
+
/* Stack is not 16-byte aligned on Windows. */
|
56
|
+
#define STACK_ALIGN(bytes) (bytes)
|
57
|
+
#else
|
58
|
+
#define STACK_ALIGN(bytes) FFI_ALIGN (bytes, 16)
|
59
|
+
#endif
|
60
|
+
|
54
61
|
/* Perform machine dependent cif processing. */
|
55
62
|
ffi_status FFI_HIDDEN
|
56
63
|
ffi_prep_cif_machdep(ffi_cif *cif)
|
@@ -177,7 +184,7 @@ ffi_prep_cif_machdep(ffi_cif *cif)
|
|
177
184
|
bytes = FFI_ALIGN (bytes, t->alignment);
|
178
185
|
bytes += FFI_ALIGN (t->size, FFI_SIZEOF_ARG);
|
179
186
|
}
|
180
|
-
cif->bytes =
|
187
|
+
cif->bytes = bytes;
|
181
188
|
|
182
189
|
return FFI_OK;
|
183
190
|
}
|
@@ -285,7 +292,7 @@ ffi_call_int (ffi_cif *cif, void (*fn)(void), void *rvalue,
|
|
285
292
|
}
|
286
293
|
}
|
287
294
|
|
288
|
-
bytes = cif->bytes;
|
295
|
+
bytes = STACK_ALIGN (cif->bytes);
|
289
296
|
stack = alloca(bytes + sizeof(*frame) + rsize);
|
290
297
|
argp = (dir < 0 ? stack + bytes : stack);
|
291
298
|
frame = (struct call_frame *)(stack + bytes);
|
@@ -346,7 +353,7 @@ ffi_call_int (ffi_cif *cif, void (*fn)(void), void *rvalue,
|
|
346
353
|
size_t align = FFI_SIZEOF_ARG;
|
347
354
|
|
348
355
|
/* Issue 434: For thiscall and fastcall, if the paramter passed
|
349
|
-
as 64-bit integer or struct, all following integer
|
356
|
+
as 64-bit integer or struct, all following integer parameters
|
350
357
|
will be passed on stack. */
|
351
358
|
if ((cabi == FFI_THISCALL || cabi == FFI_FASTCALL)
|
352
359
|
&& (t == FFI_TYPE_SINT64
|
@@ -390,12 +397,14 @@ ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
|
|
390
397
|
ffi_call_int (cif, fn, rvalue, avalue, NULL);
|
391
398
|
}
|
392
399
|
|
400
|
+
#ifdef FFI_GO_CLOSURES
|
393
401
|
void
|
394
402
|
ffi_call_go (ffi_cif *cif, void (*fn)(void), void *rvalue,
|
395
403
|
void **avalue, void *closure)
|
396
404
|
{
|
397
405
|
ffi_call_int (cif, fn, rvalue, avalue, closure);
|
398
406
|
}
|
407
|
+
#endif
|
399
408
|
|
400
409
|
/** private members **/
|
401
410
|
|
@@ -429,7 +438,7 @@ ffi_closure_inner (struct closure_frame *frame, char *stack)
|
|
429
438
|
rvalue = frame->rettemp;
|
430
439
|
pabi = &abi_params[cabi];
|
431
440
|
dir = pabi->dir;
|
432
|
-
argp = (dir < 0 ? stack + cif->bytes : stack);
|
441
|
+
argp = (dir < 0 ? stack + STACK_ALIGN (cif->bytes) : stack);
|
433
442
|
|
434
443
|
switch (flags)
|
435
444
|
{
|
@@ -485,7 +494,7 @@ ffi_closure_inner (struct closure_frame *frame, char *stack)
|
|
485
494
|
align = 16;
|
486
495
|
|
487
496
|
/* Issue 434: For thiscall and fastcall, if the paramter passed
|
488
|
-
as 64-bit integer or struct, all following integer
|
497
|
+
as 64-bit integer or struct, all following integer parameters
|
489
498
|
will be passed on stack. */
|
490
499
|
if ((cabi == FFI_THISCALL || cabi == FFI_FASTCALL)
|
491
500
|
&& (t == FFI_TYPE_SINT64
|
@@ -550,13 +559,16 @@ ffi_prep_closure_loc (ffi_closure* closure,
|
|
550
559
|
return FFI_BAD_ABI;
|
551
560
|
}
|
552
561
|
|
562
|
+
/* endbr32. */
|
563
|
+
*(UINT32 *) tramp = 0xfb1e0ff3;
|
564
|
+
|
553
565
|
/* movl or pushl immediate. */
|
554
|
-
tramp[
|
555
|
-
*(void **)(tramp +
|
566
|
+
tramp[4] = op;
|
567
|
+
*(void **)(tramp + 5) = codeloc;
|
556
568
|
|
557
569
|
/* jmp dest */
|
558
|
-
tramp[
|
559
|
-
*(unsigned *)(tramp +
|
570
|
+
tramp[9] = 0xe9;
|
571
|
+
*(unsigned *)(tramp + 10) = (unsigned)dest - ((unsigned)codeloc + 14);
|
560
572
|
|
561
573
|
closure->cif = cif;
|
562
574
|
closure->fun = fun;
|
@@ -565,6 +577,8 @@ ffi_prep_closure_loc (ffi_closure* closure,
|
|
565
577
|
return FFI_OK;
|
566
578
|
}
|
567
579
|
|
580
|
+
#ifdef FFI_GO_CLOSURES
|
581
|
+
|
568
582
|
void FFI_HIDDEN ffi_go_closure_EAX(void);
|
569
583
|
void FFI_HIDDEN ffi_go_closure_ECX(void);
|
570
584
|
void FFI_HIDDEN ffi_go_closure_STDCALL(void);
|
@@ -601,6 +615,8 @@ ffi_prep_go_closure (ffi_go_closure* closure, ffi_cif* cif,
|
|
601
615
|
return FFI_OK;
|
602
616
|
}
|
603
617
|
|
618
|
+
#endif /* FFI_GO_CLOSURES */
|
619
|
+
|
604
620
|
/* ------- Native raw API support -------------------------------- */
|
605
621
|
|
606
622
|
#if !FFI_NO_RAW_API
|
@@ -693,7 +709,7 @@ ffi_raw_call(ffi_cif *cif, void (*fn)(void), void *rvalue, ffi_raw *avalue)
|
|
693
709
|
}
|
694
710
|
}
|
695
711
|
|
696
|
-
bytes = cif->bytes;
|
712
|
+
bytes = STACK_ALIGN (cif->bytes);
|
697
713
|
argp = stack =
|
698
714
|
(void *)((uintptr_t)alloca(bytes + sizeof(*frame) + rsize + 15) & ~16);
|
699
715
|
frame = (struct call_frame *)(stack + bytes);
|
@@ -751,4 +767,4 @@ ffi_raw_call(ffi_cif *cif, void (*fn)(void), void *rvalue, ffi_raw *avalue)
|
|
751
767
|
ffi_call_i386 (frame, stack);
|
752
768
|
}
|
753
769
|
#endif /* !FFI_NO_RAW_API */
|
754
|
-
#endif /*
|
770
|
+
#endif /* __i386__ */
|
@@ -282,7 +282,7 @@ classify_argument (ffi_type *type, enum x86_64_reg_class classes[],
|
|
282
282
|
|
283
283
|
/* The X86_64_SSEUP_CLASS should be always preceded by
|
284
284
|
X86_64_SSE_CLASS or X86_64_SSEUP_CLASS. */
|
285
|
-
if (classes[i] == X86_64_SSEUP_CLASS
|
285
|
+
if (i > 1 && classes[i] == X86_64_SSEUP_CLASS
|
286
286
|
&& classes[i - 1] != X86_64_SSE_CLASS
|
287
287
|
&& classes[i - 1] != X86_64_SSEUP_CLASS)
|
288
288
|
{
|
@@ -293,7 +293,7 @@ classify_argument (ffi_type *type, enum x86_64_reg_class classes[],
|
|
293
293
|
|
294
294
|
/* If X86_64_X87UP_CLASS isn't preceded by X86_64_X87_CLASS,
|
295
295
|
everything should be passed in memory. */
|
296
|
-
if (classes[i] == X86_64_X87UP_CLASS
|
296
|
+
if (i > 1 && classes[i] == X86_64_X87UP_CLASS
|
297
297
|
&& (classes[i - 1] != X86_64_X87_CLASS))
|
298
298
|
{
|
299
299
|
/* The first one should never be X86_64_X87UP_CLASS. */
|
@@ -394,7 +394,7 @@ extern ffi_status
|
|
394
394
|
ffi_prep_cif_machdep_efi64(ffi_cif *cif);
|
395
395
|
#endif
|
396
396
|
|
397
|
-
ffi_status
|
397
|
+
ffi_status FFI_HIDDEN
|
398
398
|
ffi_prep_cif_machdep (ffi_cif *cif)
|
399
399
|
{
|
400
400
|
int gprcount, ssecount, i, avn, ngpr, nsse;
|
@@ -451,9 +451,11 @@ ffi_prep_cif_machdep (ffi_cif *cif)
|
|
451
451
|
case FFI_TYPE_DOUBLE:
|
452
452
|
flags = UNIX64_RET_XMM64;
|
453
453
|
break;
|
454
|
+
#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
|
454
455
|
case FFI_TYPE_LONGDOUBLE:
|
455
456
|
flags = UNIX64_RET_X87;
|
456
457
|
break;
|
458
|
+
#endif
|
457
459
|
case FFI_TYPE_STRUCT:
|
458
460
|
n = examine_argument (cif->rtype, classes, 1, &ngpr, &nsse);
|
459
461
|
if (n == 0)
|
@@ -686,6 +688,8 @@ ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
|
|
686
688
|
ffi_call_int (cif, fn, rvalue, avalue, NULL);
|
687
689
|
}
|
688
690
|
|
691
|
+
#ifdef FFI_GO_CLOSURES
|
692
|
+
|
689
693
|
#ifndef __ILP32__
|
690
694
|
extern void
|
691
695
|
ffi_call_go_efi64(ffi_cif *cif, void (*fn)(void), void *rvalue,
|
@@ -706,6 +710,7 @@ ffi_call_go (ffi_cif *cif, void (*fn)(void), void *rvalue,
|
|
706
710
|
ffi_call_int (cif, fn, rvalue, avalue, closure);
|
707
711
|
}
|
708
712
|
|
713
|
+
#endif /* FFI_GO_CLOSURES */
|
709
714
|
|
710
715
|
extern void ffi_closure_unix64(void) FFI_HIDDEN;
|
711
716
|
extern void ffi_closure_unix64_sse(void) FFI_HIDDEN;
|
@@ -726,13 +731,15 @@ ffi_prep_closure_loc (ffi_closure* closure,
|
|
726
731
|
void *user_data,
|
727
732
|
void *codeloc)
|
728
733
|
{
|
729
|
-
static const unsigned char trampoline[
|
730
|
-
/*
|
731
|
-
|
732
|
-
/*
|
733
|
-
|
734
|
-
/*
|
735
|
-
|
734
|
+
static const unsigned char trampoline[24] = {
|
735
|
+
/* endbr64 */
|
736
|
+
0xf3, 0x0f, 0x1e, 0xfa,
|
737
|
+
/* leaq -0xb(%rip),%r10 # 0x0 */
|
738
|
+
0x4c, 0x8d, 0x15, 0xf5, 0xff, 0xff, 0xff,
|
739
|
+
/* jmpq *0x7(%rip) # 0x18 */
|
740
|
+
0xff, 0x25, 0x07, 0x00, 0x00, 0x00,
|
741
|
+
/* nopl 0(%rax) */
|
742
|
+
0x0f, 0x1f, 0x80, 0x00, 0x00, 0x00, 0x00
|
736
743
|
};
|
737
744
|
void (*dest)(void);
|
738
745
|
char *tramp = closure->tramp;
|
@@ -750,7 +757,7 @@ ffi_prep_closure_loc (ffi_closure* closure,
|
|
750
757
|
dest = ffi_closure_unix64;
|
751
758
|
|
752
759
|
memcpy (tramp, trampoline, sizeof(trampoline));
|
753
|
-
*(UINT64 *)(tramp +
|
760
|
+
*(UINT64 *)(tramp + sizeof (trampoline)) = (uintptr_t)dest;
|
754
761
|
|
755
762
|
closure->cif = cif;
|
756
763
|
closure->fun = fun;
|
@@ -852,6 +859,8 @@ ffi_closure_unix64_inner(ffi_cif *cif,
|
|
852
859
|
return flags;
|
853
860
|
}
|
854
861
|
|
862
|
+
#ifdef FFI_GO_CLOSURES
|
863
|
+
|
855
864
|
extern void ffi_go_closure_unix64(void) FFI_HIDDEN;
|
856
865
|
extern void ffi_go_closure_unix64_sse(void) FFI_HIDDEN;
|
857
866
|
|
@@ -881,4 +890,6 @@ ffi_prep_go_closure (ffi_go_closure* closure, ffi_cif* cif,
|
|
881
890
|
return FFI_OK;
|
882
891
|
}
|
883
892
|
|
893
|
+
#endif /* FFI_GO_CLOSURES */
|
894
|
+
|
884
895
|
#endif /* __x86_64__ */
|
@@ -136,12 +136,25 @@ typedef enum ffi_abi {
|
|
136
136
|
|
137
137
|
#if defined (X86_64) || defined(X86_WIN64) \
|
138
138
|
|| (defined (__x86_64__) && defined (X86_DARWIN))
|
139
|
-
|
139
|
+
/* 4 bytes of ENDBR64 + 7 bytes of LEA + 6 bytes of JMP + 7 bytes of NOP
|
140
|
+
+ 8 bytes of pointer. */
|
141
|
+
# define FFI_TRAMPOLINE_SIZE 32
|
140
142
|
# define FFI_NATIVE_RAW_API 0
|
141
143
|
#else
|
142
|
-
|
144
|
+
/* 4 bytes of ENDBR32 + 5 bytes of MOV + 5 bytes of JMP + 2 unused
|
145
|
+
bytes. */
|
146
|
+
# define FFI_TRAMPOLINE_SIZE 16
|
143
147
|
# define FFI_NATIVE_RAW_API 1 /* x86 has native raw api support */
|
144
148
|
#endif
|
145
149
|
|
150
|
+
#if !defined(GENERATE_LIBFFI_MAP) && defined(__ASSEMBLER__) \
|
151
|
+
&& defined(__CET__)
|
152
|
+
# include <cet.h>
|
153
|
+
# define _CET_NOTRACK notrack
|
154
|
+
#else
|
155
|
+
# define _CET_ENDBR
|
156
|
+
# define _CET_NOTRACK
|
157
|
+
#endif
|
158
|
+
|
146
159
|
#endif
|
147
160
|
|