ffi 1.10.0 → 1.15.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +240 -0
- data/Gemfile +3 -4
- data/README.md +42 -18
- data/Rakefile +68 -145
- data/ext/ffi_c/AbstractMemory.c +29 -34
- data/ext/ffi_c/Buffer.c +4 -9
- data/ext/ffi_c/Call.c +17 -50
- data/ext/ffi_c/Call.h +4 -7
- data/ext/ffi_c/ClosurePool.c +75 -25
- data/ext/ffi_c/ClosurePool.h +3 -1
- data/ext/ffi_c/DynamicLibrary.c +2 -7
- data/ext/ffi_c/Function.c +47 -131
- data/ext/ffi_c/Function.h +0 -4
- data/ext/ffi_c/FunctionInfo.c +3 -8
- data/ext/ffi_c/LastError.c +2 -6
- data/ext/ffi_c/LongDouble.c +12 -10
- data/ext/ffi_c/LongDouble.h +0 -4
- data/ext/ffi_c/MemoryPointer.c +3 -8
- data/ext/ffi_c/MemoryPointer.h +0 -4
- data/ext/ffi_c/MethodHandle.c +21 -31
- data/ext/ffi_c/MethodHandle.h +3 -2
- data/ext/ffi_c/Platform.c +5 -56
- data/ext/ffi_c/Pointer.c +25 -26
- data/ext/ffi_c/Pointer.h +0 -4
- data/ext/ffi_c/Struct.c +49 -56
- data/ext/ffi_c/Struct.h +12 -6
- data/ext/ffi_c/StructByValue.c +2 -7
- data/ext/ffi_c/StructLayout.c +22 -20
- data/ext/ffi_c/Thread.c +4 -228
- data/ext/ffi_c/Thread.h +1 -20
- data/ext/ffi_c/Type.c +1 -19
- data/ext/ffi_c/Type.h +0 -1
- data/ext/ffi_c/Types.c +7 -8
- data/ext/ffi_c/Types.h +3 -4
- data/ext/ffi_c/Variadic.c +23 -24
- data/ext/ffi_c/compat.h +4 -0
- data/ext/ffi_c/extconf.rb +56 -30
- data/ext/ffi_c/ffi.c +3 -8
- data/ext/ffi_c/libffi/.appveyor.yml +29 -13
- data/ext/ffi_c/libffi/.gitattributes +4 -0
- data/ext/ffi_c/libffi/.travis/bfin-sim.exp +58 -0
- data/ext/ffi_c/libffi/.travis/build-cross-in-container.sh +14 -0
- data/ext/ffi_c/libffi/.travis/build-in-container.sh +12 -0
- data/ext/ffi_c/libffi/.travis/build.sh +116 -8
- data/ext/ffi_c/libffi/.travis/install.sh +65 -16
- data/ext/ffi_c/libffi/.travis/m32r-sim.exp +58 -0
- data/ext/ffi_c/libffi/.travis/moxie-sim.exp +1 -1
- data/ext/ffi_c/libffi/.travis/or1k-sim.exp +58 -0
- data/ext/ffi_c/libffi/.travis/powerpc-eabisim.exp +58 -0
- data/ext/ffi_c/libffi/.travis/site.exp +10 -1
- data/ext/ffi_c/libffi/.travis/wine-sim.exp +55 -0
- data/ext/ffi_c/libffi/.travis.yml +51 -2
- data/ext/ffi_c/libffi/{ChangeLog.libffi-3.1 → ChangeLog.old} +1407 -0
- data/ext/ffi_c/libffi/LICENSE +1 -1
- data/ext/ffi_c/libffi/LICENSE-BUILDTOOLS +5 -4
- data/ext/ffi_c/libffi/Makefile.am +56 -72
- data/ext/ffi_c/libffi/Makefile.in +458 -207
- data/ext/ffi_c/libffi/README.md +33 -8
- data/ext/ffi_c/libffi/config.guess +552 -331
- data/ext/ffi_c/libffi/config.sub +1321 -1306
- data/ext/ffi_c/libffi/configure +414 -342
- data/ext/ffi_c/libffi/configure.ac +37 -12
- data/ext/ffi_c/libffi/configure.host +56 -27
- data/ext/ffi_c/libffi/doc/Makefile.in +9 -5
- data/ext/ffi_c/libffi/doc/libffi.texi +26 -14
- data/ext/ffi_c/libffi/doc/version.texi +4 -4
- data/ext/ffi_c/libffi/fficonfig.h.in +13 -0
- data/ext/ffi_c/libffi/generate-darwin-source-and-headers.py +2 -4
- data/ext/ffi_c/libffi/include/Makefile.in +10 -6
- data/ext/ffi_c/libffi/include/ffi.h.in +19 -7
- data/ext/ffi_c/libffi/include/ffi_common.h +5 -1
- data/ext/ffi_c/libffi/install-sh +23 -13
- data/ext/ffi_c/libffi/libffi.map.in +8 -12
- data/ext/ffi_c/libffi/libffi.xcodeproj/project.pbxproj +2 -48
- data/ext/ffi_c/libffi/libtool-version +1 -1
- data/ext/ffi_c/libffi/ltmain.sh +156 -61
- data/ext/ffi_c/libffi/m4/asmcfi.m4 +1 -1
- data/ext/ffi_c/libffi/m4/ax_append_flag.m4 +5 -26
- data/ext/ffi_c/libffi/m4/ax_check_compile_flag.m4 +5 -26
- data/ext/ffi_c/libffi/m4/ax_compiler_vendor.m4 +2 -1
- data/ext/ffi_c/libffi/m4/ax_configure_args.m4 +5 -26
- data/ext/ffi_c/libffi/m4/ax_gcc_archflag.m4 +7 -3
- data/ext/ffi_c/libffi/make_sunver.pl +333 -0
- data/ext/ffi_c/libffi/man/Makefile.in +9 -5
- data/ext/ffi_c/libffi/missing +8 -8
- data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.sln +33 -0
- data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.vcxproj +130 -0
- data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.vcxproj.filters +57 -0
- data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.vcxproj.user +4 -0
- data/ext/ffi_c/libffi/msvc_build/aarch64/aarch64_include/ffi.h +511 -0
- data/ext/ffi_c/libffi/msvc_build/aarch64/aarch64_include/fficonfig.h +219 -0
- data/ext/ffi_c/libffi/msvcc.sh +38 -13
- data/ext/ffi_c/libffi/src/aarch64/ffi.c +153 -69
- data/ext/ffi_c/libffi/src/aarch64/ffitarget.h +19 -3
- data/ext/ffi_c/libffi/src/aarch64/internal.h +1 -0
- data/ext/ffi_c/libffi/src/aarch64/sysv.S +22 -9
- data/ext/ffi_c/libffi/src/aarch64/win64_armasm.S +506 -0
- data/ext/ffi_c/libffi/src/arm/ffi.c +62 -5
- data/ext/ffi_c/libffi/src/arm/ffitarget.h +8 -1
- data/ext/ffi_c/libffi/src/arm/sysv.S +6 -4
- data/ext/ffi_c/libffi/src/arm/sysv_msvc_arm32.S +311 -0
- data/ext/ffi_c/libffi/src/closures.c +69 -14
- data/ext/ffi_c/libffi/src/csky/ffi.c +395 -0
- data/ext/ffi_c/libffi/src/csky/ffitarget.h +63 -0
- data/ext/ffi_c/libffi/src/csky/sysv.S +371 -0
- data/ext/ffi_c/libffi/src/dlmalloc.c +1 -1
- data/ext/ffi_c/libffi/src/frv/ffi.c +1 -1
- data/ext/ffi_c/libffi/src/kvx/asm.h +5 -0
- data/ext/ffi_c/libffi/src/kvx/ffi.c +273 -0
- data/ext/ffi_c/libffi/src/kvx/ffitarget.h +75 -0
- data/ext/ffi_c/libffi/src/kvx/sysv.S +127 -0
- data/ext/ffi_c/libffi/src/metag/ffi.c +1 -1
- data/ext/ffi_c/libffi/src/mips/ffi.c +5 -1
- data/ext/ffi_c/libffi/src/mips/ffitarget.h +1 -1
- data/ext/ffi_c/libffi/src/mips/o32.S +2 -0
- data/ext/ffi_c/libffi/src/moxie/ffi.c +1 -1
- data/ext/ffi_c/libffi/src/pa/ffi.c +46 -91
- data/ext/ffi_c/libffi/src/pa/ffitarget.h +1 -6
- data/ext/ffi_c/libffi/src/pa/hpux32.S +4 -2
- data/ext/ffi_c/libffi/src/pa/linux.S +27 -4
- data/ext/ffi_c/libffi/src/powerpc/ffi.c +6 -4
- data/ext/ffi_c/libffi/src/powerpc/ffi_darwin.c +13 -1
- data/ext/ffi_c/libffi/src/powerpc/ffi_linux64.c +211 -32
- data/ext/ffi_c/libffi/src/powerpc/ffi_powerpc.h +18 -7
- data/ext/ffi_c/libffi/src/powerpc/ffitarget.h +10 -4
- data/ext/ffi_c/libffi/src/powerpc/linux64.S +91 -28
- data/ext/ffi_c/libffi/src/powerpc/linux64_closure.S +81 -5
- data/ext/ffi_c/libffi/src/powerpc/sysv.S +5 -7
- data/ext/ffi_c/libffi/src/prep_cif.c +4 -2
- data/ext/ffi_c/libffi/src/riscv/ffi.c +42 -6
- data/ext/ffi_c/libffi/src/riscv/ffitarget.h +1 -0
- data/ext/ffi_c/libffi/src/riscv/sysv.S +86 -7
- data/ext/ffi_c/libffi/src/x86/ffi.c +29 -12
- data/ext/ffi_c/libffi/src/x86/ffi64.c +22 -11
- data/ext/ffi_c/libffi/src/x86/ffitarget.h +15 -2
- data/ext/ffi_c/libffi/src/x86/ffiw64.c +20 -10
- data/ext/ffi_c/libffi/src/x86/sysv.S +105 -10
- data/ext/ffi_c/libffi/src/x86/sysv_intel.S +995 -0
- data/ext/ffi_c/libffi/src/x86/unix64.S +100 -4
- data/ext/ffi_c/libffi/src/x86/win64.S +12 -3
- data/ext/ffi_c/libffi/src/x86/win64_intel.S +3 -2
- data/ext/ffi_c/libffi/testsuite/Makefile.am +114 -109
- data/ext/ffi_c/libffi/testsuite/Makefile.in +124 -84
- data/ext/ffi_c/libffi/testsuite/lib/libffi.exp +32 -8
- data/ext/ffi_c/libffi/testsuite/libffi.bhaible/bhaible.exp +7 -2
- data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-call.c +4 -4
- data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-callback.c +2 -2
- data/ext/ffi_c/libffi/testsuite/libffi.call/call.exp +12 -1
- data/ext/ffi_c/libffi/testsuite/libffi.call/float2.c +9 -8
- data/ext/ffi_c/libffi/testsuite/libffi.call/va_1.c +1 -1
- data/ext/ffi_c/libffi/testsuite/libffi.closures/closure.exp +67 -0
- data/ext/ffi_c/libffi/testsuite/libffi.closures/ffitest.h +138 -0
- data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/huge_struct.c +3 -1
- data/ext/ffi_c/libffi.darwin.mk +1 -1
- data/ext/ffi_c/rbffi.h +0 -2
- data/ffi.gemspec +13 -7
- data/lib/ffi/abstract_memory.rb +44 -0
- data/lib/ffi/autopointer.rb +1 -1
- data/lib/ffi/data_converter.rb +67 -0
- data/lib/ffi/ffi.rb +3 -0
- data/lib/ffi/io.rb +3 -3
- data/lib/ffi/library.rb +13 -9
- data/lib/ffi/managedstruct.rb +2 -2
- data/lib/ffi/platform/aarch64-darwin/types.conf +130 -0
- data/lib/ffi/platform/aarch64-freebsd/types.conf +89 -89
- data/lib/ffi/platform/aarch64-freebsd12/types.conf +162 -109
- data/lib/ffi/platform/aarch64-linux/types.conf +81 -81
- data/lib/ffi/platform/aarch64-openbsd/types.conf +134 -0
- data/lib/ffi/platform/arm-freebsd/types.conf +87 -87
- data/lib/ffi/platform/arm-freebsd12/types.conf +87 -87
- data/lib/ffi/platform/arm-linux/types.conf +110 -82
- data/lib/ffi/platform/i386-cygwin/types.conf +1 -1
- data/lib/ffi/platform/i386-darwin/types.conf +63 -63
- data/lib/ffi/platform/i386-freebsd/types.conf +87 -87
- data/lib/ffi/platform/i386-freebsd12/types.conf +87 -87
- data/lib/ffi/platform/i386-gnu/types.conf +84 -84
- data/lib/ffi/platform/i386-linux/types.conf +77 -77
- data/lib/ffi/platform/i386-netbsd/types.conf +87 -87
- data/lib/ffi/platform/i386-openbsd/types.conf +89 -89
- data/lib/ffi/platform/i386-solaris/types.conf +96 -96
- data/lib/ffi/platform/i386-windows/types.conf +43 -96
- data/lib/ffi/platform/ia64-linux/types.conf +79 -79
- data/lib/ffi/platform/mips-linux/types.conf +79 -79
- data/lib/ffi/platform/mips64-linux/types.conf +81 -81
- data/lib/ffi/platform/mips64el-linux/types.conf +81 -81
- data/lib/ffi/platform/mipsel-linux/types.conf +79 -79
- data/lib/ffi/platform/mipsisa32r6-linux/types.conf +79 -79
- data/lib/ffi/platform/mipsisa32r6el-linux/types.conf +79 -79
- data/lib/ffi/platform/mipsisa64r6-linux/types.conf +81 -81
- data/lib/ffi/platform/mipsisa64r6el-linux/types.conf +81 -81
- data/lib/ffi/platform/powerpc-aix/types.conf +155 -155
- data/lib/ffi/platform/powerpc-darwin/types.conf +63 -63
- data/lib/ffi/platform/powerpc-linux/types.conf +108 -78
- data/lib/ffi/platform/powerpc-openbsd/types.conf +156 -0
- data/lib/ffi/platform/powerpc64-linux/types.conf +81 -81
- data/lib/ffi/platform/powerpc64le-linux/types.conf +100 -0
- data/lib/ffi/platform/riscv64-linux/types.conf +104 -0
- data/lib/ffi/platform/s390-linux/types.conf +79 -79
- data/lib/ffi/platform/s390x-linux/types.conf +79 -79
- data/lib/ffi/platform/sparc-linux/types.conf +79 -79
- data/lib/ffi/platform/sparc-solaris/types.conf +103 -103
- data/lib/ffi/platform/sparc64-linux/types.conf +79 -79
- data/lib/ffi/platform/sparcv9-openbsd/types.conf +156 -0
- data/lib/ffi/platform/sparcv9-solaris/types.conf +103 -103
- data/lib/ffi/platform/x86_64-cygwin/types.conf +1 -1
- data/lib/ffi/platform/x86_64-darwin/types.conf +88 -84
- data/lib/ffi/platform/x86_64-dragonflybsd/types.conf +130 -0
- data/lib/ffi/platform/x86_64-freebsd/types.conf +89 -89
- data/lib/ffi/platform/x86_64-freebsd12/types.conf +139 -109
- data/lib/ffi/platform/x86_64-haiku/types.conf +117 -0
- data/lib/ffi/platform/x86_64-linux/types.conf +107 -77
- data/lib/ffi/platform/x86_64-msys/types.conf +119 -0
- data/lib/ffi/platform/x86_64-netbsd/types.conf +89 -89
- data/lib/ffi/platform/x86_64-openbsd/types.conf +86 -86
- data/lib/ffi/platform/x86_64-solaris/types.conf +96 -96
- data/lib/ffi/platform/x86_64-windows/types.conf +42 -110
- data/lib/ffi/platform.rb +24 -9
- data/lib/ffi/pointer.rb +22 -15
- data/lib/ffi/struct.rb +13 -68
- data/lib/ffi/struct_by_reference.rb +72 -0
- data/lib/ffi/struct_layout.rb +96 -0
- data/lib/ffi/tools/const_generator.rb +11 -8
- data/lib/ffi/tools/generator.rb +47 -2
- data/lib/ffi/tools/generator_task.rb +13 -17
- data/lib/ffi/tools/struct_generator.rb +6 -5
- data/lib/ffi/tools/types_generator.rb +7 -4
- data/lib/ffi/types.rb +1 -1
- data/lib/ffi/variadic.rb +1 -10
- data/lib/ffi/version.rb +1 -1
- data/lib/ffi.rb +10 -3
- data/rakelib/ffi_gem_helper.rb +65 -0
- data/samples/getlogin.rb +1 -1
- data/samples/getpid.rb +1 -1
- data/samples/gettimeofday.rb +8 -8
- data/samples/hello.rb +2 -1
- data/samples/inotify.rb +1 -1
- data/samples/pty.rb +1 -2
- data/samples/qsort.rb +0 -1
- metadata +157 -139
- data/.gitignore +0 -22
- data/.gitmodules +0 -3
- data/.travis.yml +0 -43
- data/.yardopts +0 -5
- data/appveyor.yml +0 -22
- data/ext/ffi_c/DataConverter.c +0 -91
- data/ext/ffi_c/StructByReference.c +0 -190
- data/ext/ffi_c/StructByReference.h +0 -50
- data/ext/ffi_c/libffi/ChangeLog.libffi +0 -584
- data/ext/ffi_c/libffi/ChangeLog.libgcj +0 -40
- data/ext/ffi_c/libffi/ChangeLog.v1 +0 -764
- data/ext/ffi_c/win32/stdbool.h +0 -8
- data/ext/ffi_c/win32/stdint.h +0 -201
- data/samples/sample_helper.rb +0 -6
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn0.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn1.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn2.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn3.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn4.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn5.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn6.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_loc_fn0.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_simple.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_12byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_16byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_18byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_19byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_1_1byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_20byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_20byte1.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_24byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_2byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3_1byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3byte1.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3byte2.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3float.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_4_1byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_4byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_5_1_byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_5byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_64byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_6_1_byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_6byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_7_1_byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_7byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_8byte.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_9byte1.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_9byte2.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_double.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_float.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_longdouble.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_longdouble_split.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_longdouble_split2.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_pointer.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint16.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint32.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint64.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint16.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint32.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint64.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_dbls_struct.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_double.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_double_va.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_float.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_longdouble.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_longdouble_va.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_many_mixed_args.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_many_mixed_float_double.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_schar.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_sshort.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_sshortchar.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_uchar.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_ushort.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_ushortchar.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_pointer.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_pointer_stack.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_schar.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_sint.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_sshort.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_struct_va1.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uchar.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uchar_va.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uint.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uint_va.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ulong_va.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ulonglong.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ushort.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ushort_va.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/err_bad_abi.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct1.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct10.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct11.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct2.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct3.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct4.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct5.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct6.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct7.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct8.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct9.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/problem1.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_large.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_large2.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_medium.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_medium2.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/testclosure.c +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/unwindtest.cc +0 -0
- /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/unwindtest_ffi_call.cc +0 -0
@@ -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
|
@@ -545,17 +554,21 @@ ffi_prep_closure_loc (ffi_closure* closure,
|
|
545
554
|
case FFI_REGISTER:
|
546
555
|
dest = ffi_closure_REGISTER;
|
547
556
|
op = 0x68; /* pushl imm */
|
557
|
+
break;
|
548
558
|
default:
|
549
559
|
return FFI_BAD_ABI;
|
550
560
|
}
|
551
561
|
|
562
|
+
/* endbr32. */
|
563
|
+
*(UINT32 *) tramp = 0xfb1e0ff3;
|
564
|
+
|
552
565
|
/* movl or pushl immediate. */
|
553
|
-
tramp[
|
554
|
-
*(void **)(tramp +
|
566
|
+
tramp[4] = op;
|
567
|
+
*(void **)(tramp + 5) = codeloc;
|
555
568
|
|
556
569
|
/* jmp dest */
|
557
|
-
tramp[
|
558
|
-
*(unsigned *)(tramp +
|
570
|
+
tramp[9] = 0xe9;
|
571
|
+
*(unsigned *)(tramp + 10) = (unsigned)dest - ((unsigned)codeloc + 14);
|
559
572
|
|
560
573
|
closure->cif = cif;
|
561
574
|
closure->fun = fun;
|
@@ -564,6 +577,8 @@ ffi_prep_closure_loc (ffi_closure* closure,
|
|
564
577
|
return FFI_OK;
|
565
578
|
}
|
566
579
|
|
580
|
+
#ifdef FFI_GO_CLOSURES
|
581
|
+
|
567
582
|
void FFI_HIDDEN ffi_go_closure_EAX(void);
|
568
583
|
void FFI_HIDDEN ffi_go_closure_ECX(void);
|
569
584
|
void FFI_HIDDEN ffi_go_closure_STDCALL(void);
|
@@ -600,6 +615,8 @@ ffi_prep_go_closure (ffi_go_closure* closure, ffi_cif* cif,
|
|
600
615
|
return FFI_OK;
|
601
616
|
}
|
602
617
|
|
618
|
+
#endif /* FFI_GO_CLOSURES */
|
619
|
+
|
603
620
|
/* ------- Native raw API support -------------------------------- */
|
604
621
|
|
605
622
|
#if !FFI_NO_RAW_API
|
@@ -692,7 +709,7 @@ ffi_raw_call(ffi_cif *cif, void (*fn)(void), void *rvalue, ffi_raw *avalue)
|
|
692
709
|
}
|
693
710
|
}
|
694
711
|
|
695
|
-
bytes = cif->bytes;
|
712
|
+
bytes = STACK_ALIGN (cif->bytes);
|
696
713
|
argp = stack =
|
697
714
|
(void *)((uintptr_t)alloca(bytes + sizeof(*frame) + rsize + 15) & ~16);
|
698
715
|
frame = (struct call_frame *)(stack + bytes);
|
@@ -750,4 +767,4 @@ ffi_raw_call(ffi_cif *cif, void (*fn)(void), void *rvalue, ffi_raw *avalue)
|
|
750
767
|
ffi_call_i386 (frame, stack);
|
751
768
|
}
|
752
769
|
#endif /* !FFI_NO_RAW_API */
|
753
|
-
#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
|
|
@@ -25,6 +25,7 @@
|
|
25
25
|
DEALINGS IN THE SOFTWARE.
|
26
26
|
----------------------------------------------------------------------- */
|
27
27
|
|
28
|
+
#if defined(__x86_64__) || defined(_M_AMD64)
|
28
29
|
#include <ffi.h>
|
29
30
|
#include <ffi_common.h>
|
30
31
|
#include <stdlib.h>
|
@@ -33,7 +34,7 @@
|
|
33
34
|
#ifdef X86_WIN64
|
34
35
|
#define EFI64(name) name
|
35
36
|
#else
|
36
|
-
#define EFI64(name) name##_efi64
|
37
|
+
#define EFI64(name) FFI_HIDDEN name##_efi64
|
37
38
|
#endif
|
38
39
|
|
39
40
|
struct win64_call_frame
|
@@ -48,7 +49,7 @@ struct win64_call_frame
|
|
48
49
|
extern void ffi_call_win64 (void *stack, struct win64_call_frame *,
|
49
50
|
void *closure) FFI_HIDDEN;
|
50
51
|
|
51
|
-
ffi_status
|
52
|
+
ffi_status FFI_HIDDEN
|
52
53
|
EFI64(ffi_prep_cif_machdep)(ffi_cif *cif)
|
53
54
|
{
|
54
55
|
int flags, n;
|
@@ -186,7 +187,10 @@ EFI64(ffi_call_go)(ffi_cif *cif, void (*fn)(void), void *rvalue,
|
|
186
187
|
|
187
188
|
|
188
189
|
extern void ffi_closure_win64(void) FFI_HIDDEN;
|
190
|
+
|
191
|
+
#ifdef FFI_GO_CLOSURES
|
189
192
|
extern void ffi_go_closure_win64(void) FFI_HIDDEN;
|
193
|
+
#endif
|
190
194
|
|
191
195
|
ffi_status
|
192
196
|
EFI64(ffi_prep_closure_loc)(ffi_closure* closure,
|
@@ -195,13 +199,15 @@ EFI64(ffi_prep_closure_loc)(ffi_closure* closure,
|
|
195
199
|
void *user_data,
|
196
200
|
void *codeloc)
|
197
201
|
{
|
198
|
-
static const unsigned char trampoline[
|
199
|
-
/*
|
200
|
-
|
201
|
-
/*
|
202
|
-
|
203
|
-
/*
|
204
|
-
|
202
|
+
static const unsigned char trampoline[FFI_TRAMPOLINE_SIZE - 8] = {
|
203
|
+
/* endbr64 */
|
204
|
+
0xf3, 0x0f, 0x1e, 0xfa,
|
205
|
+
/* leaq -0xb(%rip),%r10 # 0x0 */
|
206
|
+
0x4c, 0x8d, 0x15, 0xf5, 0xff, 0xff, 0xff,
|
207
|
+
/* jmpq *0x7(%rip) # 0x18 */
|
208
|
+
0xff, 0x25, 0x07, 0x00, 0x00, 0x00,
|
209
|
+
/* nopl 0(%rax) */
|
210
|
+
0x0f, 0x1f, 0x80, 0x00, 0x00, 0x00, 0x00
|
205
211
|
};
|
206
212
|
char *tramp = closure->tramp;
|
207
213
|
|
@@ -215,7 +221,7 @@ EFI64(ffi_prep_closure_loc)(ffi_closure* closure,
|
|
215
221
|
}
|
216
222
|
|
217
223
|
memcpy (tramp, trampoline, sizeof(trampoline));
|
218
|
-
*(UINT64 *)(tramp +
|
224
|
+
*(UINT64 *)(tramp + sizeof (trampoline)) = (uintptr_t)ffi_closure_win64;
|
219
225
|
|
220
226
|
closure->cif = cif;
|
221
227
|
closure->fun = fun;
|
@@ -224,6 +230,7 @@ EFI64(ffi_prep_closure_loc)(ffi_closure* closure,
|
|
224
230
|
return FFI_OK;
|
225
231
|
}
|
226
232
|
|
233
|
+
#ifdef FFI_GO_CLOSURES
|
227
234
|
ffi_status
|
228
235
|
EFI64(ffi_prep_go_closure)(ffi_go_closure* closure, ffi_cif* cif,
|
229
236
|
void (*fun)(ffi_cif*, void*, void**, void*))
|
@@ -243,6 +250,7 @@ EFI64(ffi_prep_go_closure)(ffi_go_closure* closure, ffi_cif* cif,
|
|
243
250
|
|
244
251
|
return FFI_OK;
|
245
252
|
}
|
253
|
+
#endif
|
246
254
|
|
247
255
|
struct win64_closure_frame
|
248
256
|
{
|
@@ -306,3 +314,5 @@ ffi_closure_win64_inner(ffi_cif *cif,
|
|
306
314
|
fun (cif, rvalue, avalue, user_data);
|
307
315
|
return flags;
|
308
316
|
}
|
317
|
+
|
318
|
+
#endif /* __x86_64__ */
|
@@ -26,7 +26,7 @@
|
|
26
26
|
DEALINGS IN THE SOFTWARE.
|
27
27
|
----------------------------------------------------------------------- */
|
28
28
|
|
29
|
-
#
|
29
|
+
#ifdef __i386__
|
30
30
|
#ifndef _MSC_VER
|
31
31
|
|
32
32
|
#define LIBFFI_ASM
|
@@ -56,8 +56,8 @@
|
|
56
56
|
|
57
57
|
/* Handle win32 fastcall name mangling. */
|
58
58
|
#ifdef X86_WIN32
|
59
|
-
# define ffi_call_i386 @ffi_call_i386@8
|
60
|
-
# define ffi_closure_inner @ffi_closure_inner@8
|
59
|
+
# define ffi_call_i386 "@ffi_call_i386@8"
|
60
|
+
# define ffi_closure_inner "@ffi_closure_inner@8"
|
61
61
|
#else
|
62
62
|
# define ffi_call_i386 C(ffi_call_i386)
|
63
63
|
# define ffi_closure_inner C(ffi_closure_inner)
|
@@ -92,6 +92,7 @@
|
|
92
92
|
ffi_call_i386:
|
93
93
|
L(UW0):
|
94
94
|
# cfi_startproc
|
95
|
+
_CET_ENDBR
|
95
96
|
#if !HAVE_FASTCALL
|
96
97
|
movl 4(%esp), %ecx
|
97
98
|
movl 8(%esp), %edx
|
@@ -133,7 +134,7 @@ L(pc1):
|
|
133
134
|
leal L(store_table)(,%ecx, 8), %ebx
|
134
135
|
#endif
|
135
136
|
movl 16(%ebp), %ecx /* load result address */
|
136
|
-
jmp
|
137
|
+
_CET_NOTRACK jmp *%ebx
|
137
138
|
|
138
139
|
.balign 8
|
139
140
|
L(store_table):
|
@@ -256,7 +257,7 @@ ENDF(ffi_call_i386)
|
|
256
257
|
andl $X86_RET_TYPE_MASK, %eax; \
|
257
258
|
leal L(C1(load_table,N))(, %eax, 8), %edx; \
|
258
259
|
movl closure_CF(%esp), %eax; /* optimiztic load */ \
|
259
|
-
jmp
|
260
|
+
_CET_NOTRACK jmp *%edx
|
260
261
|
|
261
262
|
#ifdef __PIC__
|
262
263
|
# if defined X86_DARWIN || defined HAVE_HIDDEN_VISIBILITY_ATTRIBUTE
|
@@ -267,7 +268,7 @@ ENDF(ffi_call_i386)
|
|
267
268
|
L(C1(pc,N)): \
|
268
269
|
leal L(C1(load_table,N))-L(C1(pc,N))(%edx, %eax, 8), %edx; \
|
269
270
|
movl closure_CF(%esp), %eax; /* optimiztic load */ \
|
270
|
-
jmp
|
271
|
+
_CET_NOTRACK jmp *%edx
|
271
272
|
# else
|
272
273
|
# define FFI_CLOSURE_CALL_INNER_SAVE_EBX
|
273
274
|
# undef FFI_CLOSURE_CALL_INNER
|
@@ -286,7 +287,7 @@ L(C1(UW,UWN)): \
|
|
286
287
|
L(C1(UW,UWN)): \
|
287
288
|
/* cfi_restore(%ebx); */ \
|
288
289
|
movl closure_CF(%esp), %eax; /* optimiztic load */ \
|
289
|
-
jmp
|
290
|
+
_CET_NOTRACK jmp *%edx
|
290
291
|
# endif /* DARWIN || HIDDEN */
|
291
292
|
#endif /* __PIC__ */
|
292
293
|
|
@@ -296,6 +297,7 @@ L(C1(UW,UWN)): \
|
|
296
297
|
C(ffi_go_closure_EAX):
|
297
298
|
L(UW6):
|
298
299
|
# cfi_startproc
|
300
|
+
_CET_ENDBR
|
299
301
|
subl $closure_FS, %esp
|
300
302
|
L(UW7):
|
301
303
|
# cfi_def_cfa_offset(closure_FS + 4)
|
@@ -316,6 +318,7 @@ ENDF(C(ffi_go_closure_EAX))
|
|
316
318
|
C(ffi_go_closure_ECX):
|
317
319
|
L(UW9):
|
318
320
|
# cfi_startproc
|
321
|
+
_CET_ENDBR
|
319
322
|
subl $closure_FS, %esp
|
320
323
|
L(UW10):
|
321
324
|
# cfi_def_cfa_offset(closure_FS + 4)
|
@@ -340,6 +343,7 @@ ENDF(C(ffi_go_closure_ECX))
|
|
340
343
|
C(ffi_closure_i386):
|
341
344
|
L(UW12):
|
342
345
|
# cfi_startproc
|
346
|
+
_CET_ENDBR
|
343
347
|
subl $closure_FS, %esp
|
344
348
|
L(UW13):
|
345
349
|
# cfi_def_cfa_offset(closure_FS + 4)
|
@@ -423,6 +427,7 @@ ENDF(C(ffi_closure_i386))
|
|
423
427
|
C(ffi_go_closure_STDCALL):
|
424
428
|
L(UW21):
|
425
429
|
# cfi_startproc
|
430
|
+
_CET_ENDBR
|
426
431
|
subl $closure_FS, %esp
|
427
432
|
L(UW22):
|
428
433
|
# cfi_def_cfa_offset(closure_FS + 4)
|
@@ -448,6 +453,7 @@ L(UW24):
|
|
448
453
|
# cfi_startproc
|
449
454
|
# cfi_def_cfa(%esp, 8)
|
450
455
|
# cfi_offset(%eip, -8)
|
456
|
+
_CET_ENDBR
|
451
457
|
subl $closure_FS-4, %esp
|
452
458
|
L(UW25):
|
453
459
|
# cfi_def_cfa_offset(closure_FS + 4)
|
@@ -470,6 +476,7 @@ ENDF(C(ffi_closure_REGISTER))
|
|
470
476
|
C(ffi_closure_STDCALL):
|
471
477
|
L(UW27):
|
472
478
|
# cfi_startproc
|
479
|
+
_CET_ENDBR
|
473
480
|
subl $closure_FS, %esp
|
474
481
|
L(UW28):
|
475
482
|
# cfi_def_cfa_offset(closure_FS + 4)
|
@@ -576,6 +583,7 @@ ENDF(C(ffi_closure_STDCALL))
|
|
576
583
|
C(ffi_closure_raw_SYSV):
|
577
584
|
L(UW32):
|
578
585
|
# cfi_startproc
|
586
|
+
_CET_ENDBR
|
579
587
|
subl $raw_closure_S_FS, %esp
|
580
588
|
L(UW33):
|
581
589
|
# cfi_def_cfa_offset(raw_closure_S_FS + 4)
|
@@ -679,6 +687,7 @@ ENDF(C(ffi_closure_raw_SYSV))
|
|
679
687
|
C(ffi_closure_raw_THISCALL):
|
680
688
|
L(UW41):
|
681
689
|
# cfi_startproc
|
690
|
+
_CET_ENDBR
|
682
691
|
/* Rearrange the stack such that %ecx is the first argument.
|
683
692
|
This means moving the return address. */
|
684
693
|
popl %edx
|
@@ -792,9 +801,9 @@ ENDF(C(ffi_closure_raw_THISCALL))
|
|
792
801
|
|
793
802
|
#ifdef X86_DARWIN
|
794
803
|
# define COMDAT(X) \
|
795
|
-
.section __TEXT,
|
804
|
+
.section __TEXT,__text,coalesced,pure_instructions; \
|
796
805
|
.weak_definition X; \
|
797
|
-
|
806
|
+
FFI_HIDDEN(X)
|
798
807
|
#elif defined __ELF__ && !(defined(__sun__) && defined(__svr4__))
|
799
808
|
# define COMDAT(X) \
|
800
809
|
.section .text.X,"axG",@progbits,X,comdat; \
|
@@ -1035,8 +1044,94 @@ L(SFDE9):
|
|
1035
1044
|
L(EFDE9):
|
1036
1045
|
#endif /* !FFI_NO_RAW_API */
|
1037
1046
|
|
1047
|
+
#ifdef _WIN32
|
1048
|
+
.def @feat.00;
|
1049
|
+
.scl 3;
|
1050
|
+
.type 0;
|
1051
|
+
.endef
|
1052
|
+
.globl @feat.00
|
1053
|
+
@feat.00 = 1
|
1054
|
+
#endif
|
1055
|
+
|
1056
|
+
#ifdef __APPLE__
|
1057
|
+
.subsections_via_symbols
|
1058
|
+
.section __LD,__compact_unwind,regular,debug
|
1059
|
+
|
1060
|
+
/* compact unwind for ffi_call_i386 */
|
1061
|
+
.long C(ffi_call_i386)
|
1062
|
+
.set L1,L(UW5)-L(UW0)
|
1063
|
+
.long L1
|
1064
|
+
.long 0x04000000 /* use dwarf unwind info */
|
1065
|
+
.long 0
|
1066
|
+
.long 0
|
1067
|
+
|
1068
|
+
/* compact unwind for ffi_go_closure_EAX */
|
1069
|
+
.long C(ffi_go_closure_EAX)
|
1070
|
+
.set L2,L(UW8)-L(UW6)
|
1071
|
+
.long L2
|
1072
|
+
.long 0x04000000 /* use dwarf unwind info */
|
1073
|
+
.long 0
|
1074
|
+
.long 0
|
1075
|
+
|
1076
|
+
/* compact unwind for ffi_go_closure_ECX */
|
1077
|
+
.long C(ffi_go_closure_ECX)
|
1078
|
+
.set L3,L(UW11)-L(UW9)
|
1079
|
+
.long L3
|
1080
|
+
.long 0x04000000 /* use dwarf unwind info */
|
1081
|
+
.long 0
|
1082
|
+
.long 0
|
1083
|
+
|
1084
|
+
/* compact unwind for ffi_closure_i386 */
|
1085
|
+
.long C(ffi_closure_i386)
|
1086
|
+
.set L4,L(UW20)-L(UW12)
|
1087
|
+
.long L4
|
1088
|
+
.long 0x04000000 /* use dwarf unwind info */
|
1089
|
+
.long 0
|
1090
|
+
.long 0
|
1091
|
+
|
1092
|
+
/* compact unwind for ffi_go_closure_STDCALL */
|
1093
|
+
.long C(ffi_go_closure_STDCALL)
|
1094
|
+
.set L5,L(UW23)-L(UW21)
|
1095
|
+
.long L5
|
1096
|
+
.long 0x04000000 /* use dwarf unwind info */
|
1097
|
+
.long 0
|
1098
|
+
.long 0
|
1099
|
+
|
1100
|
+
/* compact unwind for ffi_closure_REGISTER */
|
1101
|
+
.long C(ffi_closure_REGISTER)
|
1102
|
+
.set L6,L(UW26)-L(UW24)
|
1103
|
+
.long L6
|
1104
|
+
.long 0x04000000 /* use dwarf unwind info */
|
1105
|
+
.long 0
|
1106
|
+
.long 0
|
1107
|
+
|
1108
|
+
/* compact unwind for ffi_closure_STDCALL */
|
1109
|
+
.long C(ffi_closure_STDCALL)
|
1110
|
+
.set L7,L(UW31)-L(UW27)
|
1111
|
+
.long L7
|
1112
|
+
.long 0x04000000 /* use dwarf unwind info */
|
1113
|
+
.long 0
|
1114
|
+
.long 0
|
1115
|
+
|
1116
|
+
/* compact unwind for ffi_closure_raw_SYSV */
|
1117
|
+
.long C(ffi_closure_raw_SYSV)
|
1118
|
+
.set L8,L(UW40)-L(UW32)
|
1119
|
+
.long L8
|
1120
|
+
.long 0x04000000 /* use dwarf unwind info */
|
1121
|
+
.long 0
|
1122
|
+
.long 0
|
1123
|
+
|
1124
|
+
/* compact unwind for ffi_closure_raw_THISCALL */
|
1125
|
+
.long C(ffi_closure_raw_THISCALL)
|
1126
|
+
.set L9,L(UW52)-L(UW41)
|
1127
|
+
.long L9
|
1128
|
+
.long 0x04000000 /* use dwarf unwind info */
|
1129
|
+
.long 0
|
1130
|
+
.long 0
|
1131
|
+
#endif /* __APPLE__ */
|
1132
|
+
|
1038
1133
|
#endif /* ifndef _MSC_VER */
|
1039
|
-
#endif /*
|
1134
|
+
#endif /* ifdef __i386__ */
|
1040
1135
|
|
1041
1136
|
#if defined __ELF__ && defined __linux__
|
1042
1137
|
.section .note.GNU-stack,"",@progbits
|