ffi 1.15.5 → 1.16.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (308) hide show
  1. checksums.yaml +4 -4
  2. checksums.yaml.gz.sig +0 -0
  3. data/CHANGELOG.md +54 -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/config.guess +623 -556
  54. data/ext/ffi_c/libffi/config.sub +75 -34
  55. data/ext/ffi_c/libffi/configure +4571 -3830
  56. data/ext/ffi_c/libffi/configure.ac +64 -28
  57. data/ext/ffi_c/libffi/configure.host +25 -6
  58. data/ext/ffi_c/libffi/doc/Makefile.in +9 -6
  59. data/ext/ffi_c/libffi/doc/libffi.texi +82 -33
  60. data/ext/ffi_c/libffi/doc/version.texi +4 -4
  61. data/ext/ffi_c/libffi/fficonfig.h.in +12 -47
  62. data/ext/ffi_c/libffi/generate-darwin-source-and-headers.py +163 -52
  63. data/ext/ffi_c/libffi/include/Makefile.am +1 -1
  64. data/ext/ffi_c/libffi/include/Makefile.in +10 -9
  65. data/ext/ffi_c/libffi/include/ffi.h.in +54 -50
  66. data/ext/ffi_c/libffi/include/ffi_cfi.h +21 -0
  67. data/ext/ffi_c/libffi/include/ffi_common.h +29 -0
  68. data/ext/ffi_c/libffi/include/tramp.h +45 -0
  69. data/ext/ffi_c/libffi/install-sh +92 -69
  70. data/ext/ffi_c/libffi/libtool-version +2 -2
  71. data/ext/ffi_c/libffi/ltmain.sh +512 -315
  72. data/ext/ffi_c/libffi/m4/ax_cc_maxopt.m4 +18 -14
  73. data/ext/ffi_c/libffi/m4/ax_cflags_warn_all.m4 +108 -72
  74. data/ext/ffi_c/libffi/m4/ax_compiler_vendor.m4 +76 -45
  75. data/ext/ffi_c/libffi/m4/ax_prepend_flag.m4 +51 -0
  76. data/ext/ffi_c/libffi/man/Makefile.in +9 -6
  77. data/ext/ffi_c/libffi/missing +1 -1
  78. data/ext/ffi_c/libffi/msvc_build/aarch64/aarch64_include/ffi.h +1 -1
  79. data/ext/ffi_c/libffi/msvcc.sh +1 -1
  80. data/ext/ffi_c/libffi/src/aarch64/ffi.c +146 -42
  81. data/ext/ffi_c/libffi/src/aarch64/internal.h +32 -0
  82. data/ext/ffi_c/libffi/src/aarch64/sysv.S +134 -42
  83. data/ext/ffi_c/libffi/src/arc/arcompact.S +169 -94
  84. data/ext/ffi_c/libffi/src/arc/ffi.c +325 -148
  85. data/ext/ffi_c/libffi/src/arc/ffitarget.h +14 -0
  86. data/ext/ffi_c/libffi/src/arm/ffi.c +62 -17
  87. data/ext/ffi_c/libffi/src/arm/ffitarget.h +3 -3
  88. data/ext/ffi_c/libffi/src/arm/internal.h +10 -0
  89. data/ext/ffi_c/libffi/src/arm/sysv.S +113 -42
  90. data/ext/ffi_c/libffi/src/closures.c +133 -47
  91. data/ext/ffi_c/libffi/src/dlmalloc.c +5 -0
  92. data/ext/ffi_c/libffi/src/ia64/ffi.c +12 -0
  93. data/ext/ffi_c/libffi/src/ia64/unix.S +20 -2
  94. data/ext/ffi_c/libffi/src/loongarch64/ffi.c +621 -0
  95. data/ext/ffi_c/libffi/src/loongarch64/ffitarget.h +82 -0
  96. data/ext/ffi_c/libffi/src/loongarch64/sysv.S +327 -0
  97. data/ext/ffi_c/libffi/src/m32r/ffi.c +31 -14
  98. data/ext/ffi_c/libffi/src/mips/ffi.c +240 -65
  99. data/ext/ffi_c/libffi/src/mips/ffitarget.h +7 -0
  100. data/ext/ffi_c/libffi/src/mips/n32.S +137 -28
  101. data/ext/ffi_c/libffi/src/mips/o32.S +61 -4
  102. data/ext/ffi_c/libffi/src/moxie/ffi.c +47 -22
  103. data/ext/ffi_c/libffi/src/or1k/ffi.c +25 -12
  104. data/ext/ffi_c/libffi/src/pa/ffi.c +32 -33
  105. data/ext/ffi_c/libffi/src/pa/ffi64.c +614 -0
  106. data/ext/ffi_c/libffi/src/pa/ffitarget.h +22 -8
  107. data/ext/ffi_c/libffi/src/pa/hpux32.S +83 -36
  108. data/ext/ffi_c/libffi/src/pa/hpux64.S +681 -0
  109. data/ext/ffi_c/libffi/src/pa/linux.S +82 -35
  110. data/ext/ffi_c/libffi/src/powerpc/ffi_linux64.c +1 -1
  111. data/ext/ffi_c/libffi/src/powerpc/linux64.S +2 -0
  112. data/ext/ffi_c/libffi/src/powerpc/linux64_closure.S +2 -0
  113. data/ext/ffi_c/libffi/src/powerpc/t-aix +5 -0
  114. data/ext/ffi_c/libffi/src/prep_cif.c +22 -2
  115. data/ext/ffi_c/libffi/src/riscv/ffi.c +37 -4
  116. data/ext/ffi_c/libffi/src/sparc/ffi64.c +16 -0
  117. data/ext/ffi_c/libffi/src/tramp.c +716 -0
  118. data/ext/ffi_c/libffi/src/wasm32/ffi.c +934 -0
  119. data/ext/ffi_c/libffi/src/wasm32/ffitarget.h +62 -0
  120. data/ext/ffi_c/libffi/src/x86/ffi.c +99 -37
  121. data/ext/ffi_c/libffi/src/x86/ffi64.c +67 -12
  122. data/ext/ffi_c/libffi/src/x86/ffitarget.h +9 -5
  123. data/ext/ffi_c/libffi/src/x86/ffiw64.c +43 -0
  124. data/ext/ffi_c/libffi/src/x86/internal.h +14 -0
  125. data/ext/ffi_c/libffi/src/x86/internal64.h +14 -0
  126. data/ext/ffi_c/libffi/src/x86/sysv.S +172 -38
  127. data/ext/ffi_c/libffi/src/x86/sysv_intel.S +91 -88
  128. data/ext/ffi_c/libffi/src/x86/unix64.S +96 -6
  129. data/ext/ffi_c/libffi/src/x86/win64.S +20 -7
  130. data/ext/ffi_c/libffi/src/xtensa/ffi.c +16 -8
  131. data/ext/ffi_c/libffi/src/xtensa/ffitarget.h +4 -0
  132. data/ext/ffi_c/libffi/src/xtensa/sysv.S +26 -16
  133. data/ext/ffi_c/libffi/testsuite/Makefile.am +127 -114
  134. data/ext/ffi_c/libffi/testsuite/Makefile.in +137 -121
  135. data/ext/ffi_c/libffi/testsuite/emscripten/build-tests.sh +54 -0
  136. data/ext/ffi_c/libffi/testsuite/emscripten/build.sh +63 -0
  137. data/ext/ffi_c/libffi/testsuite/emscripten/conftest.py +80 -0
  138. data/ext/ffi_c/libffi/testsuite/emscripten/node-tests.sh +48 -0
  139. data/ext/ffi_c/libffi/testsuite/emscripten/test.html +7 -0
  140. data/ext/ffi_c/libffi/testsuite/emscripten/test_libffi.py +51 -0
  141. data/ext/ffi_c/libffi/testsuite/lib/libffi.exp +43 -21
  142. data/ext/ffi_c/libffi/testsuite/lib/target-libpath.exp +2 -2
  143. data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-call.c +1 -0
  144. data/ext/ffi_c/libffi/testsuite/libffi.bhaible/testcases.c +5 -1
  145. data/ext/ffi_c/libffi/testsuite/libffi.call/bpo_38748.c +41 -0
  146. data/ext/ffi_c/libffi/testsuite/libffi.call/ffitest.h +28 -3
  147. data/ext/ffi_c/libffi/testsuite/libffi.call/float_va.c +3 -0
  148. data/ext/ffi_c/libffi/testsuite/libffi.call/return_ll1.c +5 -0
  149. data/ext/ffi_c/libffi/testsuite/libffi.call/return_sl.c +4 -0
  150. data/ext/ffi_c/libffi/testsuite/libffi.call/return_ul.c +4 -0
  151. data/ext/ffi_c/libffi/testsuite/libffi.call/s55.c +60 -0
  152. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen.c +8 -9
  153. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen2.c +2 -2
  154. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen3.c +2 -2
  155. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen4.c +2 -2
  156. data/ext/ffi_c/libffi/testsuite/libffi.call/struct10.c +1 -1
  157. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_2.c +63 -0
  158. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_3.c +65 -0
  159. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_3f.c +65 -0
  160. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_4.c +67 -0
  161. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_4f.c +67 -0
  162. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_big.c +93 -0
  163. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_by_value_small.c +61 -0
  164. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_return_2H.c +63 -0
  165. data/ext/ffi_c/libffi/testsuite/libffi.call/struct_return_8H.c +90 -0
  166. data/ext/ffi_c/libffi/testsuite/libffi.call/va_1.c +1 -119
  167. data/ext/ffi_c/libffi/testsuite/libffi.call/va_2.c +220 -0
  168. data/ext/ffi_c/libffi/testsuite/libffi.call/va_3.c +154 -0
  169. data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct1.c +13 -0
  170. data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct2.c +11 -0
  171. data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct3.c +15 -0
  172. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn0.c +3 -2
  173. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn1.c +2 -0
  174. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn2.c +2 -0
  175. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn3.c +21 -1
  176. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn4.c +2 -0
  177. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn5.c +2 -0
  178. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_fn6.c +2 -0
  179. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_loc_fn0.c +7 -6
  180. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure_simple.c +6 -0
  181. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_12byte.c +18 -0
  182. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_16byte.c +22 -0
  183. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_18byte.c +24 -0
  184. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_19byte.c +29 -0
  185. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_1_1byte.c +4 -0
  186. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_20byte.c +19 -1
  187. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_20byte1.c +21 -1
  188. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_24byte.c +35 -3
  189. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_2byte.c +13 -0
  190. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_3_1byte.c +19 -0
  191. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_3byte1.c +13 -0
  192. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_3byte2.c +13 -0
  193. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_3float.c +18 -0
  194. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_4_1byte.c +22 -0
  195. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_4byte.c +13 -0
  196. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_5_1_byte.c +29 -1
  197. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_5byte.c +19 -1
  198. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_64byte.c +24 -0
  199. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_6_1_byte.c +28 -1
  200. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_6byte.c +24 -2
  201. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_7_1_byte.c +39 -1
  202. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_7byte.c +25 -1
  203. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_8byte.c +14 -0
  204. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_9byte1.c +14 -1
  205. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_9byte2.c +14 -2
  206. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_double.c +19 -1
  207. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_float.c +19 -1
  208. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_longdouble.c +20 -1
  209. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_longdouble_split.c +40 -25
  210. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_longdouble_split2.c +40 -3
  211. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_pointer.c +19 -1
  212. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_sint16.c +18 -1
  213. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_sint32.c +18 -3
  214. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_sint64.c +18 -1
  215. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_uint16.c +18 -1
  216. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_uint32.c +19 -1
  217. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_align_uint64.c +19 -1
  218. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_dbls_struct.c +3 -1
  219. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_double_va.c +9 -1
  220. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_float.c +4 -0
  221. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_longdouble.c +11 -1
  222. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_longdouble_va.c +22 -3
  223. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_multi_schar.c +5 -1
  224. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_multi_sshort.c +6 -1
  225. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_multi_sshortchar.c +9 -1
  226. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_multi_uchar.c +9 -1
  227. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_multi_ushort.c +6 -2
  228. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_multi_ushortchar.c +9 -1
  229. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_pointer.c +5 -0
  230. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_pointer_stack.c +10 -0
  231. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_schar.c +3 -0
  232. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_sint.c +2 -0
  233. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_sshort.c +3 -0
  234. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_struct_va1.c +11 -0
  235. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_uchar.c +3 -0
  236. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_uint.c +4 -0
  237. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_uint_va.c +4 -0
  238. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_ulong_va.c +4 -0
  239. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_ulonglong.c +2 -0
  240. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_ushort.c +3 -0
  241. data/ext/ffi_c/libffi/testsuite/libffi.closures/ffitest.h +1 -138
  242. data/ext/ffi_c/libffi/testsuite/libffi.closures/huge_struct.c +21 -21
  243. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct.c +32 -9
  244. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct1.c +1 -1
  245. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct10.c +12 -0
  246. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct11.c +21 -5
  247. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct12.c +86 -0
  248. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct13.c +115 -0
  249. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct2.c +10 -1
  250. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct3.c +10 -1
  251. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct4.c +9 -0
  252. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct5.c +9 -0
  253. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct6.c +11 -0
  254. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct7.c +9 -0
  255. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct8.c +11 -0
  256. data/ext/ffi_c/libffi/testsuite/libffi.closures/nested_struct9.c +11 -0
  257. data/ext/ffi_c/libffi/testsuite/libffi.closures/single_entry_structs1.c +86 -0
  258. data/ext/ffi_c/libffi/testsuite/libffi.closures/single_entry_structs2.c +102 -0
  259. data/ext/ffi_c/libffi/testsuite/libffi.closures/single_entry_structs3.c +101 -0
  260. data/ext/ffi_c/libffi/testsuite/libffi.closures/stret_medium.c +1 -1
  261. data/ext/ffi_c/libffi/testsuite/libffi.closures/stret_medium2.c +1 -1
  262. data/ext/ffi_c/libffi/testsuite/libffi.closures/testclosure.c +6 -1
  263. data/ext/ffi_c/libffi/testsuite/libffi.closures/unwindtest.cc +2 -1
  264. data/ext/ffi_c/libffi/testsuite/libffi.closures/unwindtest_ffi_call.cc +1 -0
  265. data/ext/ffi_c/libffi.bsd.mk +2 -2
  266. data/ext/ffi_c/libffi.gnu.mk +2 -2
  267. data/ext/ffi_c/rbffi.h +1 -1
  268. data/ffi.gemspec +2 -2
  269. data/lib/ffi/autopointer.rb +7 -22
  270. data/lib/ffi/compat.rb +43 -0
  271. data/lib/ffi/data_converter.rb +2 -2
  272. data/lib/ffi/dynamic_library.rb +89 -0
  273. data/lib/ffi/enum.rb +18 -11
  274. data/lib/ffi/ffi.rb +3 -0
  275. data/lib/ffi/function.rb +71 -0
  276. data/lib/ffi/library.rb +55 -71
  277. data/lib/ffi/library_path.rb +109 -0
  278. data/lib/ffi/managedstruct.rb +1 -1
  279. data/lib/ffi/platform/aarch64-windows/types.conf +52 -0
  280. data/lib/ffi/platform/hppa1.1-linux/types.conf +178 -0
  281. data/lib/ffi/platform/hppa2.0-linux/types.conf +178 -0
  282. data/lib/ffi/platform/loongarch64-linux/types.conf +141 -0
  283. data/lib/ffi/platform/sw_64-linux/types.conf +141 -0
  284. data/lib/ffi/platform.rb +15 -13
  285. data/lib/ffi/struct.rb +2 -1
  286. data/lib/ffi/struct_layout.rb +1 -1
  287. data/lib/ffi/struct_layout_builder.rb +1 -1
  288. data/lib/ffi/types.rb +30 -5
  289. data/lib/ffi/variadic.rb +19 -8
  290. data/lib/ffi/version.rb +1 -1
  291. data.tar.gz.sig +0 -0
  292. metadata +97 -25
  293. metadata.gz.sig +1 -0
  294. data/ext/ffi_c/libffi/.travis/build-cross-in-container.sh +0 -14
  295. data/ext/ffi_c/libffi/.travis/build.sh +0 -142
  296. data/ext/ffi_c/libffi/.travis.yml +0 -83
  297. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_uchar_va.c +0 -44
  298. data/ext/ffi_c/libffi/testsuite/libffi.closures/cls_ushort_va.c +0 -44
  299. /data/ext/ffi_c/libffi/{.travis → .ci}/ar-lib +0 -0
  300. /data/ext/ffi_c/libffi/{.travis → .ci}/bfin-sim.exp +0 -0
  301. /data/ext/ffi_c/libffi/{.travis → .ci}/compile +0 -0
  302. /data/ext/ffi_c/libffi/{.travis → .ci}/m32r-sim.exp +0 -0
  303. /data/ext/ffi_c/libffi/{.travis → .ci}/moxie-sim.exp +0 -0
  304. /data/ext/ffi_c/libffi/{.travis → .ci}/or1k-sim.exp +0 -0
  305. /data/ext/ffi_c/libffi/{.travis → .ci}/powerpc-eabisim.exp +0 -0
  306. /data/ext/ffi_c/libffi/{.travis → .ci}/wine-sim.exp +0 -0
  307. /data/ext/ffi_c/libffi/testsuite/libffi.call/{pyobjc-tc.c → pyobjc_tc.c} +0 -0
  308. /data/lib/ffi/platform/{sparc64-linux → sparcv9-linux}/types.conf +0 -0
@@ -114,6 +114,16 @@ loadregs:
114
114
 
115
115
  REG_L t6, 3*FFI_SIZEOF_ARG($fp) # load the flags word into t6.
116
116
 
117
+ # when retval is _Complex long double, $f12/$a0, $f13/$a1 will be skipped
118
+ # no idea why, but gcc does it.
119
+ SRL t4, t6, 8*FFI_FLAG_BITS
120
+ move t8, t6
121
+ bne t4, FFI_TYPE_COMPLEX_LDLD, loadregs1
122
+
123
+ SLL t8, t6, 2*FFI_FLAG_BITS
124
+
125
+
126
+ loadregs1:
117
127
  #ifdef __mips_soft_float
118
128
  REG_L a0, 0*FFI_SIZEOF_ARG(t9)
119
129
  REG_L a1, 1*FFI_SIZEOF_ARG(t9)
@@ -124,7 +134,7 @@ loadregs:
124
134
  REG_L a6, 6*FFI_SIZEOF_ARG(t9)
125
135
  REG_L a7, 7*FFI_SIZEOF_ARG(t9)
126
136
  #else
127
- and t4, t6, ((1<<FFI_FLAG_BITS)-1)
137
+ and t4, t8, ((1<<FFI_FLAG_BITS)-1)
128
138
  REG_L a0, 0*FFI_SIZEOF_ARG(t9)
129
139
  beqz t4, arg1_next
130
140
  bne t4, FFI_TYPE_FLOAT, arg1_doublep
@@ -134,7 +144,7 @@ arg1_doublep:
134
144
  l.d $f12, 0*FFI_SIZEOF_ARG(t9)
135
145
  arg1_next:
136
146
 
137
- SRL t4, t6, 1*FFI_FLAG_BITS
147
+ SRL t4, t8, 1*FFI_FLAG_BITS
138
148
  and t4, ((1<<FFI_FLAG_BITS)-1)
139
149
  REG_L a1, 1*FFI_SIZEOF_ARG(t9)
140
150
  beqz t4, arg2_next
@@ -145,7 +155,7 @@ arg2_doublep:
145
155
  l.d $f13, 1*FFI_SIZEOF_ARG(t9)
146
156
  arg2_next:
147
157
 
148
- SRL t4, t6, 2*FFI_FLAG_BITS
158
+ SRL t4, t8, 2*FFI_FLAG_BITS
149
159
  and t4, ((1<<FFI_FLAG_BITS)-1)
150
160
  REG_L a2, 2*FFI_SIZEOF_ARG(t9)
151
161
  beqz t4, arg3_next
@@ -156,7 +166,7 @@ arg3_doublep:
156
166
  l.d $f14, 2*FFI_SIZEOF_ARG(t9)
157
167
  arg3_next:
158
168
 
159
- SRL t4, t6, 3*FFI_FLAG_BITS
169
+ SRL t4, t8, 3*FFI_FLAG_BITS
160
170
  and t4, ((1<<FFI_FLAG_BITS)-1)
161
171
  REG_L a3, 3*FFI_SIZEOF_ARG(t9)
162
172
  beqz t4, arg4_next
@@ -167,7 +177,7 @@ arg4_doublep:
167
177
  l.d $f15, 3*FFI_SIZEOF_ARG(t9)
168
178
  arg4_next:
169
179
 
170
- SRL t4, t6, 4*FFI_FLAG_BITS
180
+ SRL t4, t8, 4*FFI_FLAG_BITS
171
181
  and t4, ((1<<FFI_FLAG_BITS)-1)
172
182
  REG_L a4, 4*FFI_SIZEOF_ARG(t9)
173
183
  beqz t4, arg5_next
@@ -178,7 +188,7 @@ arg5_doublep:
178
188
  l.d $f16, 4*FFI_SIZEOF_ARG(t9)
179
189
  arg5_next:
180
190
 
181
- SRL t4, t6, 5*FFI_FLAG_BITS
191
+ SRL t4, t8, 5*FFI_FLAG_BITS
182
192
  and t4, ((1<<FFI_FLAG_BITS)-1)
183
193
  REG_L a5, 5*FFI_SIZEOF_ARG(t9)
184
194
  beqz t4, arg6_next
@@ -189,7 +199,7 @@ arg6_doublep:
189
199
  l.d $f17, 5*FFI_SIZEOF_ARG(t9)
190
200
  arg6_next:
191
201
 
192
- SRL t4, t6, 6*FFI_FLAG_BITS
202
+ SRL t4, t8, 6*FFI_FLAG_BITS
193
203
  and t4, ((1<<FFI_FLAG_BITS)-1)
194
204
  REG_L a6, 6*FFI_SIZEOF_ARG(t9)
195
205
  beqz t4, arg7_next
@@ -200,7 +210,7 @@ arg7_doublep:
200
210
  l.d $f18, 6*FFI_SIZEOF_ARG(t9)
201
211
  arg7_next:
202
212
 
203
- SRL t4, t6, 7*FFI_FLAG_BITS
213
+ SRL t4, t8, 7*FFI_FLAG_BITS
204
214
  and t4, ((1<<FFI_FLAG_BITS)-1)
205
215
  REG_L a7, 7*FFI_SIZEOF_ARG(t9)
206
216
  beqz t4, arg8_next
@@ -212,7 +222,7 @@ arg8_doublep:
212
222
  arg8_next:
213
223
  #endif
214
224
 
215
- callit:
225
+ callit:
216
226
  # Load the function pointer
217
227
  REG_L t9, 5*FFI_SIZEOF_ARG($fp)
218
228
 
@@ -226,14 +236,21 @@ callit:
226
236
  # Shift the return type flag over
227
237
  SRL t6, 8*FFI_FLAG_BITS
228
238
 
229
- beq t6, FFI_TYPE_SINT32, retint
230
- bne t6, FFI_TYPE_INT, retfloat
239
+ beq t6, FFI_TYPE_SINT32, retint
240
+ bne t6, FFI_TYPE_INT, retuint32
231
241
  retint:
232
242
  jal t9
233
243
  REG_L t4, 4*FFI_SIZEOF_ARG($fp)
234
244
  REG_S v0, 0(t4)
235
245
  b epilogue
236
246
 
247
+ retuint32:
248
+ bne t6, FFI_TYPE_UINT32, retfloat
249
+ jal t9
250
+ REG_L t4, 4*FFI_SIZEOF_ARG($fp)
251
+ sw v0, 0(t4)
252
+ b epilogue
253
+
237
254
  retfloat:
238
255
  #ifndef __mips_soft_float
239
256
  bne t6, FFI_TYPE_FLOAT, retdouble
@@ -249,7 +266,7 @@ retdouble:
249
266
  s.d $f0, 0(t4)
250
267
  b epilogue
251
268
 
252
- retstruct_d:
269
+ retstruct_d:
253
270
  bne t6, FFI_TYPE_STRUCT_D, retstruct_f
254
271
  jal t9
255
272
  REG_L t4, 4*FFI_SIZEOF_ARG($fp)
@@ -263,16 +280,37 @@ retstruct_f:
263
280
  s.s $f0, 0(t4)
264
281
  b epilogue
265
282
 
266
- retstruct_d_d:
267
- bne t6, FFI_TYPE_STRUCT_DD, retstruct_f_f
283
+ retstruct_d_d:
284
+ bne t6, FFI_TYPE_STRUCT_DD, retcomplex_d_d
268
285
  jal t9
269
286
  REG_L t4, 4*FFI_SIZEOF_ARG($fp)
270
287
  s.d $f0, 0(t4)
271
288
  s.d $f2, 8(t4)
272
289
  b epilogue
290
+
291
+ retcomplex_d_d:
292
+ bne t6, FFI_TYPE_COMPLEX_DD, retcomplex_ld_ld
293
+ jal t9
294
+ REG_L t4, 4*FFI_SIZEOF_ARG($fp)
295
+ s.d $f0, 0(t4)
296
+ s.d $f2, 8(t4)
297
+ b epilogue
298
+
299
+ retcomplex_ld_ld:
300
+ bne t6, FFI_TYPE_COMPLEX_LDLD, retstruct_f_f
301
+ jal t9
302
+ b epilogue
273
303
 
274
- retstruct_f_f:
275
- bne t6, FFI_TYPE_STRUCT_FF, retstruct_d_f
304
+ retstruct_f_f:
305
+ bne t6, FFI_TYPE_STRUCT_FF, retcomplex_f_f
306
+ jal t9
307
+ REG_L t4, 4*FFI_SIZEOF_ARG($fp)
308
+ s.s $f0, 0(t4)
309
+ s.s $f2, 4(t4)
310
+ b epilogue
311
+
312
+ retcomplex_f_f:
313
+ bne t6, FFI_TYPE_COMPLEX_FF, retstruct_d_f
276
314
  jal t9
277
315
  REG_L t4, 4*FFI_SIZEOF_ARG($fp)
278
316
  s.s $f0, 0(t4)
@@ -315,7 +353,7 @@ retstruct_d_d_soft:
315
353
  jal t9
316
354
  REG_L t4, 4*FFI_SIZEOF_ARG($fp)
317
355
  sd v0, 0(t4)
318
- sd v1, 8(t4)
356
+ sd a0, 8(t4) # not typo, it is a0, I have no idea, gcc does do it
319
357
  b epilogue
320
358
 
321
359
  retstruct_f_f_soft:
@@ -339,7 +377,7 @@ retstruct_f_d_soft:
339
377
  jal t9
340
378
  REG_L t4, 4*FFI_SIZEOF_ARG($fp)
341
379
  sw v0, 0(t4)
342
- sd v1, 8(t4)
380
+ sd a0, 8(t4) # not typo, it is a0, I have no idea, gcc does do it
343
381
  b epilogue
344
382
 
345
383
  retstruct_small:
@@ -350,14 +388,37 @@ retstruct_small:
350
388
  b epilogue
351
389
 
352
390
  retstruct_small2:
353
- bne t6, FFI_TYPE_STRUCT_SMALL2, retstruct
391
+ bne t6, FFI_TYPE_STRUCT_SMALL2, retlongdouble_soft
354
392
  jal t9
355
393
  REG_L t4, 4*FFI_SIZEOF_ARG($fp)
356
394
  REG_S v0, 0(t4)
357
395
  REG_S v1, 8(t4)
358
396
  b epilogue
359
397
 
360
- retstruct:
398
+ retlongdouble_soft:
399
+ bne t6, FFI_TYPE_LONGDOUBLE, retcomplex_small
400
+ jal t9
401
+ REG_L t4, 4*FFI_SIZEOF_ARG($fp)
402
+ REG_S v0, 0(t4)
403
+ REG_S a0, 8(t4) # not typo, it is a0, I have no idea, gcc does do it
404
+ b epilogue
405
+
406
+ retcomplex_small:
407
+ bne t6, FFI_TYPE_COMPLEX_SMALL, retcomplex_small2
408
+ jal t9
409
+ REG_L t4, 4*FFI_SIZEOF_ARG($fp)
410
+ REG_S v0, 0(t4)
411
+ b epilogue
412
+
413
+ retcomplex_small2:
414
+ bne t6, FFI_TYPE_COMPLEX_SMALL2, retstruct
415
+ jal t9
416
+ REG_L t4, 4*FFI_SIZEOF_ARG($fp)
417
+ REG_S v0, 0(t4)
418
+ REG_S v1, 8(t4)
419
+ b epilogue
420
+
421
+ retstruct:
361
422
  noretval:
362
423
  jal t9
363
424
 
@@ -403,7 +464,7 @@ epilogue:
403
464
  */
404
465
 
405
466
  #define SIZEOF_FRAME2 (20 * FFI_SIZEOF_ARG)
406
-
467
+
407
468
  #define A7_OFF2 (19 * FFI_SIZEOF_ARG)
408
469
  #define A6_OFF2 (18 * FFI_SIZEOF_ARG)
409
470
  #define A5_OFF2 (17 * FFI_SIZEOF_ARG)
@@ -451,8 +512,13 @@ ffi_go_closure_N32:
451
512
 
452
513
  # Call ffi_closure_mips_inner_N32 to do the real work.
453
514
  LA t9, ffi_closure_mips_inner_N32
515
+ #if _MIPS_SIM==_ABIN32
516
+ lw a0, 4($15) # cif
517
+ lw a1, 8($15) # fun
518
+ #else
454
519
  REG_L a0, 8($15) # cif
455
520
  REG_L a1, 16($15) # fun
521
+ #endif
456
522
  move a2, t7 # userdata=closure
457
523
  ADDU a3, $sp, V0_OFF2 # rvalue
458
524
  ADDU a4, $sp, A0_OFF2 # ar
@@ -485,10 +551,17 @@ ffi_closure_N32:
485
551
 
486
552
  # Call ffi_closure_mips_inner_N32 to do the real work.
487
553
  LA t9, ffi_closure_mips_inner_N32
554
+ #if _MIPS_SIM==_ABIN32
555
+ lw a0, 20($12) # cif
556
+ lw a1, 24($12) # fun
557
+ lw a2, 28($12) # user_data
558
+ #else
488
559
  REG_L a0, 56($12) # cif
489
560
  REG_L a1, 64($12) # fun
490
561
  REG_L a2, 72($12) # user_data
562
+ #endif
491
563
  ADDU a3, $sp, V0_OFF2
564
+ # FIXME: a4 does work, while if ret is _Complex long double, it will overwrite Fn_OFF2
492
565
  ADDU a4, $sp, A0_OFF2
493
566
  ADDU a5, $sp, F12_OFF2
494
567
 
@@ -513,10 +586,15 @@ $do_closure:
513
586
  jalr t9
514
587
 
515
588
  # Return flags are in v0
516
- bne v0, FFI_TYPE_SINT32, cls_retint
589
+ bne v0, FFI_TYPE_SINT32, cls_retuint32
517
590
  lw v0, V0_OFF2($sp)
518
591
  b cls_epilogue
519
592
 
593
+ cls_retuint32:
594
+ bne v0, FFI_TYPE_UINT32, cls_retint
595
+ lwu v0, V0_OFF2($sp)
596
+ b cls_epilogue
597
+
520
598
  cls_retint:
521
599
  bne v0, FFI_TYPE_INT, cls_retfloat
522
600
  REG_L v0, V0_OFF2($sp)
@@ -544,17 +622,29 @@ cls_retstruct_f:
544
622
  b cls_epilogue
545
623
 
546
624
  cls_retstruct_d_d:
547
- bne v0, FFI_TYPE_STRUCT_DD, cls_retstruct_f_f
625
+ bne v0, FFI_TYPE_STRUCT_DD, cls_retcomplex_d_d
626
+ l.d $f0, V0_OFF2($sp)
627
+ l.d $f2, V1_OFF2($sp)
628
+ b cls_epilogue
629
+
630
+ cls_retcomplex_d_d:
631
+ bne v0, FFI_TYPE_COMPLEX_DD, cls_retcomplex_f_f
548
632
  l.d $f0, V0_OFF2($sp)
549
633
  l.d $f2, V1_OFF2($sp)
550
634
  b cls_epilogue
551
635
 
552
- cls_retstruct_f_f:
553
- bne v0, FFI_TYPE_STRUCT_FF, cls_retstruct_d_f
636
+ cls_retstruct_f_f:
637
+ bne v0, FFI_TYPE_STRUCT_FF, cls_retcomplex_f_f
554
638
  l.s $f0, V0_OFF2($sp)
555
639
  l.s $f2, V1_OFF2($sp)
556
640
  b cls_epilogue
557
641
 
642
+ cls_retcomplex_f_f:
643
+ bne v0, FFI_TYPE_COMPLEX_FF, cls_retstruct_d_f
644
+ l.s $f0, V0_OFF2($sp)
645
+ l.s $f2, (V0_OFF2+4)($sp)
646
+ b cls_epilogue
647
+
558
648
  cls_retstruct_d_f:
559
649
  bne v0, FFI_TYPE_STRUCT_DF, cls_retstruct_f_d
560
650
  l.d $f0, V0_OFF2($sp)
@@ -562,12 +652,31 @@ cls_retstruct_d_f:
562
652
  b cls_epilogue
563
653
 
564
654
  cls_retstruct_f_d:
565
- bne v0, FFI_TYPE_STRUCT_FD, cls_retstruct_small2
655
+ bne v0, FFI_TYPE_STRUCT_FD, cls_retcomplex_ld_ld
566
656
  l.s $f0, V0_OFF2($sp)
567
657
  l.d $f2, V1_OFF2($sp)
568
658
  b cls_epilogue
659
+ #else
660
+ cls_longdouble_soft:
661
+ bne v0, FFI_TYPE_LONGDOUBLE, cls_retcomplex_ld_ld
662
+ REG_L v0, V0_OFF2($sp)
663
+ REG_L a0, V1_OFF2($sp) # not typo, it is a0, I have no idea, gcc does do it
664
+ b cls_epilogue
569
665
  #endif
570
-
666
+
667
+ cls_retcomplex_ld_ld:
668
+ bne v0, FFI_TYPE_COMPLEX_LDLD, cls_retstruct_small2
669
+ REG_L t8, A0_OFF2($sp)
670
+ REG_L t9, 16($sp)
671
+ REG_S t9, 0(t8)
672
+ REG_L t9, 24($sp)
673
+ REG_S t9, 8(t8)
674
+ REG_L t9, 32($sp)
675
+ REG_S t9, 16(t8)
676
+ REG_L t9, 40($sp)
677
+ REG_S t9, 24(t8)
678
+ b cls_epilogue
679
+
571
680
  cls_retstruct_small2:
572
681
  REG_L v0, V0_OFF2($sp)
573
682
  REG_L v1, V1_OFF2($sp)
@@ -582,7 +691,7 @@ cls_epilogue:
582
691
  .end ffi_closure_N32
583
692
 
584
693
  #ifdef __GNUC__
585
- .section .eh_frame,"aw",@progbits
694
+ .section .eh_frame,EH_FRAME_FLAGS,@progbits
586
695
  .Lframe1:
587
696
  .4byte .LECIE1-.LSCIE1 # length
588
697
  .LSCIE1:
@@ -133,6 +133,7 @@ pass_f_d:
133
133
  # bne t0, FFI_ARGS_F_D, call_it
134
134
  l.s $f12, 0*FFI_SIZEOF_ARG($sp) # load $fp regs from args
135
135
  l.d $f14, 2*FFI_SIZEOF_ARG($sp) # passing double and float
136
+
136
137
  #endif
137
138
 
138
139
  call_it:
@@ -146,7 +147,8 @@ call_it:
146
147
  REG_L t1, SIZEOF_FRAME + 4*FFI_SIZEOF_ARG($fp)
147
148
  beqz t1, noretval
148
149
 
149
- bne t2, FFI_TYPE_INT, retlonglong
150
+ and t1, t2, ((1<<4)-1)
151
+ bne t1, FFI_TYPE_INT, retlonglong
150
152
  jalr t9
151
153
  REG_L t0, SIZEOF_FRAME + 4*FFI_SIZEOF_ARG($fp)
152
154
  REG_S v0, 0(t0)
@@ -154,7 +156,7 @@ call_it:
154
156
 
155
157
  retlonglong:
156
158
  # Really any 64-bit int, signed or not.
157
- bne t2, FFI_TYPE_UINT64, retfloat
159
+ bne t1, FFI_TYPE_UINT64, retfloat
158
160
  jalr t9
159
161
  REG_L t0, SIZEOF_FRAME + 4*FFI_SIZEOF_ARG($fp)
160
162
  REG_S v1, 4(t0)
@@ -162,7 +164,7 @@ retlonglong:
162
164
  b epilogue
163
165
 
164
166
  retfloat:
165
- bne t2, FFI_TYPE_FLOAT, retdouble
167
+ bne t1, FFI_TYPE_FLOAT, retdouble
166
168
  jalr t9
167
169
  REG_L t0, SIZEOF_FRAME + 4*FFI_SIZEOF_ARG($fp)
168
170
  #ifndef __mips_soft_float
@@ -173,7 +175,7 @@ retfloat:
173
175
  b epilogue
174
176
 
175
177
  retdouble:
176
- bne t2, FFI_TYPE_DOUBLE, noretval
178
+ bne t1, FFI_TYPE_DOUBLE, retcomplex
177
179
  jalr t9
178
180
  REG_L t0, SIZEOF_FRAME + 4*FFI_SIZEOF_ARG($fp)
179
181
  #ifndef __mips_soft_float
@@ -184,6 +186,48 @@ retdouble:
184
186
  #endif
185
187
  b epilogue
186
188
 
189
+ retcomplex:
190
+ # mask out the complex elements type.
191
+ # the struct of flags (bits):
192
+ # 0-1: arg0
193
+ # 2-3: arg1
194
+ # 4-7: return type
195
+ # 8-11: rtype elements type: for complex
196
+ # Note here: t2 is flags>>4
197
+ bne t1, FFI_TYPE_COMPLEX, noretval
198
+ jalr t9
199
+ REG_L t0, SIZEOF_FRAME + 4*FFI_SIZEOF_ARG($fp)
200
+ REG_L t1, A3_OFF($fp) # load the flags word
201
+ SRL t1, t1, 8
202
+ li t3, 3
203
+ beq t1, t3, 3f # double
204
+ li t3, 2
205
+ beq t1, t3, 2f # float
206
+ # FIXME: long double
207
+ slti t3, t1, 5
208
+ beqz t3, 5f # (u)int8/16/32/64
209
+ 2:
210
+ #ifndef __mips_soft_float
211
+ s.s $f0, 0(t0)
212
+ s.s $f2, 4(t0)
213
+ #else
214
+ # FIXME: do nothing can pass all of the testsuite
215
+ #endif
216
+ b epilogue
217
+ 3:
218
+ #ifndef __mips_soft_float
219
+ s.d $f0, 0(t0)
220
+ s.d $f2, 8(t0)
221
+ #else
222
+ # FIXME: do nothing can pass all of the testsuite
223
+ #endif
224
+ b epilogue
225
+
226
+ 5:
227
+ REG_S v1, 4(t0)
228
+ REG_S v0, 0(t0)
229
+ b epilogue
230
+
187
231
  noretval:
188
232
  jalr t9
189
233
 
@@ -378,6 +422,19 @@ $do_closure:
378
422
  li $9, FFI_TYPE_DOUBLE
379
423
  l.d $f0, V0_OFF2($fp)
380
424
  beq $8, $9, closure_done
425
+
426
+ li $9, FFI_TYPE_COMPLEX
427
+ bne $8, $9, 1f
428
+
429
+ li $9, 8
430
+ l.s $f0, V0_OFF2($fp)
431
+ l.s $f2, V1_OFF2($fp)
432
+ beq $3, $9, closure_done
433
+
434
+ li $9, 16
435
+ l.d $f0, V0_OFF2($fp)
436
+ l.d $f2, (V0_OFF2+8)($fp)
437
+ beq $3, $9, closure_done
381
438
  #endif
382
439
  1:
383
440
  REG_L $3, V1_OFF2($fp)
@@ -1,7 +1,7 @@
1
1
  /* -----------------------------------------------------------------------
2
- ffi.c - Copyright (C) 2012, 2013, 2018 Anthony Green
3
-
4
- Moxie Foreign Function Interface
2
+ ffi.c - Copyright (C) 2012, 2013, 2018, 2021, 2022 Anthony Green
3
+
4
+ Moxie Foreign Function Interface
5
5
 
6
6
  Permission is hereby granted, free of charge, to any person obtaining
7
7
  a copy of this software and associated documentation files (the
@@ -54,14 +54,14 @@ void *ffi_prep_args(char *stack, extended_cif *ecif)
54
54
  i--, p_arg++)
55
55
  {
56
56
  size_t z;
57
-
57
+
58
58
  z = (*p_arg)->size;
59
59
 
60
60
  if ((*p_arg)->type == FFI_TYPE_STRUCT)
61
61
  {
62
62
  z = sizeof(void*);
63
63
  *(void **) argp = *p_argv;
64
- }
64
+ }
65
65
  else if (z < sizeof(int))
66
66
  {
67
67
  z = sizeof(int);
@@ -70,19 +70,19 @@ void *ffi_prep_args(char *stack, extended_cif *ecif)
70
70
  case FFI_TYPE_SINT8:
71
71
  *(signed int *) argp = (signed int)*(SINT8 *)(* p_argv);
72
72
  break;
73
-
73
+
74
74
  case FFI_TYPE_UINT8:
75
75
  *(unsigned int *) argp = (unsigned int)*(UINT8 *)(* p_argv);
76
76
  break;
77
-
77
+
78
78
  case FFI_TYPE_SINT16:
79
79
  *(signed int *) argp = (signed int)*(SINT16 *)(* p_argv);
80
80
  break;
81
-
81
+
82
82
  case FFI_TYPE_UINT16:
83
83
  *(unsigned int *) argp = (unsigned int)*(UINT16 *)(* p_argv);
84
84
  break;
85
-
85
+
86
86
  default:
87
87
  FFI_ASSERT(0);
88
88
  }
@@ -116,26 +116,28 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
116
116
  return FFI_OK;
117
117
  }
118
118
 
119
- extern void ffi_call_EABI(void *(*)(char *, extended_cif *),
120
- extended_cif *,
121
- unsigned, unsigned,
122
- unsigned *,
119
+ extern void ffi_call_EABI(void *(*)(char *, extended_cif *),
120
+ extended_cif *,
121
+ unsigned, unsigned,
122
+ unsigned *,
123
123
  void (*fn)(void));
124
124
 
125
- void ffi_call(ffi_cif *cif,
126
- void (*fn)(void),
127
- void *rvalue,
125
+ void ffi_call(ffi_cif *cif,
126
+ void (*fn)(void),
127
+ void *rvalue,
128
128
  void **avalue)
129
129
  {
130
130
  extended_cif ecif;
131
+ ffi_type **arg_types = cif->arg_types;
132
+ int i, nargs = cif->nargs;
131
133
 
132
134
  ecif.cif = cif;
133
135
  ecif.avalue = avalue;
134
-
136
+
135
137
  /* If the return value is a struct and we don't have a return */
136
138
  /* value address then we need to make one */
137
139
 
138
- if ((rvalue == NULL) &&
140
+ if ((rvalue == NULL) &&
139
141
  (cif->rtype->type == FFI_TYPE_STRUCT))
140
142
  {
141
143
  ecif.rvalue = alloca(cif->rtype->size);
@@ -143,10 +145,24 @@ void ffi_call(ffi_cif *cif,
143
145
  else
144
146
  ecif.rvalue = rvalue;
145
147
 
146
- switch (cif->abi)
148
+ /* If we have any large structure arguments, make a copy so we are passing
149
+ by value. */
150
+ for (i = 0; i < nargs; i++)
151
+ {
152
+ ffi_type *at = arg_types[i];
153
+ int size = at->size;
154
+ if (at->type == FFI_TYPE_STRUCT) /* && size > 4) All struct args?? */
155
+ {
156
+ char *argcopy = alloca (size);
157
+ memcpy (argcopy, avalue[i], size);
158
+ avalue[i] = argcopy;
159
+ }
160
+ }
161
+
162
+ switch (cif->abi)
147
163
  {
148
164
  case FFI_EABI:
149
- ffi_call_EABI(ffi_prep_args, &ecif, cif->bytes,
165
+ ffi_call_EABI(ffi_prep_args, &ecif, cif->bytes,
150
166
  cif->flags, ecif.rvalue, fn);
151
167
  break;
152
168
  default:
@@ -172,7 +188,7 @@ void ffi_closure_eabi (unsigned arg1, unsigned arg2, unsigned arg3,
172
188
  void *struct_rvalue = (void *) arg1;
173
189
 
174
190
  /* 6 words reserved for register args + 3 words from jsr */
175
- char *stack_args = frame_pointer + 9*4;
191
+ char *stack_args = frame_pointer + 9*4;
176
192
 
177
193
  /* Lay the register arguments down in a continuous chunk of memory. */
178
194
  unsigned register_args[6] =
@@ -211,7 +227,16 @@ void ffi_closure_eabi (unsigned arg1, unsigned arg2, unsigned arg3,
211
227
  avalue[i] = ptr;
212
228
  break;
213
229
  case FFI_TYPE_STRUCT:
214
- avalue[i] = *(void**)ptr;
230
+ {
231
+ if (arg_types[i]->size > 4)
232
+ {
233
+ void *copy = alloca(arg_types[i]->size);
234
+ memcpy(copy, *(void**)ptr, arg_types[i]->size);
235
+ avalue[i] = copy;
236
+ }
237
+ else
238
+ avalue[i] = *(void**)ptr;
239
+ }
215
240
  break;
216
241
  default:
217
242
  /* This is an 8-byte value. */