ffi 1.15.5 → 1.16.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (309) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/CHANGELOG.md +61 -0
  4. data/Gemfile +1 -1
  5. data/README.md +3 -2
  6. data/Rakefile +10 -7
  7. data/ext/ffi_c/AbstractMemory.c +56 -34
  8. data/ext/ffi_c/AbstractMemory.h +3 -2
  9. data/ext/ffi_c/ArrayType.c +49 -13
  10. data/ext/ffi_c/ArrayType.h +1 -0
  11. data/ext/ffi_c/Buffer.c +86 -29
  12. data/ext/ffi_c/Call.c +13 -5
  13. data/ext/ffi_c/DynamicLibrary.c +89 -26
  14. data/ext/ffi_c/Function.c +238 -98
  15. data/ext/ffi_c/Function.h +1 -0
  16. data/ext/ffi_c/FunctionInfo.c +78 -24
  17. data/ext/ffi_c/LastError.c +25 -7
  18. data/ext/ffi_c/MappedType.c +66 -23
  19. data/ext/ffi_c/MappedType.h +0 -2
  20. data/ext/ffi_c/MemoryPointer.c +34 -7
  21. data/ext/ffi_c/MethodHandle.c +3 -1
  22. data/ext/ffi_c/Pointer.c +68 -29
  23. data/ext/ffi_c/Pointer.h +1 -0
  24. data/ext/ffi_c/Struct.c +151 -80
  25. data/ext/ffi_c/Struct.h +7 -4
  26. data/ext/ffi_c/StructByValue.c +48 -16
  27. data/ext/ffi_c/StructLayout.c +117 -48
  28. data/ext/ffi_c/Type.c +104 -36
  29. data/ext/ffi_c/Type.h +3 -1
  30. data/ext/ffi_c/Types.c +1 -1
  31. data/ext/ffi_c/Variadic.c +65 -23
  32. data/ext/ffi_c/compat.h +22 -22
  33. data/ext/ffi_c/extconf.rb +19 -2
  34. data/ext/ffi_c/ffi.c +4 -0
  35. data/ext/ffi_c/libffi/.appveyor/site.exp +16 -0
  36. data/ext/ffi_c/libffi/.appveyor/unix-noexec.exp +7 -0
  37. data/ext/ffi_c/libffi/.appveyor.yml +27 -9
  38. data/ext/ffi_c/libffi/.ci/build-cross-in-container.sh +18 -0
  39. data/ext/ffi_c/libffi/{.travis → .ci}/build-in-container.sh +4 -6
  40. data/ext/ffi_c/libffi/.ci/build.sh +124 -0
  41. data/ext/ffi_c/libffi/{.travis → .ci}/install.sh +14 -7
  42. data/ext/ffi_c/libffi/.ci/msvs-detect +1103 -0
  43. data/ext/ffi_c/libffi/{.travis → .ci}/site.exp +5 -3
  44. data/ext/ffi_c/libffi/.circleci/config.yml +156 -0
  45. data/ext/ffi_c/libffi/.github/workflows/build.yml +460 -0
  46. data/ext/ffi_c/libffi/.github/workflows/emscripten.yml +171 -0
  47. data/ext/ffi_c/libffi/.gitignore +10 -2
  48. data/ext/ffi_c/libffi/LICENSE +1 -1
  49. data/ext/ffi_c/libffi/Makefile.am +12 -5
  50. data/ext/ffi_c/libffi/Makefile.in +118 -51
  51. data/ext/ffi_c/libffi/README.md +144 -104
  52. data/ext/ffi_c/libffi/acinclude.m4 +10 -112
  53. data/ext/ffi_c/libffi/compile +347 -0
  54. data/ext/ffi_c/libffi/config.guess +623 -556
  55. data/ext/ffi_c/libffi/config.sub +75 -34
  56. data/ext/ffi_c/libffi/configure +4571 -3830
  57. data/ext/ffi_c/libffi/configure.ac +64 -28
  58. data/ext/ffi_c/libffi/configure.host +25 -6
  59. data/ext/ffi_c/libffi/doc/Makefile.in +9 -6
  60. data/ext/ffi_c/libffi/doc/libffi.texi +82 -33
  61. data/ext/ffi_c/libffi/doc/version.texi +4 -4
  62. data/ext/ffi_c/libffi/fficonfig.h.in +12 -47
  63. data/ext/ffi_c/libffi/generate-darwin-source-and-headers.py +163 -52
  64. data/ext/ffi_c/libffi/include/Makefile.am +1 -1
  65. data/ext/ffi_c/libffi/include/Makefile.in +10 -9
  66. data/ext/ffi_c/libffi/include/ffi.h.in +54 -50
  67. data/ext/ffi_c/libffi/include/ffi_cfi.h +21 -0
  68. data/ext/ffi_c/libffi/include/ffi_common.h +29 -0
  69. data/ext/ffi_c/libffi/include/tramp.h +45 -0
  70. data/ext/ffi_c/libffi/install-sh +92 -69
  71. data/ext/ffi_c/libffi/libtool-version +2 -2
  72. data/ext/ffi_c/libffi/ltmain.sh +512 -315
  73. data/ext/ffi_c/libffi/m4/ax_cc_maxopt.m4 +18 -14
  74. data/ext/ffi_c/libffi/m4/ax_cflags_warn_all.m4 +108 -72
  75. data/ext/ffi_c/libffi/m4/ax_compiler_vendor.m4 +76 -45
  76. data/ext/ffi_c/libffi/m4/ax_prepend_flag.m4 +51 -0
  77. data/ext/ffi_c/libffi/man/Makefile.in +9 -6
  78. data/ext/ffi_c/libffi/missing +1 -1
  79. data/ext/ffi_c/libffi/msvc_build/aarch64/aarch64_include/ffi.h +1 -1
  80. data/ext/ffi_c/libffi/msvcc.sh +1 -1
  81. data/ext/ffi_c/libffi/src/aarch64/ffi.c +146 -42
  82. data/ext/ffi_c/libffi/src/aarch64/internal.h +32 -0
  83. data/ext/ffi_c/libffi/src/aarch64/sysv.S +134 -42
  84. data/ext/ffi_c/libffi/src/arc/arcompact.S +169 -94
  85. data/ext/ffi_c/libffi/src/arc/ffi.c +325 -148
  86. data/ext/ffi_c/libffi/src/arc/ffitarget.h +14 -0
  87. data/ext/ffi_c/libffi/src/arm/ffi.c +62 -17
  88. data/ext/ffi_c/libffi/src/arm/ffitarget.h +3 -3
  89. data/ext/ffi_c/libffi/src/arm/internal.h +10 -0
  90. data/ext/ffi_c/libffi/src/arm/sysv.S +113 -42
  91. data/ext/ffi_c/libffi/src/closures.c +133 -47
  92. data/ext/ffi_c/libffi/src/dlmalloc.c +5 -0
  93. data/ext/ffi_c/libffi/src/ia64/ffi.c +12 -0
  94. data/ext/ffi_c/libffi/src/ia64/unix.S +20 -2
  95. data/ext/ffi_c/libffi/src/loongarch64/ffi.c +621 -0
  96. data/ext/ffi_c/libffi/src/loongarch64/ffitarget.h +82 -0
  97. data/ext/ffi_c/libffi/src/loongarch64/sysv.S +327 -0
  98. data/ext/ffi_c/libffi/src/m32r/ffi.c +31 -14
  99. data/ext/ffi_c/libffi/src/mips/ffi.c +240 -65
  100. data/ext/ffi_c/libffi/src/mips/ffitarget.h +7 -0
  101. data/ext/ffi_c/libffi/src/mips/n32.S +137 -28
  102. data/ext/ffi_c/libffi/src/mips/o32.S +61 -4
  103. data/ext/ffi_c/libffi/src/moxie/ffi.c +47 -22
  104. data/ext/ffi_c/libffi/src/or1k/ffi.c +25 -12
  105. data/ext/ffi_c/libffi/src/pa/ffi.c +32 -33
  106. data/ext/ffi_c/libffi/src/pa/ffi64.c +614 -0
  107. data/ext/ffi_c/libffi/src/pa/ffitarget.h +22 -8
  108. data/ext/ffi_c/libffi/src/pa/hpux32.S +83 -36
  109. data/ext/ffi_c/libffi/src/pa/hpux64.S +681 -0
  110. data/ext/ffi_c/libffi/src/pa/linux.S +82 -35
  111. data/ext/ffi_c/libffi/src/powerpc/ffi_linux64.c +1 -1
  112. data/ext/ffi_c/libffi/src/powerpc/linux64.S +2 -0
  113. data/ext/ffi_c/libffi/src/powerpc/linux64_closure.S +2 -0
  114. data/ext/ffi_c/libffi/src/powerpc/t-aix +5 -0
  115. data/ext/ffi_c/libffi/src/prep_cif.c +22 -2
  116. data/ext/ffi_c/libffi/src/riscv/ffi.c +37 -4
  117. data/ext/ffi_c/libffi/src/sparc/ffi64.c +16 -0
  118. data/ext/ffi_c/libffi/src/tramp.c +716 -0
  119. data/ext/ffi_c/libffi/src/wasm32/ffi.c +934 -0
  120. data/ext/ffi_c/libffi/src/wasm32/ffitarget.h +62 -0
  121. data/ext/ffi_c/libffi/src/x86/ffi.c +99 -37
  122. data/ext/ffi_c/libffi/src/x86/ffi64.c +67 -12
  123. data/ext/ffi_c/libffi/src/x86/ffitarget.h +9 -5
  124. data/ext/ffi_c/libffi/src/x86/ffiw64.c +43 -0
  125. data/ext/ffi_c/libffi/src/x86/internal.h +14 -0
  126. data/ext/ffi_c/libffi/src/x86/internal64.h +14 -0
  127. data/ext/ffi_c/libffi/src/x86/sysv.S +172 -38
  128. data/ext/ffi_c/libffi/src/x86/sysv_intel.S +91 -88
  129. data/ext/ffi_c/libffi/src/x86/unix64.S +96 -6
  130. data/ext/ffi_c/libffi/src/x86/win64.S +20 -7
  131. data/ext/ffi_c/libffi/src/xtensa/ffi.c +16 -8
  132. data/ext/ffi_c/libffi/src/xtensa/ffitarget.h +4 -0
  133. data/ext/ffi_c/libffi/src/xtensa/sysv.S +26 -16
  134. data/ext/ffi_c/libffi/testsuite/Makefile.am +127 -114
  135. data/ext/ffi_c/libffi/testsuite/Makefile.in +137 -121
  136. data/ext/ffi_c/libffi/testsuite/emscripten/build-tests.sh +54 -0
  137. data/ext/ffi_c/libffi/testsuite/emscripten/build.sh +63 -0
  138. data/ext/ffi_c/libffi/testsuite/emscripten/conftest.py +80 -0
  139. data/ext/ffi_c/libffi/testsuite/emscripten/node-tests.sh +48 -0
  140. data/ext/ffi_c/libffi/testsuite/emscripten/test.html +7 -0
  141. data/ext/ffi_c/libffi/testsuite/emscripten/test_libffi.py +51 -0
  142. data/ext/ffi_c/libffi/testsuite/lib/libffi.exp +43 -21
  143. data/ext/ffi_c/libffi/testsuite/lib/target-libpath.exp +2 -2
  144. data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-call.c +1 -0
  145. data/ext/ffi_c/libffi/testsuite/libffi.bhaible/testcases.c +5 -1
  146. data/ext/ffi_c/libffi/testsuite/libffi.call/bpo_38748.c +41 -0
  147. data/ext/ffi_c/libffi/testsuite/libffi.call/ffitest.h +28 -3
  148. data/ext/ffi_c/libffi/testsuite/libffi.call/float_va.c +3 -0
  149. data/ext/ffi_c/libffi/testsuite/libffi.call/return_ll1.c +5 -0
  150. data/ext/ffi_c/libffi/testsuite/libffi.call/return_sl.c +4 -0
  151. data/ext/ffi_c/libffi/testsuite/libffi.call/return_ul.c +4 -0
  152. data/ext/ffi_c/libffi/testsuite/libffi.call/s55.c +60 -0
  153. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen.c +8 -9
  154. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen2.c +2 -2
  155. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen3.c +2 -2
  156. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen4.c +2 -2
  157. data/ext/ffi_c/libffi/testsuite/libffi.call/struct10.c +1 -1
  158. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_2.c +63 -0
  159. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_3.c +65 -0
  160. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_3f.c +65 -0
  161. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_4.c +67 -0
  162. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_4f.c +67 -0
  163. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_big.c +93 -0
  164. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_small.c +61 -0
  165. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_return_2H.c +63 -0
  166. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_return_8H.c +90 -0
  167. data/ext/ffi_c/libffi/testsuite/libffi.call/va_1.c +1 -119
  168. data/ext/ffi_c/libffi/testsuite/libffi.call/va_2.c +220 -0
  169. data/ext/ffi_c/libffi/testsuite/libffi.call/va_3.c +154 -0
  170. data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct1.c +13 -0
  171. data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct2.c +11 -0
  172. data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct3.c +15 -0
  173. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn0.c +3 -2
  174. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn1.c +2 -0
  175. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn2.c +2 -0
  176. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn3.c +21 -1
  177. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn4.c +2 -0
  178. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn5.c +2 -0
  179. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn6.c +2 -0
  180. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_loc_fn0.c +7 -6
  181. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_simple.c +6 -0
  182. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_12byte.c +18 -0
  183. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_16byte.c +22 -0
  184. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_18byte.c +24 -0
  185. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_19byte.c +29 -0
  186. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_1_1byte.c +4 -0
  187. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_20byte.c +19 -1
  188. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_20byte1.c +21 -1
  189. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_24byte.c +35 -3
  190. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_2byte.c +13 -0
  191. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_3_1byte.c +19 -0
  192. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_3byte1.c +13 -0
  193. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_3byte2.c +13 -0
  194. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_3float.c +18 -0
  195. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_4_1byte.c +22 -0
  196. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_4byte.c +13 -0
  197. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_5_1_byte.c +29 -1
  198. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_5byte.c +19 -1
  199. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_64byte.c +24 -0
  200. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_6_1_byte.c +28 -1
  201. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_6byte.c +24 -2
  202. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_7_1_byte.c +39 -1
  203. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_7byte.c +25 -1
  204. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_8byte.c +14 -0
  205. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_9byte1.c +14 -1
  206. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_9byte2.c +14 -2
  207. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_double.c +19 -1
  208. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_float.c +19 -1
  209. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_longdouble.c +20 -1
  210. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_longdouble_split.c +40 -25
  211. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_longdouble_split2.c +40 -3
  212. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_pointer.c +19 -1
  213. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_sint16.c +18 -1
  214. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_sint32.c +18 -3
  215. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_sint64.c +18 -1
  216. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_uint16.c +18 -1
  217. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_uint32.c +19 -1
  218. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_uint64.c +19 -1
  219. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_dbls_struct.c +3 -1
  220. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_double_va.c +9 -1
  221. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_float.c +4 -0
  222. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_longdouble.c +11 -1
  223. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_longdouble_va.c +22 -3
  224. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_multi_schar.c +5 -1
  225. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_multi_sshort.c +6 -1
  226. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_multi_sshortchar.c +9 -1
  227. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_multi_uchar.c +9 -1
  228. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_multi_ushort.c +6 -2
  229. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_multi_ushortchar.c +9 -1
  230. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_pointer.c +5 -0
  231. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_pointer_stack.c +10 -0
  232. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_schar.c +3 -0
  233. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_sint.c +2 -0
  234. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_sshort.c +3 -0
  235. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_struct_va1.c +11 -0
  236. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_uchar.c +3 -0
  237. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_uint.c +4 -0
  238. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_uint_va.c +4 -0
  239. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_ulong_va.c +4 -0
  240. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_ulonglong.c +2 -0
  241. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_ushort.c +3 -0
  242. data/ext/ffi_c/libffi/testsuite/libffi.closures/ffitest.h +1 -138
  243. data/ext/ffi_c/libffi/testsuite/libffi.closures/huge_struct.c +21 -21
  244. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct.c +32 -9
  245. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct1.c +1 -1
  246. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct10.c +12 -0
  247. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct11.c +21 -5
  248. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct12.c +86 -0
  249. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct13.c +115 -0
  250. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct2.c +10 -1
  251. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct3.c +10 -1
  252. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct4.c +9 -0
  253. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct5.c +9 -0
  254. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct6.c +11 -0
  255. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct7.c +9 -0
  256. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct8.c +11 -0
  257. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct9.c +11 -0
  258. data/ext/ffi_c/libffi/testsuite/libffi.closures/single_entry_structs1.c +86 -0
  259. data/ext/ffi_c/libffi/testsuite/libffi.closures/single_entry_structs2.c +102 -0
  260. data/ext/ffi_c/libffi/testsuite/libffi.closures/single_entry_structs3.c +101 -0
  261. data/ext/ffi_c/libffi/testsuite/libffi.closures/stret_medium.c +1 -1
  262. data/ext/ffi_c/libffi/testsuite/libffi.closures/stret_medium2.c +1 -1
  263. data/ext/ffi_c/libffi/testsuite/libffi.closures/testclosure.c +6 -1
  264. data/ext/ffi_c/libffi/testsuite/libffi.closures/unwindtest.cc +2 -1
  265. data/ext/ffi_c/libffi/testsuite/libffi.closures/unwindtest_ffi_call.cc +1 -0
  266. data/ext/ffi_c/libffi.bsd.mk +2 -2
  267. data/ext/ffi_c/libffi.gnu.mk +2 -2
  268. data/ext/ffi_c/rbffi.h +1 -1
  269. data/ffi.gemspec +3 -3
  270. data/lib/ffi/autopointer.rb +7 -22
  271. data/lib/ffi/compat.rb +43 -0
  272. data/lib/ffi/data_converter.rb +2 -2
  273. data/lib/ffi/dynamic_library.rb +89 -0
  274. data/lib/ffi/enum.rb +18 -11
  275. data/lib/ffi/ffi.rb +3 -0
  276. data/lib/ffi/function.rb +71 -0
  277. data/lib/ffi/library.rb +55 -71
  278. data/lib/ffi/library_path.rb +109 -0
  279. data/lib/ffi/managedstruct.rb +1 -1
  280. data/lib/ffi/platform/aarch64-windows/types.conf +52 -0
  281. data/lib/ffi/platform/hppa1.1-linux/types.conf +178 -0
  282. data/lib/ffi/platform/hppa2.0-linux/types.conf +178 -0
  283. data/lib/ffi/platform/loongarch64-linux/types.conf +141 -0
  284. data/lib/ffi/platform/sw_64-linux/types.conf +141 -0
  285. data/lib/ffi/platform.rb +15 -13
  286. data/lib/ffi/struct.rb +2 -1
  287. data/lib/ffi/struct_layout.rb +1 -1
  288. data/lib/ffi/struct_layout_builder.rb +1 -1
  289. data/lib/ffi/types.rb +30 -5
  290. data/lib/ffi/variadic.rb +19 -8
  291. data/lib/ffi/version.rb +1 -1
  292. data.tar.gz.sig +3 -0
  293. metadata +98 -25
  294. metadata.gz.sig +3 -0
  295. data/ext/ffi_c/libffi/.travis/build-cross-in-container.sh +0 -14
  296. data/ext/ffi_c/libffi/.travis/build.sh +0 -142
  297. data/ext/ffi_c/libffi/.travis.yml +0 -83
  298. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_uchar_va.c +0 -44
  299. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_ushort_va.c +0 -44
  300. /data/ext/ffi_c/libffi/{.travis → .ci}/ar-lib +0 -0
  301. /data/ext/ffi_c/libffi/{.travis → .ci}/bfin-sim.exp +0 -0
  302. /data/ext/ffi_c/libffi/{.travis → .ci}/compile +0 -0
  303. /data/ext/ffi_c/libffi/{.travis → .ci}/m32r-sim.exp +0 -0
  304. /data/ext/ffi_c/libffi/{.travis → .ci}/moxie-sim.exp +0 -0
  305. /data/ext/ffi_c/libffi/{.travis → .ci}/or1k-sim.exp +0 -0
  306. /data/ext/ffi_c/libffi/{.travis → .ci}/powerpc-eabisim.exp +0 -0
  307. /data/ext/ffi_c/libffi/{.travis → .ci}/wine-sim.exp +0 -0
  308. /data/ext/ffi_c/libffi/testsuite/libffi.call/{pyobjc-tc.c → pyobjc_tc.c} +0 -0
  309. /data/lib/ffi/platform/{sparc64-linux → sparcv9-linux}/types.conf +0 -0
@@ -0,0 +1,220 @@
1
+ /* Area: ffi_call
2
+ Purpose: Test passing struct in variable argument lists.
3
+ Limitations: none.
4
+ PR: none.
5
+ Originator: ARM Ltd. */
6
+
7
+ /* { dg-do run } */
8
+ /* { dg-output "" { xfail avr32*-*-* m68k-*-* } } */
9
+
10
+ #include "ffitest.h"
11
+ #include <stdarg.h>
12
+
13
+ struct small_tag
14
+ {
15
+ unsigned char a;
16
+ unsigned char b;
17
+ };
18
+
19
+ struct large_tag
20
+ {
21
+ unsigned a;
22
+ unsigned b;
23
+ unsigned c;
24
+ unsigned d;
25
+ unsigned e;
26
+ };
27
+
28
+
29
+ static int
30
+ test_fn (int n, ...)
31
+ {
32
+ va_list ap;
33
+ struct small_tag s1;
34
+ struct small_tag s2;
35
+ struct large_tag l;
36
+ unsigned char uc;
37
+ signed char sc;
38
+ unsigned short us;
39
+ signed short ss;
40
+ unsigned int ui;
41
+ signed int si;
42
+ unsigned long ul;
43
+ signed long sl;
44
+ float f;
45
+ double d;
46
+
47
+ va_start (ap, n);
48
+ s1 = va_arg (ap, struct small_tag);
49
+ l = va_arg (ap, struct large_tag);
50
+ s2 = va_arg (ap, struct small_tag);
51
+
52
+ uc = va_arg (ap, unsigned);
53
+ sc = va_arg (ap, signed);
54
+
55
+ us = va_arg (ap, unsigned);
56
+ ss = va_arg (ap, signed);
57
+
58
+ ui = va_arg (ap, unsigned int);
59
+ si = va_arg (ap, signed int);
60
+
61
+ ul = va_arg (ap, unsigned long);
62
+ sl = va_arg (ap, signed long);
63
+
64
+ f = va_arg (ap, double); /* C standard promotes float->double
65
+ when anonymous */
66
+ d = va_arg (ap, double);
67
+
68
+ printf ("%u %u %u %u %u %u %u %u %u uc=%u sc=%d %u %d %u %d %lu %ld %f %f\n",
69
+ s1.a, s1.b, l.a, l.b, l.c, l.d, l.e,
70
+ s2.a, s2.b,
71
+ uc, sc,
72
+ us, ss,
73
+ ui, si,
74
+ ul, sl,
75
+ f, d);
76
+
77
+ va_end (ap);
78
+
79
+ CHECK(s1.a == 5);
80
+ CHECK(s1.b == 6);
81
+ CHECK(l.a == 10);
82
+ CHECK(l.b == 11);
83
+ CHECK(l.c == 12);
84
+ CHECK(l.d == 13);
85
+ CHECK(l.e == 14);
86
+ CHECK(s2.a == 7);
87
+ CHECK(s2.b == 8);
88
+ CHECK(uc == 9);
89
+ CHECK(sc == 10);
90
+ CHECK(us == 11);
91
+ CHECK(ss == 12);
92
+ CHECK(ui == 13);
93
+ CHECK(si == 14);
94
+ CHECK(ul == 15);
95
+ CHECK(sl == 16);
96
+ CHECK((int)f == 2);
97
+ CHECK((int)d == 3);
98
+
99
+ return n + 1;
100
+ }
101
+
102
+ int
103
+ main (void)
104
+ {
105
+ ffi_cif cif;
106
+ void* args[15];
107
+ ffi_type* arg_types[15];
108
+
109
+ ffi_type s_type;
110
+ ffi_type *s_type_elements[3];
111
+
112
+ ffi_type l_type;
113
+ ffi_type *l_type_elements[6];
114
+
115
+ struct small_tag s1;
116
+ struct small_tag s2;
117
+ struct large_tag l1;
118
+
119
+ int n;
120
+ ffi_arg res;
121
+
122
+ unsigned int uc;
123
+ signed int sc;
124
+ unsigned int us;
125
+ signed int ss;
126
+ unsigned int ui;
127
+ signed int si;
128
+ unsigned long ul;
129
+ signed long sl;
130
+ double d1;
131
+ double f1;
132
+
133
+ s_type.size = 0;
134
+ s_type.alignment = 0;
135
+ s_type.type = FFI_TYPE_STRUCT;
136
+ s_type.elements = s_type_elements;
137
+
138
+ s_type_elements[0] = &ffi_type_uchar;
139
+ s_type_elements[1] = &ffi_type_uchar;
140
+ s_type_elements[2] = NULL;
141
+
142
+ l_type.size = 0;
143
+ l_type.alignment = 0;
144
+ l_type.type = FFI_TYPE_STRUCT;
145
+ l_type.elements = l_type_elements;
146
+
147
+ l_type_elements[0] = &ffi_type_uint;
148
+ l_type_elements[1] = &ffi_type_uint;
149
+ l_type_elements[2] = &ffi_type_uint;
150
+ l_type_elements[3] = &ffi_type_uint;
151
+ l_type_elements[4] = &ffi_type_uint;
152
+ l_type_elements[5] = NULL;
153
+
154
+ arg_types[0] = &ffi_type_sint;
155
+ arg_types[1] = &s_type;
156
+ arg_types[2] = &l_type;
157
+ arg_types[3] = &s_type;
158
+ arg_types[4] = &ffi_type_uint;
159
+ arg_types[5] = &ffi_type_sint;
160
+ arg_types[6] = &ffi_type_uint;
161
+ arg_types[7] = &ffi_type_sint;
162
+ arg_types[8] = &ffi_type_uint;
163
+ arg_types[9] = &ffi_type_sint;
164
+ arg_types[10] = &ffi_type_ulong;
165
+ arg_types[11] = &ffi_type_slong;
166
+ arg_types[12] = &ffi_type_double;
167
+ arg_types[13] = &ffi_type_double;
168
+ arg_types[14] = NULL;
169
+
170
+ CHECK(ffi_prep_cif_var(&cif, FFI_DEFAULT_ABI, 1, 14, &ffi_type_sint, arg_types) == FFI_OK);
171
+
172
+ s1.a = 5;
173
+ s1.b = 6;
174
+
175
+ l1.a = 10;
176
+ l1.b = 11;
177
+ l1.c = 12;
178
+ l1.d = 13;
179
+ l1.e = 14;
180
+
181
+ s2.a = 7;
182
+ s2.b = 8;
183
+
184
+ n = 41;
185
+
186
+ uc = 9;
187
+ sc = 10;
188
+ us = 11;
189
+ ss = 12;
190
+ ui = 13;
191
+ si = 14;
192
+ ul = 15;
193
+ sl = 16;
194
+ f1 = 2.12;
195
+ d1 = 3.13;
196
+
197
+ args[0] = &n;
198
+ args[1] = &s1;
199
+ args[2] = &l1;
200
+ args[3] = &s2;
201
+ args[4] = &uc;
202
+ args[5] = &sc;
203
+ args[6] = &us;
204
+ args[7] = &ss;
205
+ args[8] = &ui;
206
+ args[9] = &si;
207
+ args[10] = &ul;
208
+ args[11] = &sl;
209
+ args[12] = &f1;
210
+ args[13] = &d1;
211
+ args[14] = NULL;
212
+
213
+ ffi_call(&cif, FFI_FN(test_fn), &res, args);
214
+ /* { dg-output "5 6 10 11 12 13 14 7 8 uc=9 sc=10 11 12 13 14 15 16 2.120000 3.130000" } */
215
+ printf("res: %d\n", (int) res);
216
+ /* { dg-output "\nres: 42" } */
217
+ CHECK(res == 42);
218
+
219
+ return 0;
220
+ }
@@ -0,0 +1,154 @@
1
+ /* Area: ffi_call
2
+ Purpose: Test function with multiple fixed args and variable argument list.
3
+ Limitations: none.
4
+ PR: none.
5
+ Originator: ARM Ltd., Oracle */
6
+
7
+ /* { dg-do run } */
8
+ /* { dg-output "" { xfail avr32*-*-* m68k-*-* } } */
9
+
10
+ #include "ffitest.h"
11
+ #include <stdarg.h>
12
+
13
+ /*
14
+ * This is a modified version of va_2.c that has fixed arguments with "small" types that
15
+ * are not allowed as variable arguments, but they should be still allowed as fixed args.
16
+ */
17
+
18
+ static int
19
+ test_fn (char a1, float a2, int n, ...)
20
+ {
21
+ va_list ap;
22
+ unsigned char uc;
23
+ signed char sc;
24
+ unsigned short us;
25
+ signed short ss;
26
+ unsigned int ui;
27
+ signed int si;
28
+ unsigned long ul;
29
+ signed long sl;
30
+ float f;
31
+ double d;
32
+
33
+ va_start (ap, n);
34
+
35
+ uc = va_arg (ap, unsigned);
36
+ sc = va_arg (ap, signed);
37
+
38
+ us = va_arg (ap, unsigned);
39
+ ss = va_arg (ap, signed);
40
+
41
+ ui = va_arg (ap, unsigned int);
42
+ si = va_arg (ap, signed int);
43
+
44
+ ul = va_arg (ap, unsigned long);
45
+ sl = va_arg (ap, signed long);
46
+
47
+ f = va_arg (ap, double); /* C standard promotes float->double
48
+ when anonymous */
49
+ d = va_arg (ap, double);
50
+
51
+ printf ("%d %f uc=%u sc=%d %u %d %u %d %lu %ld %f %f\n",
52
+ a1, a2,
53
+ uc, sc,
54
+ us, ss,
55
+ ui, si,
56
+ ul, sl,
57
+ f, d);
58
+
59
+ va_end (ap);
60
+
61
+ CHECK(a1 == 1);
62
+ CHECK((int)a2 == 2);
63
+ CHECK(uc == 9);
64
+ CHECK(sc == 10);
65
+ CHECK(us == 11);
66
+ CHECK(ss == 12);
67
+ CHECK(ui == 13);
68
+ CHECK(si == 14);
69
+ CHECK(ul == 15);
70
+ CHECK(sl == 16);
71
+ CHECK((int)f == 2);
72
+ CHECK((int)d == 3);
73
+
74
+ return n + 1;
75
+ }
76
+
77
+ int
78
+ main (void)
79
+ {
80
+ ffi_cif cif;
81
+ void* args[14];
82
+ ffi_type* arg_types[14];
83
+
84
+ char a1;
85
+ float a2;
86
+ int n;
87
+ ffi_arg res;
88
+
89
+ unsigned int uc;
90
+ signed int sc;
91
+ unsigned int us;
92
+ signed int ss;
93
+ unsigned int ui;
94
+ signed int si;
95
+ unsigned long ul;
96
+ signed long sl;
97
+ double d1;
98
+ double f1;
99
+
100
+ arg_types[0] = &ffi_type_schar;
101
+ arg_types[1] = &ffi_type_float;
102
+ arg_types[2] = &ffi_type_sint;
103
+ arg_types[3] = &ffi_type_uint;
104
+ arg_types[4] = &ffi_type_sint;
105
+ arg_types[5] = &ffi_type_uint;
106
+ arg_types[6] = &ffi_type_sint;
107
+ arg_types[7] = &ffi_type_uint;
108
+ arg_types[8] = &ffi_type_sint;
109
+ arg_types[9] = &ffi_type_ulong;
110
+ arg_types[10] = &ffi_type_slong;
111
+ arg_types[11] = &ffi_type_double;
112
+ arg_types[12] = &ffi_type_double;
113
+ arg_types[13] = NULL;
114
+
115
+ CHECK(ffi_prep_cif_var(&cif, FFI_DEFAULT_ABI, 3, 13, &ffi_type_sint, arg_types) == FFI_OK);
116
+
117
+ a1 = 1;
118
+ a2 = 2.0f;
119
+ n = 41;
120
+
121
+ uc = 9;
122
+ sc = 10;
123
+ us = 11;
124
+ ss = 12;
125
+ ui = 13;
126
+ si = 14;
127
+ ul = 15;
128
+ sl = 16;
129
+ f1 = 2.12;
130
+ d1 = 3.13;
131
+
132
+ args[0] = &a1;
133
+ args[1] = &a2;
134
+ args[2] = &n;
135
+ args[3] = &uc;
136
+ args[4] = &sc;
137
+ args[5] = &us;
138
+ args[6] = &ss;
139
+ args[7] = &ui;
140
+ args[8] = &si;
141
+ args[9] = &ul;
142
+ args[10] = &sl;
143
+ args[11] = &f1;
144
+ args[12] = &d1;
145
+ args[13] = NULL;
146
+
147
+ ffi_call(&cif, FFI_FN(test_fn), &res, args);
148
+ /* { dg-output "1 2.000000 uc=9 sc=10 11 12 13 14 15 16 2.120000 3.130000" } */
149
+ printf("res: %d\n", (int) res);
150
+ /* { dg-output "\nres: 42" } */
151
+ CHECK(res == 42);
152
+
153
+ return 0;
154
+ }
@@ -40,6 +40,18 @@ test_fn (int n, ...)
40
40
  printf ("%u %u %u %u %u %u %u %u %u\n", s1.a, s1.b, l.a, l.b, l.c, l.d, l.e,
41
41
  s2.a, s2.b);
42
42
  va_end (ap);
43
+
44
+ CHECK(s1.a == 5);
45
+ CHECK(s1.b == 6);
46
+
47
+ CHECK(l.a == 10);
48
+ CHECK(l.b == 11);
49
+ CHECK(l.c == 12);
50
+ CHECK(l.d == 13);
51
+ CHECK(l.e == 14);
52
+
53
+ CHECK(s2.a == 7);
54
+ CHECK(s2.b == 8);
43
55
  return n + 1;
44
56
  }
45
57
 
@@ -116,6 +128,7 @@ main (void)
116
128
  /* { dg-output "5 6 10 11 12 13 14 7 8" } */
117
129
  printf("res: %d\n", (int) res);
118
130
  /* { dg-output "\nres: 42" } */
131
+ CHECK(res == 42);
119
132
 
120
133
  return 0;
121
134
  }
@@ -39,6 +39,15 @@ test_fn (int n, ...)
39
39
  s2 = va_arg (ap, struct small_tag);
40
40
  printf ("%u %u %u %u %u %u %u %u %u\n", s1.a, s1.b, l.a, l.b, l.c, l.d, l.e,
41
41
  s2.a, s2.b);
42
+ CHECK(s1.a == 5);
43
+ CHECK(s1.b == 6);
44
+ CHECK(l.a == 10);
45
+ CHECK(l.b == 11);
46
+ CHECK(l.c == 12);
47
+ CHECK(l.d == 13);
48
+ CHECK(l.e == 14);
49
+ CHECK(s2.a == 7);
50
+ CHECK(s2.b == 8);
42
51
  va_end (ap);
43
52
  s1.a += s2.a;
44
53
  s1.b += s2.b;
@@ -118,6 +127,8 @@ main (void)
118
127
  /* { dg-output "5 6 10 11 12 13 14 7 8" } */
119
128
  printf("res: %d %d\n", res.a, res.b);
120
129
  /* { dg-output "\nres: 12 14" } */
130
+ CHECK(res.a == 12);
131
+ CHECK(res.b == 14);
121
132
 
122
133
  return 0;
123
134
  }
@@ -39,6 +39,16 @@ test_fn (int n, ...)
39
39
  s2 = va_arg (ap, struct small_tag);
40
40
  printf ("%u %u %u %u %u %u %u %u %u\n", s1.a, s1.b, l.a, l.b, l.c, l.d, l.e,
41
41
  s2.a, s2.b);
42
+
43
+ CHECK(s1.a == 5);
44
+ CHECK(s1.b == 6);
45
+ CHECK(l.a == 10);
46
+ CHECK(l.b == 11);
47
+ CHECK(l.c == 12);
48
+ CHECK(l.d == 13);
49
+ CHECK(l.e == 14);
50
+ CHECK(s2.a == 7);
51
+ CHECK(s2.b == 8);
42
52
  va_end (ap);
43
53
  l.a += s1.a;
44
54
  l.b += s1.b;
@@ -120,6 +130,11 @@ main (void)
120
130
  /* { dg-output "5 6 10 11 12 13 14 7 8" } */
121
131
  printf("res: %d %d %d %d %d\n", res.a, res.b, res.c, res.d, res.e);
122
132
  /* { dg-output "\nres: 15 17 19 21 14" } */
133
+ CHECK(res.a == 15);
134
+ CHECK(res.b == 17);
135
+ CHECK(res.c == 19);
136
+ CHECK(res.d == 21);
137
+ CHECK(res.e == 14);
123
138
 
124
139
  return 0;
125
140
  }
@@ -38,7 +38,7 @@ closure_test_fn0(ffi_cif* cif __UNUSED__, void* resp, void** args,
38
38
  (int)*(int *)args[12], (int)(*(int *)args[13]),
39
39
  (int)(*(int *)args[14]),*(int *)args[15],
40
40
  (int)(intptr_t)userdata, (int)*(ffi_arg *)resp);
41
-
41
+ CHECK((int)*(ffi_arg *)resp == 680);
42
42
  }
43
43
 
44
44
  typedef int (*closure_test_type0)(unsigned long long, int, unsigned long long,
@@ -85,5 +85,6 @@ int main (void)
85
85
  /* { dg-output "1 2 3 4 127 429 7 8 9 10 11 12 13 19 21 1 3: 680" } */
86
86
  printf("res: %d\n",res);
87
87
  /* { dg-output "\nres: 680" } */
88
- exit(0);
88
+ CHECK(res == 680);
89
+ exit(0);
89
90
  }
@@ -33,6 +33,7 @@ static void closure_test_fn1(ffi_cif* cif __UNUSED__, void* resp, void** args,
33
33
  (int)*(int *)args[12], (int)(*(int *)args[13]),
34
34
  (int)(*(int *)args[14]), *(int *)args[15],
35
35
  (int)(intptr_t)userdata, (int)*(ffi_arg *)resp);
36
+ CHECK((int)*(ffi_arg *)resp == 255);
36
37
  }
37
38
 
38
39
  typedef int (*closure_test_type1)(float, float, float, float, signed short,
@@ -77,5 +78,6 @@ int main (void)
77
78
  /* { dg-output "1 2 3 4 127 5 6 8 9 10 11 12 13 19 21 1 3: 255" } */
78
79
  printf("res: %d\n",res);
79
80
  /* { dg-output "\nres: 255" } */
81
+ CHECK(res == 255);
80
82
  exit(0);
81
83
  }
@@ -32,6 +32,7 @@ static void closure_test_fn2(ffi_cif* cif __UNUSED__, void* resp, void** args,
32
32
  (int)*(int *)args[12], (int)(*(float *)args[13]),
33
33
  (int)(*(int *)args[14]), *(int *)args[15], (int)(intptr_t)userdata,
34
34
  (int)*(ffi_arg *)resp);
35
+ CHECK((int)*(ffi_arg *)resp == 255);
35
36
  }
36
37
 
37
38
  typedef int (*closure_test_type2)(double, double, double, double, signed short,
@@ -77,5 +78,6 @@ int main (void)
77
78
  /* { dg-output "1 2 3 4 127 5 6 8 9 10 11 12 13 19 21 1 3: 255" } */
78
79
  printf("res: %d\n",res);
79
80
  /* { dg-output "\nres: 255" } */
81
+ CHECK(res == 255);
80
82
  exit(0);
81
83
  }
@@ -31,8 +31,27 @@ static void closure_test_fn3(ffi_cif* cif __UNUSED__, void* resp, void** args,
31
31
  (int)(*(float *)args[10]), (int)(*(float *)args[11]),
32
32
  (int)*(int *)args[12], (int)(*(float *)args[13]),
33
33
  (int)(*(float *)args[14]), *(int *)args[15], (int)(intptr_t)userdata,
34
- (int)*(ffi_arg *)resp);
34
+ (int)*(ffi_arg *)resp);
35
35
 
36
+ CHECK((int)*(float *)args[0] == 1);
37
+ CHECK((int)(*(float *)args[1]) == 2);
38
+ CHECK((int)(*(float *)args[2]) == 3);
39
+ CHECK((int)(*(float *)args[3]) == 4);
40
+ CHECK((int)(*(float *)args[4]) == 5);
41
+ CHECK((int)(*(float *)args[5]) == 6);
42
+ CHECK((int)*(float *)args[6] == 7);
43
+ CHECK((int)(*(float *)args[7]) == 8);
44
+ CHECK((int)(*(double *)args[8]) == 9);
45
+ CHECK((int)*(int *)args[9] == 10);
46
+ CHECK((int)(*(float *)args[10]) == 11);
47
+ CHECK((int)(*(float *)args[11]) == 12);
48
+ CHECK((int)*(int *)args[12] == 13);
49
+ CHECK((int)(*(float *)args[13]) == 19);
50
+ CHECK((int)(*(float *)args[14]) == 21);
51
+ CHECK(*(int *)args[15] == 1);
52
+ CHECK((int)(intptr_t)userdata == 3);
53
+
54
+ CHECK((int)*(ffi_arg *)resp == 135);
36
55
  }
37
56
 
38
57
  typedef int (*closure_test_type3)(float, float, float, float, float, float,
@@ -78,5 +97,6 @@ int main (void)
78
97
  /* { dg-output "1 2 3 4 5 6 7 8 9 10 11 12 13 19 21 1 3: 135" } */
79
98
  printf("res: %d\n",res);
80
99
  /* { dg-output "\nres: 135" } */
100
+ CHECK(res == 135);
81
101
  exit(0);
82
102
  }
@@ -45,6 +45,7 @@ closure_test_fn0(ffi_cif* cif __UNUSED__, void* resp, void** args,
45
45
  (int)*(unsigned long long *)args[14],
46
46
  *(int *)args[15],
47
47
  (int)(intptr_t)userdata, (int)*(ffi_arg *)resp);
48
+ CHECK((int)*(ffi_arg *)resp == 680);
48
49
 
49
50
  }
50
51
 
@@ -84,6 +85,7 @@ int main (void)
84
85
  /* { dg-output "1 2 3 4 127 429 7 8 9 10 11 12 13 19 21 1 3: 680" } */
85
86
  printf("res: %d\n",res);
86
87
  /* { dg-output "\nres: 680" } */
88
+ CHECK(res == 680);
87
89
 
88
90
  exit(0);
89
91
  }
@@ -44,6 +44,7 @@ closure_test_fn5(ffi_cif* cif __UNUSED__, void* resp, void** args,
44
44
  (int)*(unsigned long long *)args[14],
45
45
  *(int *)args[15],
46
46
  (int)(intptr_t)userdata, (int)*(ffi_arg *)resp);
47
+ CHECK((int)*(ffi_arg *)resp == 680);
47
48
 
48
49
  }
49
50
 
@@ -87,6 +88,7 @@ int main (void)
87
88
  /* { dg-output "1 2 3 4 127 429 7 8 9 10 11 12 13 19 21 1 3: 680" } */
88
89
  printf("res: %d\n",res);
89
90
  /* { dg-output "\nres: 680" } */
91
+ CHECK(res == 680);
90
92
 
91
93
  exit(0);
92
94
  }
@@ -37,6 +37,7 @@ closure_test_fn0(ffi_cif* cif __UNUSED__, void* resp, void** args,
37
37
  (int)*(int *)args[12], (int)(*(int *)args[13]),
38
38
  (int)(*(double *)args[14]), (int)(*(double *)args[15]),
39
39
  (int)(intptr_t)userdata, (int)*(ffi_arg *)resp);
40
+ CHECK((int)*(ffi_arg *)resp == 680);
40
41
 
41
42
  }
42
43
 
@@ -86,5 +87,6 @@ int main (void)
86
87
  /* { dg-output "1 2 3 4 127 429 7 8 9 10 11 12 13 19 21 1 3: 680" } */
87
88
  printf("res: %d\n",res);
88
89
  /* { dg-output "\nres: 680" } */
90
+ CHECK(res == 680);
89
91
  exit(0);
90
92
  }
@@ -7,9 +7,6 @@
7
7
  Originator: <andreast@gcc.gnu.org> 20030828 */
8
8
 
9
9
 
10
-
11
-
12
- /* { dg-do run } */
13
10
  #include "ffitest.h"
14
11
 
15
12
  static void
@@ -82,8 +79,11 @@ int main (void)
82
79
 
83
80
  CHECK(ffi_prep_closure_loc(pcl, &cif, closure_loc_test_fn0,
84
81
  (void *) 3 /* userdata */, codeloc) == FFI_OK);
85
-
86
- CHECK(memcmp(pcl, codeloc, sizeof(*pcl)) == 0);
82
+
83
+ #if !defined(FFI_EXEC_STATIC_TRAMP) && !defined(__EMSCRIPTEN__)
84
+ /* With static trampolines, the codeloc does not point to closure */
85
+ CHECK(memcmp(pcl, FFI_CL(codeloc), sizeof(*pcl)) == 0);
86
+ #endif
87
87
 
88
88
  res = (*((closure_loc_test_type0)codeloc))
89
89
  (1LL, 2, 3LL, 4, 127, 429LL, 7, 8, 9.5, 10, 11, 12, 13,
@@ -91,5 +91,6 @@ int main (void)
91
91
  /* { dg-output "1 2 3 4 127 429 7 8 9 10 11 12 13 19 21 1 3: 680" } */
92
92
  printf("res: %d\n",res);
93
93
  /* { dg-output "\nres: 680" } */
94
- exit(0);
94
+ CHECK(res == 680);
95
+ exit(0);
95
96
  }
@@ -20,6 +20,11 @@ closure_test(ffi_cif* cif __UNUSED__, void* resp, void** args, void* userdata)
20
20
  (int)(*(int *)args[2]), (int)(*(int *)args[3]),
21
21
  (int)*(ffi_arg *)resp);
22
22
 
23
+ CHECK((int)*(int *)args[0] == 0);
24
+ CHECK((int)*(int *)args[1] == 1);
25
+ CHECK((int)*(int *)args[2] == 2);
26
+ CHECK((int)*(int *)args[3] == 3);
27
+ CHECK((int)*(ffi_arg *)resp == 9);
23
28
  }
24
29
 
25
30
  typedef int (ABI_ATTR *closure_test_type0)(int, int, int, int);
@@ -50,6 +55,7 @@ int main (void)
50
55
 
51
56
  printf("res: %d\n",res);
52
57
  /* { dg-output "\nres: 9" } */
58
+ CHECK(res == 9);
53
59
 
54
60
  exit(0);
55
61
  }
@@ -25,6 +25,17 @@ cls_struct_12byte cls_struct_12byte_fn(struct cls_struct_12byte b1,
25
25
  printf("%d %d %d %d %d %d: %d %d %d\n", b1.a, b1.b, b1.c, b2.a, b2.b, b2.c,
26
26
  result.a, result.b, result.c);
27
27
 
28
+ CHECK(b1.a == 7);
29
+ CHECK(b1.b == 4);
30
+ CHECK(b1.c == 9);
31
+
32
+ CHECK(b2.a == 1);
33
+ CHECK(b2.b == 5);
34
+ CHECK(b2.c == 3);
35
+
36
+ CHECK(result.a == 8);
37
+ CHECK(result.b == 9);
38
+ CHECK(result.c == 12);
28
39
  return result;
29
40
  }
30
41
 
@@ -78,6 +89,9 @@ int main (void)
78
89
  /* { dg-output "7 4 9 1 5 3: 8 9 12" } */
79
90
  printf("res: %d %d %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
80
91
  /* { dg-output "\nres: 8 9 12" } */
92
+ CHECK(res_dbl.a == 8);
93
+ CHECK(res_dbl.b == 9);
94
+ CHECK(res_dbl.c == 12);
81
95
 
82
96
  CHECK(ffi_prep_closure_loc(pcl, &cif, cls_struct_12byte_gn, NULL, code) == FFI_OK);
83
97
 
@@ -87,8 +101,12 @@ int main (void)
87
101
 
88
102
  res_dbl = ((cls_struct_12byte(*)(cls_struct_12byte, cls_struct_12byte))(code))(h_dbl, j_dbl);
89
103
  /* { dg-output "\n7 4 9 1 5 3: 8 9 12" } */
104
+
90
105
  printf("res: %d %d %d\n", res_dbl.a, res_dbl.b, res_dbl.c);
91
106
  /* { dg-output "\nres: 8 9 12" } */
107
+ CHECK(res_dbl.a == 8);
108
+ CHECK(res_dbl.b == 9);
109
+ CHECK(res_dbl.c == 12);
92
110
 
93
111
  exit(0);
94
112
  }