ffi 1.9.18 → 1.9.21

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of ffi might be problematic. Click here for more details.

Files changed (366) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +3 -2
  3. data/Rakefile +14 -3
  4. data/ext/ffi_c/AbstractMemory.c +6 -1
  5. data/ext/ffi_c/Platform.c +10 -2
  6. data/ext/ffi_c/extconf.rb +7 -2
  7. data/ext/ffi_c/libffi.bsd.mk +9 -3
  8. data/ext/ffi_c/libffi.darwin.mk +14 -4
  9. data/ext/ffi_c/libffi.gnu.mk +2 -1
  10. data/ext/ffi_c/libffi.mk +9 -4
  11. data/ext/ffi_c/libffi/ChangeLog.libffi +2 -2
  12. data/ext/ffi_c/libffi/{ChangeLog → ChangeLog.libffi-3.1} +1402 -2
  13. data/ext/ffi_c/libffi/ChangeLog.v1 +1 -1
  14. data/ext/ffi_c/libffi/LICENSE +1 -1
  15. data/ext/ffi_c/libffi/Makefile.am +166 -157
  16. data/ext/ffi_c/libffi/README +164 -52
  17. data/ext/ffi_c/libffi/acinclude.m4 +381 -0
  18. data/ext/ffi_c/libffi/autogen.sh +2 -0
  19. data/ext/ffi_c/libffi/configure.ac +148 -256
  20. data/ext/ffi_c/libffi/configure.host +265 -4
  21. data/ext/ffi_c/libffi/doc/Makefile.am +3 -0
  22. data/ext/ffi_c/libffi/doc/libffi.texi +430 -45
  23. data/ext/ffi_c/libffi/doc/version.texi +4 -4
  24. data/ext/ffi_c/libffi/generate-darwin-source-and-headers.py +207 -0
  25. data/ext/ffi_c/libffi/include/Makefile.am +3 -3
  26. data/ext/ffi_c/libffi/include/ffi.h.in +107 -50
  27. data/ext/ffi_c/libffi/include/ffi_cfi.h +55 -0
  28. data/ext/ffi_c/libffi/include/ffi_common.h +32 -11
  29. data/ext/ffi_c/libffi/libffi.map.in +80 -0
  30. data/ext/ffi_c/libffi/libffi.pc.in +3 -2
  31. data/ext/ffi_c/libffi/libffi.xcodeproj/project.pbxproj +637 -0
  32. data/ext/ffi_c/libffi/libtool-ldflags +106 -0
  33. data/ext/ffi_c/libffi/libtool-version +1 -1
  34. data/ext/ffi_c/libffi/m4/asmcfi.m4 +13 -0
  35. data/ext/ffi_c/libffi/m4/ax_append_flag.m4 +69 -0
  36. data/ext/ffi_c/libffi/m4/ax_cc_maxopt.m4 +13 -8
  37. data/ext/ffi_c/libffi/m4/ax_cflags_warn_all.m4 +31 -104
  38. data/ext/ffi_c/libffi/m4/{ax_check_compiler_flags.m4 → ax_check_compile_flag.m4} +30 -34
  39. data/ext/ffi_c/libffi/m4/ax_compiler_vendor.m4 +32 -11
  40. data/ext/ffi_c/libffi/m4/ax_enable_builddir.m4 +6 -5
  41. data/ext/ffi_c/libffi/m4/ax_gcc_archflag.m4 +31 -21
  42. data/ext/ffi_c/libffi/man/Makefile.am +2 -2
  43. data/ext/ffi_c/libffi/man/ffi.3 +10 -0
  44. data/ext/ffi_c/libffi/man/ffi_prep_cif.3 +6 -4
  45. data/ext/ffi_c/libffi/man/ffi_prep_cif_var.3 +73 -0
  46. data/ext/ffi_c/libffi/msvcc.sh +72 -9
  47. data/ext/ffi_c/libffi/src/aarch64/ffi.c +941 -0
  48. data/ext/ffi_c/libffi/src/aarch64/ffitarget.h +81 -0
  49. data/ext/ffi_c/libffi/src/aarch64/internal.h +67 -0
  50. data/ext/ffi_c/libffi/src/aarch64/sysv.S +438 -0
  51. data/ext/ffi_c/libffi/src/alpha/ffi.c +335 -98
  52. data/ext/ffi_c/libffi/src/alpha/ffitarget.h +10 -1
  53. data/ext/ffi_c/libffi/src/alpha/internal.h +23 -0
  54. data/ext/ffi_c/libffi/src/alpha/osf.S +161 -266
  55. data/ext/ffi_c/libffi/src/arc/arcompact.S +135 -0
  56. data/ext/ffi_c/libffi/src/arc/ffi.c +266 -0
  57. data/ext/ffi_c/libffi/src/arc/ffitarget.h +53 -0
  58. data/ext/ffi_c/libffi/src/arm/ffi.c +597 -517
  59. data/ext/ffi_c/libffi/src/arm/ffitarget.h +24 -7
  60. data/ext/ffi_c/libffi/src/arm/internal.h +7 -0
  61. data/ext/ffi_c/libffi/src/arm/sysv.S +303 -417
  62. data/ext/ffi_c/libffi/src/avr32/ffitarget.h +6 -1
  63. data/ext/ffi_c/libffi/src/bfin/ffi.c +196 -0
  64. data/ext/ffi_c/libffi/src/bfin/ffitarget.h +43 -0
  65. data/ext/ffi_c/libffi/src/bfin/sysv.S +179 -0
  66. data/ext/ffi_c/libffi/src/closures.c +319 -44
  67. data/ext/ffi_c/libffi/src/cris/ffi.c +10 -7
  68. data/ext/ffi_c/libffi/src/cris/ffitarget.h +6 -1
  69. data/ext/ffi_c/libffi/src/debug.c +6 -1
  70. data/ext/ffi_c/libffi/src/dlmalloc.c +16 -11
  71. data/ext/ffi_c/libffi/src/frv/ffi.c +1 -1
  72. data/ext/ffi_c/libffi/src/frv/ffitarget.h +6 -1
  73. data/ext/ffi_c/libffi/src/ia64/ffi.c +11 -7
  74. data/ext/ffi_c/libffi/src/ia64/ffitarget.h +6 -1
  75. data/ext/ffi_c/libffi/src/java_raw_api.c +23 -5
  76. data/ext/ffi_c/libffi/src/m32r/ffi.c +1 -1
  77. data/ext/ffi_c/libffi/src/m32r/ffitarget.h +6 -1
  78. data/ext/ffi_c/libffi/src/m68k/ffi.c +87 -13
  79. data/ext/ffi_c/libffi/src/m68k/ffitarget.h +6 -1
  80. data/ext/ffi_c/libffi/src/m68k/sysv.S +119 -32
  81. data/ext/ffi_c/libffi/src/m88k/ffi.c +400 -0
  82. data/ext/ffi_c/libffi/src/m88k/ffitarget.h +49 -0
  83. data/ext/ffi_c/libffi/src/m88k/obsd.S +209 -0
  84. data/ext/ffi_c/libffi/src/metag/ffi.c +330 -0
  85. data/ext/ffi_c/libffi/{fficonfig.hw → src/metag/ffitarget.h} +22 -26
  86. data/ext/ffi_c/libffi/src/metag/sysv.S +311 -0
  87. data/ext/ffi_c/libffi/src/microblaze/ffi.c +321 -0
  88. data/ext/ffi_c/libffi/src/microblaze/ffitarget.h +53 -0
  89. data/ext/ffi_c/libffi/src/microblaze/sysv.S +302 -0
  90. data/ext/ffi_c/libffi/src/mips/ffi.c +95 -28
  91. data/ext/ffi_c/libffi/src/mips/ffitarget.h +9 -2
  92. data/ext/ffi_c/libffi/src/mips/n32.S +126 -56
  93. data/ext/ffi_c/libffi/src/mips/o32.S +148 -27
  94. data/ext/ffi_c/libffi/src/moxie/eabi.S +55 -82
  95. data/ext/ffi_c/libffi/src/moxie/ffi.c +40 -44
  96. data/ext/ffi_c/libffi/src/moxie/ffitarget.h +52 -0
  97. data/ext/ffi_c/libffi/src/nios2/ffi.c +304 -0
  98. data/ext/ffi_c/libffi/src/nios2/ffitarget.h +52 -0
  99. data/ext/ffi_c/libffi/src/nios2/sysv.S +136 -0
  100. data/ext/ffi_c/libffi/src/or1k/ffi.c +328 -0
  101. data/ext/ffi_c/libffi/src/or1k/ffitarget.h +58 -0
  102. data/ext/ffi_c/libffi/src/or1k/sysv.S +107 -0
  103. data/ext/ffi_c/libffi/src/pa/ffitarget.h +8 -1
  104. data/ext/ffi_c/libffi/src/powerpc/aix.S +6 -6
  105. data/ext/ffi_c/libffi/src/powerpc/aix_closure.S +3 -1
  106. data/ext/ffi_c/libffi/src/powerpc/asm.h +2 -2
  107. data/ext/ffi_c/libffi/src/powerpc/darwin.S +2 -7
  108. data/ext/ffi_c/libffi/src/powerpc/darwin_closure.S +22 -26
  109. data/ext/ffi_c/libffi/src/powerpc/ffi.c +103 -1378
  110. data/ext/ffi_c/libffi/src/powerpc/ffi_darwin.c +25 -25
  111. data/ext/ffi_c/libffi/src/powerpc/ffi_linux64.c +945 -0
  112. data/ext/ffi_c/libffi/src/powerpc/ffi_powerpc.h +94 -0
  113. data/ext/ffi_c/libffi/src/powerpc/ffi_sysv.c +923 -0
  114. data/ext/ffi_c/libffi/src/powerpc/ffitarget.h +100 -44
  115. data/ext/ffi_c/libffi/src/powerpc/linux64.S +100 -59
  116. data/ext/ffi_c/libffi/src/powerpc/linux64_closure.S +360 -108
  117. data/ext/ffi_c/libffi/src/powerpc/ppc_closure.S +138 -68
  118. data/ext/ffi_c/libffi/src/powerpc/sysv.S +68 -112
  119. data/ext/ffi_c/libffi/src/prep_cif.c +108 -24
  120. data/ext/ffi_c/libffi/src/raw_api.c +18 -5
  121. data/ext/ffi_c/libffi/src/s390/ffi.c +294 -318
  122. data/ext/ffi_c/libffi/src/s390/ffitarget.h +9 -1
  123. data/ext/ffi_c/libffi/src/s390/internal.h +11 -0
  124. data/ext/ffi_c/libffi/src/s390/sysv.S +257 -366
  125. data/ext/ffi_c/libffi/src/sh/ffi.c +4 -3
  126. data/ext/ffi_c/libffi/src/sh/ffitarget.h +6 -1
  127. data/ext/ffi_c/libffi/src/sh64/ffi.c +3 -2
  128. data/ext/ffi_c/libffi/src/sh64/ffitarget.h +6 -1
  129. data/ext/ffi_c/libffi/src/sparc/ffi.c +326 -527
  130. data/ext/ffi_c/libffi/src/sparc/ffi64.c +608 -0
  131. data/ext/ffi_c/libffi/src/sparc/ffitarget.h +20 -7
  132. data/ext/ffi_c/libffi/src/sparc/internal.h +26 -0
  133. data/ext/ffi_c/libffi/src/sparc/v8.S +364 -234
  134. data/ext/ffi_c/libffi/src/sparc/v9.S +340 -207
  135. data/ext/ffi_c/libffi/src/tile/ffi.c +355 -0
  136. data/ext/ffi_c/libffi/src/tile/ffitarget.h +65 -0
  137. data/ext/ffi_c/libffi/src/tile/tile.S +360 -0
  138. data/ext/ffi_c/libffi/src/types.c +43 -14
  139. data/ext/ffi_c/libffi/src/vax/elfbsd.S +195 -0
  140. data/ext/ffi_c/libffi/src/vax/ffi.c +276 -0
  141. data/ext/ffi_c/libffi/src/vax/ffitarget.h +49 -0
  142. data/ext/ffi_c/libffi/src/x86/asmnames.h +30 -0
  143. data/ext/ffi_c/libffi/src/x86/ffi.c +589 -500
  144. data/ext/ffi_c/libffi/src/x86/ffi64.c +338 -116
  145. data/ext/ffi_c/libffi/src/x86/ffitarget.h +55 -35
  146. data/ext/ffi_c/libffi/src/x86/ffiw64.c +287 -0
  147. data/ext/ffi_c/libffi/src/x86/internal.h +29 -0
  148. data/ext/ffi_c/libffi/src/x86/internal64.h +22 -0
  149. data/ext/ffi_c/libffi/src/x86/sysv.S +975 -400
  150. data/ext/ffi_c/libffi/src/x86/unix64.S +398 -299
  151. data/ext/ffi_c/libffi/src/x86/win64.S +222 -458
  152. data/ext/ffi_c/libffi/src/x86/win64_intel.S +237 -0
  153. data/ext/ffi_c/libffi/src/xtensa/ffi.c +298 -0
  154. data/ext/ffi_c/libffi/src/xtensa/ffitarget.h +53 -0
  155. data/ext/ffi_c/libffi/src/xtensa/sysv.S +253 -0
  156. data/ext/ffi_c/libffi/stamp-h.in +1 -0
  157. data/ext/ffi_c/libffi/testsuite/Makefile.am +78 -73
  158. data/ext/ffi_c/libffi/testsuite/lib/libffi.exp +120 -25
  159. data/ext/ffi_c/libffi/testsuite/lib/target-libpath.exp +21 -1
  160. data/ext/ffi_c/libffi/testsuite/libffi.call/align_mixed.c +46 -0
  161. data/ext/ffi_c/libffi/testsuite/libffi.call/call.exp +4 -6
  162. data/ext/ffi_c/libffi/testsuite/libffi.call/{closure_stdcall.c → closure_simple.c} +7 -16
  163. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_12byte.c +4 -4
  164. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_16byte.c +4 -4
  165. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_18byte.c +4 -4
  166. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_19byte.c +4 -4
  167. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_1_1byte.c +4 -4
  168. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_20byte.c +4 -4
  169. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_20byte1.c +4 -4
  170. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_24byte.c +5 -5
  171. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_2byte.c +4 -4
  172. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_3_1byte.c +4 -4
  173. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_3byte1.c +4 -4
  174. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_3byte2.c +4 -4
  175. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_4_1byte.c +4 -4
  176. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_4byte.c +4 -4
  177. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_5_1_byte.c +4 -4
  178. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_5byte.c +4 -4
  179. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_64byte.c +5 -5
  180. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_6_1_byte.c +4 -4
  181. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_6byte.c +4 -4
  182. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_7_1_byte.c +4 -4
  183. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_7byte.c +4 -4
  184. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_8byte.c +4 -4
  185. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_9byte1.c +4 -4
  186. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_9byte2.c +4 -4
  187. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_double.c +4 -4
  188. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_float.c +4 -4
  189. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_longdouble.c +4 -4
  190. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_longdouble_split.c +4 -6
  191. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c +4 -6
  192. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_pointer.c +4 -4
  193. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_sint16.c +4 -4
  194. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_sint32.c +4 -4
  195. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_sint64.c +4 -4
  196. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_uint16.c +4 -4
  197. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_uint32.c +4 -4
  198. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_uint64.c +4 -4
  199. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_dbls_struct.c +4 -4
  200. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_double_va.c +10 -9
  201. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_longdouble.c +3 -3
  202. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_longdouble_va.c +10 -9
  203. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_many_mixed_args.c +70 -0
  204. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_many_mixed_float_double.c +55 -0
  205. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_pointer.c +1 -1
  206. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_pointer_stack.c +11 -9
  207. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_struct_va1.c +114 -0
  208. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_uchar_va.c +44 -0
  209. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_uint_va.c +45 -0
  210. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_ulong_va.c +45 -0
  211. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_ulonglong.c +5 -5
  212. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_ushort_va.c +44 -0
  213. data/ext/ffi_c/libffi/testsuite/libffi.call/err_bad_typedef.c +2 -2
  214. data/ext/ffi_c/libffi/testsuite/libffi.call/ffitest.h +23 -40
  215. data/ext/ffi_c/libffi/testsuite/libffi.call/float1.c +3 -1
  216. data/ext/ffi_c/libffi/testsuite/libffi.call/float2.c +6 -4
  217. data/ext/ffi_c/libffi/testsuite/libffi.call/float3.c +4 -2
  218. data/ext/ffi_c/libffi/testsuite/libffi.call/float_va.c +107 -0
  219. data/ext/ffi_c/libffi/testsuite/libffi.call/huge_struct.c +18 -19
  220. data/ext/ffi_c/libffi/testsuite/libffi.call/many.c +6 -16
  221. data/ext/ffi_c/libffi/testsuite/libffi.call/many2.c +57 -0
  222. data/ext/ffi_c/libffi/testsuite/libffi.call/many_double.c +70 -0
  223. data/ext/ffi_c/libffi/testsuite/libffi.call/many_mixed.c +78 -0
  224. data/ext/ffi_c/libffi/testsuite/libffi.call/negint.c +0 -1
  225. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct.c +6 -6
  226. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct1.c +8 -8
  227. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct10.c +6 -6
  228. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct11.c +121 -0
  229. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct2.c +5 -5
  230. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct3.c +5 -5
  231. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct4.c +5 -5
  232. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct5.c +5 -5
  233. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct6.c +6 -6
  234. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct7.c +5 -5
  235. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct8.c +6 -6
  236. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct9.c +6 -6
  237. data/ext/ffi_c/libffi/testsuite/libffi.call/offsets.c +46 -0
  238. data/ext/ffi_c/libffi/testsuite/libffi.call/pr1172638.c +127 -0
  239. data/ext/ffi_c/libffi/testsuite/libffi.call/return_dbl.c +1 -0
  240. data/ext/ffi_c/libffi/testsuite/libffi.call/return_ldl.c +1 -1
  241. data/ext/ffi_c/libffi/testsuite/libffi.call/return_sc.c +1 -1
  242. data/ext/ffi_c/libffi/testsuite/libffi.call/return_uc.c +1 -1
  243. data/ext/ffi_c/libffi/testsuite/libffi.call/stret_large.c +7 -7
  244. data/ext/ffi_c/libffi/testsuite/libffi.call/stret_large2.c +7 -7
  245. data/ext/ffi_c/libffi/testsuite/libffi.call/stret_medium.c +5 -5
  246. data/ext/ffi_c/libffi/testsuite/libffi.call/stret_medium2.c +5 -5
  247. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen.c +2 -2
  248. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen2.c +49 -0
  249. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen3.c +49 -0
  250. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen4.c +55 -0
  251. data/ext/ffi_c/libffi/testsuite/libffi.call/struct1.c +9 -7
  252. data/ext/ffi_c/libffi/testsuite/libffi.call/struct2.c +7 -7
  253. data/ext/ffi_c/libffi/testsuite/libffi.call/struct3.c +7 -6
  254. data/ext/ffi_c/libffi/testsuite/libffi.call/struct4.c +9 -8
  255. data/ext/ffi_c/libffi/testsuite/libffi.call/struct5.c +9 -8
  256. data/ext/ffi_c/libffi/testsuite/libffi.call/struct6.c +9 -9
  257. data/ext/ffi_c/libffi/testsuite/libffi.call/struct7.c +9 -9
  258. data/ext/ffi_c/libffi/testsuite/libffi.call/struct8.c +9 -8
  259. data/ext/ffi_c/libffi/testsuite/libffi.call/struct9.c +9 -8
  260. data/ext/ffi_c/libffi/testsuite/libffi.call/testclosure.c +2 -2
  261. data/ext/ffi_c/libffi/testsuite/libffi.call/uninitialized.c +61 -0
  262. data/ext/ffi_c/libffi/testsuite/{libffi.special → libffi.call}/unwindtest.cc +3 -10
  263. data/ext/ffi_c/libffi/testsuite/{libffi.special → libffi.call}/unwindtest_ffi_call.cc +2 -1
  264. data/ext/ffi_c/libffi/testsuite/libffi.call/va_1.c +196 -0
  265. data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct1.c +121 -0
  266. data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct2.c +123 -0
  267. data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct3.c +125 -0
  268. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_align_complex.inc +91 -0
  269. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_align_complex_double.c +10 -0
  270. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_align_complex_float.c +10 -0
  271. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_align_complex_longdouble.c +10 -0
  272. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex.inc +42 -0
  273. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_double.c +10 -0
  274. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_float.c +10 -0
  275. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_longdouble.c +10 -0
  276. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_struct.inc +71 -0
  277. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_struct_double.c +10 -0
  278. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_struct_float.c +10 -0
  279. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_struct_longdouble.c +10 -0
  280. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_va.inc +80 -0
  281. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_va_double.c +10 -0
  282. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_va_float.c +16 -0
  283. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_va_longdouble.c +10 -0
  284. data/ext/ffi_c/libffi/testsuite/{libffi.special/special.exp → libffi.complex/complex.exp} +9 -8
  285. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex.inc +51 -0
  286. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex_defs_double.inc +7 -0
  287. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex_defs_float.inc +7 -0
  288. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex_defs_longdouble.inc +7 -0
  289. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex_double.c +10 -0
  290. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex_float.c +10 -0
  291. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex_int.c +86 -0
  292. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex_longdouble.c +10 -0
  293. data/ext/ffi_c/libffi/testsuite/libffi.complex/ffitest.h +1 -0
  294. data/ext/ffi_c/libffi/testsuite/libffi.complex/many_complex.inc +78 -0
  295. data/ext/ffi_c/libffi/testsuite/libffi.complex/many_complex_double.c +10 -0
  296. data/ext/ffi_c/libffi/testsuite/libffi.complex/many_complex_float.c +10 -0
  297. data/ext/ffi_c/libffi/testsuite/libffi.complex/many_complex_longdouble.c +10 -0
  298. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex.inc +37 -0
  299. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex1.inc +41 -0
  300. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex1_double.c +10 -0
  301. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex1_float.c +10 -0
  302. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex1_longdouble.c +10 -0
  303. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex2.inc +44 -0
  304. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex2_double.c +10 -0
  305. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex2_float.c +10 -0
  306. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex2_longdouble.c +10 -0
  307. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex_double.c +10 -0
  308. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex_float.c +10 -0
  309. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex_longdouble.c +10 -0
  310. data/ext/ffi_c/libffi/testsuite/libffi.go/aa-direct.c +34 -0
  311. data/ext/ffi_c/libffi/testsuite/libffi.go/closure1.c +28 -0
  312. data/ext/ffi_c/libffi/testsuite/libffi.go/ffitest.h +1 -0
  313. data/ext/ffi_c/libffi/testsuite/libffi.go/go.exp +36 -0
  314. data/ext/ffi_c/libffi/testsuite/libffi.go/static-chain.h +19 -0
  315. data/ffi.gemspec +2 -2
  316. data/lib/ffi/enum.rb +124 -0
  317. data/lib/ffi/library.rb +65 -13
  318. data/lib/ffi/platform.rb +7 -2
  319. data/lib/ffi/platform/sparc64-linux/types.conf +102 -0
  320. data/lib/ffi/platform/x86_64-windows/types.conf +113 -20
  321. data/lib/ffi/pointer.rb +1 -0
  322. data/lib/ffi/struct.rb +0 -2
  323. data/lib/ffi/version.rb +1 -1
  324. data/spec/ffi/bitmask_spec.rb +575 -0
  325. data/spec/ffi/fixtures/BitmaskTest.c +51 -0
  326. data/spec/ffi/rbx/memory_pointer_spec.rb +4 -0
  327. data/spec/ffi/struct_spec.rb +0 -4
  328. metadata +143 -51
  329. data/ext/ffi_c/libffi/Makefile.in +0 -1820
  330. data/ext/ffi_c/libffi/Makefile.vc +0 -141
  331. data/ext/ffi_c/libffi/Makefile.vc64 +0 -141
  332. data/ext/ffi_c/libffi/aclocal.m4 +0 -1873
  333. data/ext/ffi_c/libffi/build-ios.sh +0 -67
  334. data/ext/ffi_c/libffi/compile +0 -143
  335. data/ext/ffi_c/libffi/config.guess +0 -1501
  336. data/ext/ffi_c/libffi/config.sub +0 -1705
  337. data/ext/ffi_c/libffi/configure +0 -17191
  338. data/ext/ffi_c/libffi/depcomp +0 -630
  339. data/ext/ffi_c/libffi/doc/libffi.info +0 -593
  340. data/ext/ffi_c/libffi/doc/stamp-vti +0 -4
  341. data/ext/ffi_c/libffi/fficonfig.h.in +0 -199
  342. data/ext/ffi_c/libffi/include/Makefile.in +0 -487
  343. data/ext/ffi_c/libffi/include/ffi.h.vc +0 -427
  344. data/ext/ffi_c/libffi/include/ffi.h.vc64 +0 -427
  345. data/ext/ffi_c/libffi/install-sh +0 -520
  346. data/ext/ffi_c/libffi/ltmain.sh +0 -9636
  347. data/ext/ffi_c/libffi/m4/libtool.m4 +0 -7831
  348. data/ext/ffi_c/libffi/m4/ltoptions.m4 +0 -369
  349. data/ext/ffi_c/libffi/m4/ltsugar.m4 +0 -123
  350. data/ext/ffi_c/libffi/m4/ltversion.m4 +0 -23
  351. data/ext/ffi_c/libffi/m4/lt~obsolete.m4 +0 -98
  352. data/ext/ffi_c/libffi/man/Makefile.in +0 -466
  353. data/ext/ffi_c/libffi/mdate-sh +0 -201
  354. data/ext/ffi_c/libffi/missing +0 -376
  355. data/ext/ffi_c/libffi/src/arm/gentramp.sh +0 -118
  356. data/ext/ffi_c/libffi/src/arm/trampoline.S +0 -4450
  357. data/ext/ffi_c/libffi/src/x86/darwin.S +0 -444
  358. data/ext/ffi_c/libffi/src/x86/darwin64.S +0 -416
  359. data/ext/ffi_c/libffi/src/x86/freebsd.S +0 -458
  360. data/ext/ffi_c/libffi/src/x86/win32.S +0 -1065
  361. data/ext/ffi_c/libffi/testsuite/Makefile.in +0 -500
  362. data/ext/ffi_c/libffi/testsuite/lib/libffi-dg.exp +0 -300
  363. data/ext/ffi_c/libffi/testsuite/libffi.call/many_win32.c +0 -63
  364. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen_win32.c +0 -44
  365. data/ext/ffi_c/libffi/testsuite/libffi.special/ffitestcxx.h +0 -96
  366. data/ext/ffi_c/libffi/texinfo.tex +0 -7210
@@ -1,5 +1,5 @@
1
1
  /* -----------------------------------------------------------------------
2
- ffi.c - Copyright (c) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Kaz Kojima
2
+ ffi.c - Copyright (c) 2002-2008, 2012 Kaz Kojima
3
3
  Copyright (c) 2008 Red Hat, Inc.
4
4
 
5
5
  SuperH Foreign Function Interface
@@ -41,7 +41,7 @@
41
41
  #define STRUCT_VALUE_ADDRESS_WITH_ARG 0
42
42
  #endif
43
43
 
44
- /* If the structure has essentialy an unique element, return its type. */
44
+ /* If the structure has essentially an unique element, return its type. */
45
45
  static int
46
46
  simple_type (ffi_type *arg)
47
47
  {
@@ -463,7 +463,8 @@ ffi_prep_closure_loc (ffi_closure* closure,
463
463
  unsigned int *tramp;
464
464
  unsigned int insn;
465
465
 
466
- FFI_ASSERT (cif->abi == FFI_GCC_SYSV);
466
+ if (cif->abi != FFI_SYSV)
467
+ return FFI_BAD_ABI;
467
468
 
468
469
  tramp = (unsigned int *) &closure->tramp[0];
469
470
  /* Set T bit if the function returns a struct pointed with R2. */
@@ -1,5 +1,6 @@
1
1
  /* -----------------------------------------------------------------*-C-*-
2
- ffitarget.h - Copyright (c) 1996-2003 Red Hat, Inc.
2
+ ffitarget.h - Copyright (c) 2012 Anthony Green
3
+ Copyright (c) 1996-2003 Red Hat, Inc.
3
4
  Target configuration macros for SuperH.
4
5
 
5
6
  Permission is hereby granted, free of charge, to any person obtaining
@@ -27,6 +28,10 @@
27
28
  #ifndef LIBFFI_TARGET_H
28
29
  #define LIBFFI_TARGET_H
29
30
 
31
+ #ifndef LIBFFI_H
32
+ #error "Please do not include ffitarget.h directly into your source. Use ffi.h instead."
33
+ #endif
34
+
30
35
  /* ---- Generic type definitions ----------------------------------------- */
31
36
 
32
37
  #ifndef LIBFFI_ASM
@@ -1,5 +1,5 @@
1
1
  /* -----------------------------------------------------------------------
2
- ffi.c - Copyright (c) 2003, 2004, 2006, 2007 Kaz Kojima
2
+ ffi.c - Copyright (c) 2003, 2004, 2006, 2007, 2012 Kaz Kojima
3
3
  Copyright (c) 2008 Anthony Green
4
4
 
5
5
  SuperH SHmedia Foreign Function Interface
@@ -302,7 +302,8 @@ ffi_prep_closure_loc (ffi_closure *closure,
302
302
  {
303
303
  unsigned int *tramp;
304
304
 
305
- FFI_ASSERT (cif->abi == FFI_GCC_SYSV);
305
+ if (cif->abi != FFI_SYSV)
306
+ return FFI_BAD_ABI;
306
307
 
307
308
  tramp = (unsigned int *) &closure->tramp[0];
308
309
  /* Since ffi_closure is an aligned object, the ffi trampoline is
@@ -1,5 +1,6 @@
1
1
  /* -----------------------------------------------------------------*-C-*-
2
- ffitarget.h - Copyright (c) 1996-2003 Red Hat, Inc.
2
+ ffitarget.h - Copyright (c) 2012 Anthony Green
3
+ Copyright (c) 1996-2003 Red Hat, Inc.
3
4
  Target configuration macros for SuperH - SHmedia.
4
5
 
5
6
  Permission is hereby granted, free of charge, to any person obtaining
@@ -27,6 +28,10 @@
27
28
  #ifndef LIBFFI_TARGET_H
28
29
  #define LIBFFI_TARGET_H
29
30
 
31
+ #ifndef LIBFFI_H
32
+ #error "Please do not include ffitarget.h directly into your source. Use ffi.h instead."
33
+ #endif
34
+
30
35
  /* ---- Generic type definitions ----------------------------------------- */
31
36
 
32
37
  #ifndef LIBFFI_ASM
@@ -1,5 +1,5 @@
1
1
  /* -----------------------------------------------------------------------
2
- ffi.c - Copyright (c) 2011 Anthony Green
2
+ ffi.c - Copyright (c) 2011, 2013 Anthony Green
3
3
  Copyright (c) 1996, 2003-2004, 2007-2008 Red Hat, Inc.
4
4
 
5
5
  SPARC Foreign Function Interface
@@ -27,643 +27,442 @@
27
27
 
28
28
  #include <ffi.h>
29
29
  #include <ffi_common.h>
30
-
31
30
  #include <stdlib.h>
31
+ #include "internal.h"
32
32
 
33
+ #ifndef SPARC64
33
34
 
34
- /* ffi_prep_args is called by the assembly routine once stack space
35
- has been allocated for the function's arguments */
36
-
37
- void ffi_prep_args_v8(char *stack, extended_cif *ecif)
38
- {
39
- int i;
40
- void **p_argv;
41
- char *argp;
42
- ffi_type **p_arg;
43
-
44
- /* Skip 16 words for the window save area */
45
- argp = stack + 16*sizeof(int);
46
-
47
- /* This should only really be done when we are returning a structure,
48
- however, it's faster just to do it all the time...
49
-
50
- if ( ecif->cif->rtype->type == FFI_TYPE_STRUCT ) */
51
- *(int *) argp = (long)ecif->rvalue;
52
-
53
- /* And 1 word for the structure return value. */
54
- argp += sizeof(int);
55
-
56
- #ifdef USING_PURIFY
57
- /* Purify will probably complain in our assembly routine, unless we
58
- zero out this memory. */
59
-
60
- ((int*)argp)[0] = 0;
61
- ((int*)argp)[1] = 0;
62
- ((int*)argp)[2] = 0;
63
- ((int*)argp)[3] = 0;
64
- ((int*)argp)[4] = 0;
65
- ((int*)argp)[5] = 0;
66
- #endif
67
-
68
- p_argv = ecif->avalue;
69
-
70
- for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types; i; i--, p_arg++)
71
- {
72
- size_t z;
73
-
74
- if ((*p_arg)->type == FFI_TYPE_STRUCT
75
- #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
76
- || (*p_arg)->type == FFI_TYPE_LONGDOUBLE
77
- #endif
78
- )
79
- {
80
- *(unsigned int *) argp = (unsigned long)(* p_argv);
81
- z = sizeof(int);
82
- }
83
- else
84
- {
85
- z = (*p_arg)->size;
86
- if (z < sizeof(int))
87
- {
88
- z = sizeof(int);
89
- switch ((*p_arg)->type)
90
- {
91
- case FFI_TYPE_SINT8:
92
- *(signed int *) argp = *(SINT8 *)(* p_argv);
93
- break;
94
-
95
- case FFI_TYPE_UINT8:
96
- *(unsigned int *) argp = *(UINT8 *)(* p_argv);
97
- break;
98
-
99
- case FFI_TYPE_SINT16:
100
- *(signed int *) argp = *(SINT16 *)(* p_argv);
101
- break;
102
-
103
- case FFI_TYPE_UINT16:
104
- *(unsigned int *) argp = *(UINT16 *)(* p_argv);
105
- break;
106
-
107
- default:
108
- FFI_ASSERT(0);
109
- }
110
- }
111
- else
112
- {
113
- memcpy(argp, *p_argv, z);
114
- }
115
- }
116
- p_argv++;
117
- argp += z;
118
- }
119
-
120
- return;
121
- }
122
-
123
- int ffi_prep_args_v9(char *stack, extended_cif *ecif)
124
- {
125
- int i, ret = 0;
126
- int tmp;
127
- void **p_argv;
128
- char *argp;
129
- ffi_type **p_arg;
130
-
131
- tmp = 0;
132
-
133
- /* Skip 16 words for the window save area */
134
- argp = stack + 16*sizeof(long long);
135
-
136
- #ifdef USING_PURIFY
137
- /* Purify will probably complain in our assembly routine, unless we
138
- zero out this memory. */
139
-
140
- ((long long*)argp)[0] = 0;
141
- ((long long*)argp)[1] = 0;
142
- ((long long*)argp)[2] = 0;
143
- ((long long*)argp)[3] = 0;
144
- ((long long*)argp)[4] = 0;
145
- ((long long*)argp)[5] = 0;
146
- #endif
147
-
148
- p_argv = ecif->avalue;
149
-
150
- if (ecif->cif->rtype->type == FFI_TYPE_STRUCT &&
151
- ecif->cif->rtype->size > 32)
152
- {
153
- *(unsigned long long *) argp = (unsigned long)ecif->rvalue;
154
- argp += sizeof(long long);
155
- tmp = 1;
156
- }
157
-
158
- for (i = 0, p_arg = ecif->cif->arg_types; i < ecif->cif->nargs;
159
- i++, p_arg++)
160
- {
161
- size_t z;
162
-
163
- z = (*p_arg)->size;
164
- switch ((*p_arg)->type)
165
- {
166
- case FFI_TYPE_STRUCT:
167
- if (z > 16)
168
- {
169
- /* For structures larger than 16 bytes we pass reference. */
170
- *(unsigned long long *) argp = (unsigned long)* p_argv;
171
- argp += sizeof(long long);
172
- tmp++;
173
- p_argv++;
174
- continue;
175
- }
176
- /* FALLTHROUGH */
177
- case FFI_TYPE_FLOAT:
178
- case FFI_TYPE_DOUBLE:
35
+ /* Force FFI_TYPE_LONGDOUBLE to be different than FFI_TYPE_DOUBLE;
36
+ all further uses in this file will refer to the 128-bit type. */
179
37
  #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
180
- case FFI_TYPE_LONGDOUBLE:
38
+ # if FFI_TYPE_LONGDOUBLE != 4
39
+ # error FFI_TYPE_LONGDOUBLE out of date
40
+ # endif
41
+ #else
42
+ # undef FFI_TYPE_LONGDOUBLE
43
+ # define FFI_TYPE_LONGDOUBLE 4
181
44
  #endif
182
- ret = 1; /* We should promote into FP regs as well as integer. */
183
- break;
184
- }
185
- if (z < sizeof(long long))
186
- {
187
- switch ((*p_arg)->type)
188
- {
189
- case FFI_TYPE_SINT8:
190
- *(signed long long *) argp = *(SINT8 *)(* p_argv);
191
- break;
192
-
193
- case FFI_TYPE_UINT8:
194
- *(unsigned long long *) argp = *(UINT8 *)(* p_argv);
195
- break;
196
-
197
- case FFI_TYPE_SINT16:
198
- *(signed long long *) argp = *(SINT16 *)(* p_argv);
199
- break;
200
-
201
- case FFI_TYPE_UINT16:
202
- *(unsigned long long *) argp = *(UINT16 *)(* p_argv);
203
- break;
204
-
205
- case FFI_TYPE_SINT32:
206
- *(signed long long *) argp = *(SINT32 *)(* p_argv);
207
- break;
208
-
209
- case FFI_TYPE_UINT32:
210
- *(unsigned long long *) argp = *(UINT32 *)(* p_argv);
211
- break;
212
-
213
- case FFI_TYPE_FLOAT:
214
- *(float *) (argp + 4) = *(FLOAT32 *)(* p_argv); /* Right justify */
215
- break;
216
-
217
- case FFI_TYPE_STRUCT:
218
- memcpy(argp, *p_argv, z);
219
- break;
220
-
221
- default:
222
- FFI_ASSERT(0);
223
- }
224
- z = sizeof(long long);
225
- tmp++;
226
- }
227
- else if (z == sizeof(long long))
228
- {
229
- memcpy(argp, *p_argv, z);
230
- z = sizeof(long long);
231
- tmp++;
232
- }
233
- else
234
- {
235
- if ((tmp & 1) && (*p_arg)->alignment > 8)
236
- {
237
- tmp++;
238
- argp += sizeof(long long);
239
- }
240
- memcpy(argp, *p_argv, z);
241
- z = 2 * sizeof(long long);
242
- tmp += 2;
243
- }
244
- p_argv++;
245
- argp += z;
246
- }
247
-
248
- return ret;
249
- }
250
45
 
251
46
  /* Perform machine dependent cif processing */
252
- ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
47
+ ffi_status FFI_HIDDEN
48
+ ffi_prep_cif_machdep(ffi_cif *cif)
253
49
  {
254
- int wordsize;
255
-
256
- if (cif->abi != FFI_V9)
257
- {
258
- wordsize = 4;
259
-
260
- /* If we are returning a struct, this will already have been added.
261
- Otherwise we need to add it because it's always got to be there! */
262
-
263
- if (cif->rtype->type != FFI_TYPE_STRUCT)
264
- cif->bytes += wordsize;
265
-
266
- /* sparc call frames require that space is allocated for 6 args,
267
- even if they aren't used. Make that space if necessary. */
268
-
269
- if (cif->bytes < 4*6+4)
270
- cif->bytes = 4*6+4;
271
- }
272
- else
273
- {
274
- wordsize = 8;
275
-
276
- /* sparc call frames require that space is allocated for 6 args,
277
- even if they aren't used. Make that space if necessary. */
278
-
279
- if (cif->bytes < 8*6)
280
- cif->bytes = 8*6;
281
- }
282
-
283
- /* Adjust cif->bytes. to include 16 words for the window save area,
284
- and maybe the struct/union return pointer area, */
285
-
286
- cif->bytes += 16 * wordsize;
287
-
288
- /* The stack must be 2 word aligned, so round bytes up
289
- appropriately. */
290
-
291
- cif->bytes = ALIGN(cif->bytes, 2 * wordsize);
50
+ ffi_type *rtype = cif->rtype;
51
+ int rtt = rtype->type;
52
+ size_t bytes;
53
+ int i, n, flags;
292
54
 
293
55
  /* Set the return type flag */
294
- switch (cif->rtype->type)
56
+ switch (rtt)
295
57
  {
296
58
  case FFI_TYPE_VOID:
59
+ flags = SPARC_RET_VOID;
60
+ break;
297
61
  case FFI_TYPE_FLOAT:
62
+ flags = SPARC_RET_F_1;
63
+ break;
298
64
  case FFI_TYPE_DOUBLE:
299
- #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
300
- case FFI_TYPE_LONGDOUBLE:
301
- #endif
302
- cif->flags = cif->rtype->type;
65
+ flags = SPARC_RET_F_2;
303
66
  break;
304
-
67
+ case FFI_TYPE_LONGDOUBLE:
305
68
  case FFI_TYPE_STRUCT:
306
- if (cif->abi == FFI_V9 && cif->rtype->size > 32)
307
- cif->flags = FFI_TYPE_VOID;
308
- else
309
- cif->flags = FFI_TYPE_STRUCT;
69
+ flags = (rtype->size & 0xfff) << SPARC_SIZEMASK_SHIFT;
70
+ flags |= SPARC_RET_STRUCT;
310
71
  break;
311
-
312
72
  case FFI_TYPE_SINT8:
73
+ flags = SPARC_RET_SINT8;
74
+ break;
313
75
  case FFI_TYPE_UINT8:
76
+ flags = SPARC_RET_UINT8;
77
+ break;
314
78
  case FFI_TYPE_SINT16:
79
+ flags = SPARC_RET_SINT16;
80
+ break;
315
81
  case FFI_TYPE_UINT16:
316
- if (cif->abi == FFI_V9)
317
- cif->flags = FFI_TYPE_INT;
318
- else
319
- cif->flags = cif->rtype->type;
82
+ flags = SPARC_RET_UINT16;
83
+ break;
84
+ case FFI_TYPE_INT:
85
+ case FFI_TYPE_SINT32:
86
+ case FFI_TYPE_UINT32:
87
+ case FFI_TYPE_POINTER:
88
+ flags = SPARC_RET_UINT32;
320
89
  break;
321
-
322
90
  case FFI_TYPE_SINT64:
323
91
  case FFI_TYPE_UINT64:
324
- if (cif->abi == FFI_V9)
325
- cif->flags = FFI_TYPE_INT;
326
- else
327
- cif->flags = FFI_TYPE_SINT64;
92
+ flags = SPARC_RET_INT64;
328
93
  break;
329
-
330
- default:
331
- cif->flags = FFI_TYPE_INT;
94
+ case FFI_TYPE_COMPLEX:
95
+ rtt = rtype->elements[0]->type;
96
+ switch (rtt)
97
+ {
98
+ case FFI_TYPE_FLOAT:
99
+ flags = SPARC_RET_F_2;
100
+ break;
101
+ case FFI_TYPE_DOUBLE:
102
+ flags = SPARC_RET_F_4;
103
+ break;
104
+ case FFI_TYPE_LONGDOUBLE:
105
+ flags = SPARC_RET_F_8;
106
+ break;
107
+ case FFI_TYPE_SINT64:
108
+ case FFI_TYPE_UINT64:
109
+ flags = SPARC_RET_INT128;
110
+ break;
111
+ case FFI_TYPE_INT:
112
+ case FFI_TYPE_SINT32:
113
+ case FFI_TYPE_UINT32:
114
+ flags = SPARC_RET_INT64;
115
+ break;
116
+ case FFI_TYPE_SINT16:
117
+ case FFI_TYPE_UINT16:
118
+ flags = SP_V8_RET_CPLX16;
119
+ break;
120
+ case FFI_TYPE_SINT8:
121
+ case FFI_TYPE_UINT8:
122
+ flags = SP_V8_RET_CPLX8;
123
+ break;
124
+ default:
125
+ abort();
126
+ }
332
127
  break;
128
+ default:
129
+ abort();
333
130
  }
334
- return FFI_OK;
335
- }
131
+ cif->flags = flags;
336
132
 
337
- int ffi_v9_layout_struct(ffi_type *arg, int off, char *ret, char *intg, char *flt)
338
- {
339
- ffi_type **ptr = &arg->elements[0];
340
-
341
- while (*ptr != NULL)
133
+ bytes = 0;
134
+ for (i = 0, n = cif->nargs; i < n; ++i)
342
135
  {
343
- if (off & ((*ptr)->alignment - 1))
344
- off = ALIGN(off, (*ptr)->alignment);
136
+ ffi_type *ty = cif->arg_types[i];
137
+ size_t z = ty->size;
138
+ int tt = ty->type;
345
139
 
346
- switch ((*ptr)->type)
140
+ switch (tt)
347
141
  {
348
142
  case FFI_TYPE_STRUCT:
349
- off = ffi_v9_layout_struct(*ptr, off, ret, intg, flt);
350
- off = ALIGN(off, FFI_SIZEOF_ARG);
351
- break;
352
- case FFI_TYPE_FLOAT:
353
- case FFI_TYPE_DOUBLE:
354
- #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
355
143
  case FFI_TYPE_LONGDOUBLE:
356
- #endif
357
- memmove(ret + off, flt + off, (*ptr)->size);
358
- off += (*ptr)->size;
144
+ by_reference:
145
+ /* Passed by reference. */
146
+ z = 4;
359
147
  break;
148
+
149
+ case FFI_TYPE_COMPLEX:
150
+ tt = ty->elements[0]->type;
151
+ if (tt == FFI_TYPE_FLOAT || z > 8)
152
+ goto by_reference;
153
+ /* FALLTHRU */
154
+
360
155
  default:
361
- memmove(ret + off, intg + off, (*ptr)->size);
362
- off += (*ptr)->size;
363
- break;
156
+ z = FFI_ALIGN(z, 4);
364
157
  }
365
- ptr++;
158
+ bytes += z;
366
159
  }
367
- return off;
368
- }
369
160
 
161
+ /* Sparc call frames require that space is allocated for 6 args,
162
+ even if they aren't used. Make that space if necessary. */
163
+ if (bytes < 6 * 4)
164
+ bytes = 6 * 4;
370
165
 
371
- #ifdef SPARC64
372
- extern int ffi_call_v9(void *, extended_cif *, unsigned,
373
- unsigned, unsigned *, void (*fn)(void));
374
- #else
375
- extern int ffi_call_v8(void *, extended_cif *, unsigned,
376
- unsigned, unsigned *, void (*fn)(void));
377
- #endif
166
+ /* The ABI always requires space for the struct return pointer. */
167
+ bytes += 4;
378
168
 
379
- void ffi_call(ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
380
- {
381
- extended_cif ecif;
382
- void *rval = rvalue;
169
+ /* The stack must be 2 word aligned, so round bytes up appropriately. */
170
+ bytes = FFI_ALIGN(bytes, 2 * 4);
171
+
172
+ /* Include the call frame to prep_args. */
173
+ bytes += 4*16 + 4*8;
174
+ cif->bytes = bytes;
383
175
 
384
- ecif.cif = cif;
385
- ecif.avalue = avalue;
176
+ return FFI_OK;
177
+ }
386
178
 
387
- /* If the return value is a struct and we don't have a return */
388
- /* value address then we need to make one */
179
+ extern void ffi_call_v8(ffi_cif *cif, void (*fn)(void), void *rvalue,
180
+ void **avalue, size_t bytes, void *closure) FFI_HIDDEN;
389
181
 
390
- ecif.rvalue = rvalue;
391
- if (cif->rtype->type == FFI_TYPE_STRUCT)
182
+ int FFI_HIDDEN
183
+ ffi_prep_args_v8(ffi_cif *cif, unsigned long *argp, void *rvalue, void **avalue)
184
+ {
185
+ ffi_type **p_arg;
186
+ int flags = cif->flags;
187
+ int i, nargs;
188
+
189
+ if (rvalue == NULL)
392
190
  {
393
- if (cif->rtype->size <= 32)
394
- rval = alloca(64);
191
+ if ((flags & SPARC_FLAG_RET_MASK) == SPARC_RET_STRUCT)
192
+ {
193
+ /* Since we pass the pointer to the callee, we need a value.
194
+ We allowed for this space in ffi_call, before ffi_call_v8
195
+ alloca'd the space. */
196
+ rvalue = (char *)argp + cif->bytes;
197
+ }
395
198
  else
396
199
  {
397
- rval = NULL;
398
- if (rvalue == NULL)
399
- ecif.rvalue = alloca(cif->rtype->size);
200
+ /* Otherwise, we can ignore the return value. */
201
+ flags = SPARC_RET_VOID;
400
202
  }
401
203
  }
402
204
 
403
- switch (cif->abi)
404
- {
405
- case FFI_V8:
406
- #ifdef SPARC64
407
- /* We don't yet support calling 32bit code from 64bit */
408
- FFI_ASSERT(0);
409
- #else
410
- if (rvalue && (cif->rtype->type == FFI_TYPE_STRUCT
411
- #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
412
- || cif->flags == FFI_TYPE_LONGDOUBLE
205
+ /* This could only really be done when we are returning a structure.
206
+ However, the space is reserved so we can do it unconditionally. */
207
+ *argp++ = (unsigned long)rvalue;
208
+
209
+ #ifdef USING_PURIFY
210
+ /* Purify will probably complain in our assembly routine,
211
+ unless we zero out this memory. */
212
+ memset(argp, 0, 6*4);
413
213
  #endif
414
- ))
214
+
215
+ p_arg = cif->arg_types;
216
+ for (i = 0, nargs = cif->nargs; i < nargs; i++)
217
+ {
218
+ ffi_type *ty = p_arg[i];
219
+ void *a = avalue[i];
220
+ int tt = ty->type;
221
+ size_t z;
222
+
223
+ switch (tt)
415
224
  {
416
- /* For v8, we need an "unimp" with size of returning struct */
417
- /* behind "call", so we alloc some executable space for it. */
418
- /* l7 is used, we need to make sure v8.S doesn't use %l7. */
419
- unsigned int *call_struct = NULL;
420
- ffi_closure_alloc(32, &call_struct);
421
- if (call_struct)
225
+ case FFI_TYPE_STRUCT:
226
+ case FFI_TYPE_LONGDOUBLE:
227
+ by_reference:
228
+ *argp++ = (unsigned long)a;
229
+ break;
230
+
231
+ case FFI_TYPE_DOUBLE:
232
+ case FFI_TYPE_UINT64:
233
+ case FFI_TYPE_SINT64:
234
+ memcpy(argp, a, 8);
235
+ argp += 2;
236
+ break;
237
+
238
+ case FFI_TYPE_INT:
239
+ case FFI_TYPE_FLOAT:
240
+ case FFI_TYPE_UINT32:
241
+ case FFI_TYPE_SINT32:
242
+ case FFI_TYPE_POINTER:
243
+ *argp++ = *(unsigned *)a;
244
+ break;
245
+
246
+ case FFI_TYPE_UINT8:
247
+ *argp++ = *(UINT8 *)a;
248
+ break;
249
+ case FFI_TYPE_SINT8:
250
+ *argp++ = *(SINT8 *)a;
251
+ break;
252
+ case FFI_TYPE_UINT16:
253
+ *argp++ = *(UINT16 *)a;
254
+ break;
255
+ case FFI_TYPE_SINT16:
256
+ *argp++ = *(SINT16 *)a;
257
+ break;
258
+
259
+ case FFI_TYPE_COMPLEX:
260
+ tt = ty->elements[0]->type;
261
+ z = ty->size;
262
+ if (tt == FFI_TYPE_FLOAT || z > 8)
263
+ goto by_reference;
264
+ if (z < 4)
422
265
  {
423
- unsigned long f = (unsigned long)fn;
424
- call_struct[0] = 0xae10001f; /* mov %i7, %l7 */
425
- call_struct[1] = 0xbe10000f; /* mov %o7, %i7 */
426
- call_struct[2] = 0x03000000 | f >> 10; /* sethi %hi(fn), %g1 */
427
- call_struct[3] = 0x9fc06000 | (f & 0x3ff); /* jmp %g1+%lo(fn), %o7 */
428
- call_struct[4] = 0x01000000; /* nop */
429
- if (cif->rtype->size < 0x7f)
430
- call_struct[5] = cif->rtype->size; /* unimp */
431
- else
432
- call_struct[5] = 0x01000000; /* nop */
433
- call_struct[6] = 0x81c7e008; /* ret */
434
- call_struct[7] = 0xbe100017; /* mov %l7, %i7 */
435
- asm volatile ("iflush %0; iflush %0+8; iflush %0+16; iflush %0+24" : :
436
- "r" (call_struct) : "memory");
437
- /* SPARC v8 requires 5 instructions for flush to be visible */
438
- asm volatile ("nop; nop; nop; nop; nop");
439
- ffi_call_v8(ffi_prep_args_v8, &ecif, cif->bytes,
440
- cif->flags, rvalue, call_struct);
441
- ffi_closure_free(call_struct);
266
+ memcpy((char *)argp + 4 - z, a, z);
267
+ argp++;
442
268
  }
443
269
  else
444
270
  {
445
- ffi_call_v8(ffi_prep_args_v8, &ecif, cif->bytes,
446
- cif->flags, rvalue, fn);
271
+ memcpy(argp, a, z);
272
+ argp += z / 4;
447
273
  }
274
+ break;
275
+
276
+ default:
277
+ abort();
448
278
  }
449
- else
450
- {
451
- ffi_call_v8(ffi_prep_args_v8, &ecif, cif->bytes,
452
- cif->flags, rvalue, fn);
453
- }
454
- #endif
455
- break;
456
- case FFI_V9:
457
- #ifdef SPARC64
458
- ffi_call_v9(ffi_prep_args_v9, &ecif, cif->bytes,
459
- cif->flags, rval, fn);
460
- if (rvalue && rval && cif->rtype->type == FFI_TYPE_STRUCT)
461
- ffi_v9_layout_struct(cif->rtype, 0, (char *)rvalue, (char *)rval, ((char *)rval)+32);
462
- #else
463
- /* And vice versa */
464
- FFI_ASSERT(0);
465
- #endif
466
- break;
467
- default:
468
- FFI_ASSERT(0);
469
- break;
470
279
  }
280
+
281
+ return flags;
471
282
  }
472
283
 
284
+ static void
285
+ ffi_call_int (ffi_cif *cif, void (*fn)(void), void *rvalue,
286
+ void **avalue, void *closure)
287
+ {
288
+ size_t bytes = cif->bytes;
289
+
290
+ FFI_ASSERT (cif->abi == FFI_V8);
473
291
 
474
- #ifdef SPARC64
475
- extern void ffi_closure_v9(void);
292
+ /* If we've not got a return value, we need to create one if we've
293
+ got to pass the return value to the callee. Otherwise ignore it. */
294
+ if (rvalue == NULL
295
+ && (cif->flags & SPARC_FLAG_RET_MASK) == SPARC_RET_STRUCT)
296
+ bytes += FFI_ALIGN (cif->rtype->size, 8);
297
+
298
+ ffi_call_v8(cif, fn, rvalue, avalue, -bytes, closure);
299
+ }
300
+
301
+ void
302
+ ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
303
+ {
304
+ ffi_call_int (cif, fn, rvalue, avalue, NULL);
305
+ }
306
+
307
+ void
308
+ ffi_call_go (ffi_cif *cif, void (*fn)(void), void *rvalue,
309
+ void **avalue, void *closure)
310
+ {
311
+ ffi_call_int (cif, fn, rvalue, avalue, closure);
312
+ }
313
+
314
+ #ifdef __GNUC__
315
+ static inline void
316
+ ffi_flush_icache (void *p)
317
+ {
318
+ /* SPARC v8 requires 5 instructions for flush to be visible */
319
+ asm volatile ("iflush %0; iflush %0+8; nop; nop; nop; nop; nop"
320
+ : : "r" (p) : "memory");
321
+ }
476
322
  #else
477
- extern void ffi_closure_v8(void);
323
+ extern void ffi_flush_icache (void *) FFI_HIDDEN;
478
324
  #endif
479
325
 
326
+ extern void ffi_closure_v8(void) FFI_HIDDEN;
327
+ extern void ffi_go_closure_v8(void) FFI_HIDDEN;
328
+
480
329
  ffi_status
481
- ffi_prep_closure_loc (ffi_closure* closure,
482
- ffi_cif* cif,
330
+ ffi_prep_closure_loc (ffi_closure *closure,
331
+ ffi_cif *cif,
483
332
  void (*fun)(ffi_cif*, void*, void**, void*),
484
333
  void *user_data,
485
334
  void *codeloc)
486
335
  {
487
336
  unsigned int *tramp = (unsigned int *) &closure->tramp[0];
488
- unsigned long fn;
489
- #ifdef SPARC64
490
- /* Trampoline address is equal to the closure address. We take advantage
491
- of that to reduce the trampoline size by 8 bytes. */
492
- if (cif->abi != FFI_V9)
493
- return FFI_BAD_ABI;
494
- fn = (unsigned long) ffi_closure_v9;
495
- tramp[0] = 0x83414000; /* rd %pc, %g1 */
496
- tramp[1] = 0xca586010; /* ldx [%g1+16], %g5 */
497
- tramp[2] = 0x81c14000; /* jmp %g5 */
498
- tramp[3] = 0x01000000; /* nop */
499
- *((unsigned long *) &tramp[4]) = fn;
500
- #else
501
- unsigned long ctx = (unsigned long) codeloc;
337
+ unsigned long ctx = (unsigned long) closure;
338
+ unsigned long fn = (unsigned long) ffi_closure_v8;
339
+
502
340
  if (cif->abi != FFI_V8)
503
341
  return FFI_BAD_ABI;
504
- fn = (unsigned long) ffi_closure_v8;
342
+
505
343
  tramp[0] = 0x03000000 | fn >> 10; /* sethi %hi(fn), %g1 */
506
344
  tramp[1] = 0x05000000 | ctx >> 10; /* sethi %hi(ctx), %g2 */
507
345
  tramp[2] = 0x81c06000 | (fn & 0x3ff); /* jmp %g1+%lo(fn) */
508
346
  tramp[3] = 0x8410a000 | (ctx & 0x3ff);/* or %g2, %lo(ctx) */
509
- #endif
510
347
 
511
348
  closure->cif = cif;
512
349
  closure->fun = fun;
513
350
  closure->user_data = user_data;
514
351
 
515
- /* Flush the Icache. closure is 8 bytes aligned. */
516
- #ifdef SPARC64
517
- asm volatile ("flush %0; flush %0+8" : : "r" (closure) : "memory");
518
- #else
519
- asm volatile ("iflush %0; iflush %0+8" : : "r" (closure) : "memory");
520
- /* SPARC v8 requires 5 instructions for flush to be visible */
521
- asm volatile ("nop; nop; nop; nop; nop");
522
- #endif
352
+ ffi_flush_icache (closure);
523
353
 
524
354
  return FFI_OK;
525
355
  }
526
356
 
527
- int
528
- ffi_closure_sparc_inner_v8(ffi_closure *closure,
529
- void *rvalue, unsigned long *gpr, unsigned long *scratch)
357
+ ffi_status
358
+ ffi_prep_go_closure (ffi_go_closure *closure, ffi_cif *cif,
359
+ void (*fun)(ffi_cif*, void*, void**, void*))
530
360
  {
531
- ffi_cif *cif;
532
- ffi_type **arg_types;
533
- void **avalue;
534
- int i, argn;
535
-
536
- cif = closure->cif;
537
- arg_types = cif->arg_types;
538
- avalue = alloca(cif->nargs * sizeof(void *));
539
-
540
- /* Copy the caller's structure return address so that the closure
541
- returns the data directly to the caller. */
542
- if (cif->flags == FFI_TYPE_STRUCT
543
- #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
544
- || cif->flags == FFI_TYPE_LONGDOUBLE
545
- #endif
546
- )
547
- rvalue = (void *) gpr[0];
548
-
549
- /* Always skip the structure return address. */
550
- argn = 1;
551
-
552
- /* Grab the addresses of the arguments from the stack frame. */
553
- for (i = 0; i < cif->nargs; i++)
554
- {
555
- if (arg_types[i]->type == FFI_TYPE_STRUCT
556
- #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
557
- || arg_types[i]->type == FFI_TYPE_LONGDOUBLE
558
- #endif
559
- )
560
- {
561
- /* Straight copy of invisible reference. */
562
- avalue[i] = (void *)gpr[argn++];
563
- }
564
- else if ((arg_types[i]->type == FFI_TYPE_DOUBLE
565
- || arg_types[i]->type == FFI_TYPE_SINT64
566
- || arg_types[i]->type == FFI_TYPE_UINT64)
567
- /* gpr is 8-byte aligned. */
568
- && (argn % 2) != 0)
569
- {
570
- /* Align on a 8-byte boundary. */
571
- scratch[0] = gpr[argn];
572
- scratch[1] = gpr[argn+1];
573
- avalue[i] = scratch;
574
- scratch -= 2;
575
- argn += 2;
576
- }
577
- else
578
- {
579
- /* Always right-justify. */
580
- argn += ALIGN(arg_types[i]->size, FFI_SIZEOF_ARG) / FFI_SIZEOF_ARG;
581
- avalue[i] = ((char *) &gpr[argn]) - arg_types[i]->size;
582
- }
583
- }
361
+ if (cif->abi != FFI_V8)
362
+ return FFI_BAD_ABI;
584
363
 
585
- /* Invoke the closure. */
586
- (closure->fun) (cif, rvalue, avalue, closure->user_data);
364
+ closure->tramp = ffi_go_closure_v8;
365
+ closure->cif = cif;
366
+ closure->fun = fun;
587
367
 
588
- /* Tell ffi_closure_sparc how to perform return type promotions. */
589
- return cif->rtype->type;
368
+ return FFI_OK;
590
369
  }
591
370
 
592
- int
593
- ffi_closure_sparc_inner_v9(ffi_closure *closure,
594
- void *rvalue, unsigned long *gpr, double *fpr)
371
+ int FFI_HIDDEN
372
+ ffi_closure_sparc_inner_v8(ffi_cif *cif,
373
+ void (*fun)(ffi_cif*, void*, void**, void*),
374
+ void *user_data, void *rvalue,
375
+ unsigned long *argp)
595
376
  {
596
- ffi_cif *cif;
597
377
  ffi_type **arg_types;
598
378
  void **avalue;
599
- int i, argn, fp_slot_max;
379
+ int i, nargs, flags;
600
380
 
601
- cif = closure->cif;
602
381
  arg_types = cif->arg_types;
603
- avalue = alloca(cif->nargs * sizeof(void *));
382
+ nargs = cif->nargs;
383
+ flags = cif->flags;
384
+ avalue = alloca(nargs * sizeof(void *));
604
385
 
605
386
  /* Copy the caller's structure return address so that the closure
606
- returns the data directly to the caller. */
607
- if (cif->flags == FFI_TYPE_VOID
608
- && cif->rtype->type == FFI_TYPE_STRUCT)
387
+ returns the data directly to the caller. Also install it so we
388
+ can return the address in %o0. */
389
+ if ((flags & SPARC_FLAG_RET_MASK) == SPARC_RET_STRUCT)
609
390
  {
610
- rvalue = (void *) gpr[0];
611
- /* Skip the structure return address. */
612
- argn = 1;
391
+ void *new_rvalue = (void *)*argp;
392
+ *(void **)rvalue = new_rvalue;
393
+ rvalue = new_rvalue;
613
394
  }
614
- else
615
- argn = 0;
616
395
 
617
- fp_slot_max = 16 - argn;
396
+ /* Always skip the structure return address. */
397
+ argp++;
618
398
 
619
399
  /* Grab the addresses of the arguments from the stack frame. */
620
- for (i = 0; i < cif->nargs; i++)
400
+ for (i = 0; i < nargs; i++)
621
401
  {
622
- if (arg_types[i]->type == FFI_TYPE_STRUCT)
402
+ ffi_type *ty = arg_types[i];
403
+ int tt = ty->type;
404
+ void *a = argp;
405
+ size_t z;
406
+
407
+ switch (tt)
623
408
  {
624
- if (arg_types[i]->size > 16)
625
- {
626
- /* Straight copy of invisible reference. */
627
- avalue[i] = (void *)gpr[argn++];
628
- }
629
- else
409
+ case FFI_TYPE_STRUCT:
410
+ case FFI_TYPE_LONGDOUBLE:
411
+ by_reference:
412
+ /* Straight copy of invisible reference. */
413
+ a = (void *)*argp;
414
+ break;
415
+
416
+ case FFI_TYPE_DOUBLE:
417
+ case FFI_TYPE_SINT64:
418
+ case FFI_TYPE_UINT64:
419
+ if ((unsigned long)a & 7)
630
420
  {
631
- /* Left-justify. */
632
- ffi_v9_layout_struct(arg_types[i],
633
- 0,
634
- (char *) &gpr[argn],
635
- (char *) &gpr[argn],
636
- (char *) &fpr[argn]);
637
- avalue[i] = &gpr[argn];
638
- argn += ALIGN(arg_types[i]->size, FFI_SIZEOF_ARG) / FFI_SIZEOF_ARG;
421
+ /* Align on a 8-byte boundary. */
422
+ UINT64 *tmp = alloca(8);
423
+ *tmp = ((UINT64)argp[0] << 32) | argp[1];
424
+ a = tmp;
639
425
  }
640
- }
641
- else
642
- {
643
- /* Right-justify. */
644
- argn += ALIGN(arg_types[i]->size, FFI_SIZEOF_ARG) / FFI_SIZEOF_ARG;
426
+ argp++;
427
+ break;
645
428
 
646
- /* Align on a 16-byte boundary. */
647
- #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
648
- if (arg_types[i]->type == FFI_TYPE_LONGDOUBLE && (argn % 2) != 0)
649
- argn++;
650
- #endif
651
- if (i < fp_slot_max
652
- && (arg_types[i]->type == FFI_TYPE_FLOAT
653
- || arg_types[i]->type == FFI_TYPE_DOUBLE
654
- #if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
655
- || arg_types[i]->type == FFI_TYPE_LONGDOUBLE
656
- #endif
657
- ))
658
- avalue[i] = ((char *) &fpr[argn]) - arg_types[i]->size;
659
- else
660
- avalue[i] = ((char *) &gpr[argn]) - arg_types[i]->size;
429
+ case FFI_TYPE_INT:
430
+ case FFI_TYPE_FLOAT:
431
+ case FFI_TYPE_UINT32:
432
+ case FFI_TYPE_SINT32:
433
+ case FFI_TYPE_POINTER:
434
+ break;
435
+ case FFI_TYPE_UINT16:
436
+ case FFI_TYPE_SINT16:
437
+ a += 2;
438
+ break;
439
+ case FFI_TYPE_UINT8:
440
+ case FFI_TYPE_SINT8:
441
+ a += 3;
442
+ break;
443
+
444
+ case FFI_TYPE_COMPLEX:
445
+ tt = ty->elements[0]->type;
446
+ z = ty->size;
447
+ if (tt == FFI_TYPE_FLOAT || z > 8)
448
+ goto by_reference;
449
+ if (z < 4)
450
+ a += 4 - z;
451
+ else if (z > 4)
452
+ argp++;
453
+ break;
454
+
455
+ default:
456
+ abort();
661
457
  }
458
+ argp++;
459
+ avalue[i] = a;
662
460
  }
663
461
 
664
462
  /* Invoke the closure. */
665
- (closure->fun) (cif, rvalue, avalue, closure->user_data);
463
+ fun (cif, rvalue, avalue, user_data);
666
464
 
667
465
  /* Tell ffi_closure_sparc how to perform return type promotions. */
668
- return cif->rtype->type;
466
+ return flags;
669
467
  }
468
+ #endif /* !SPARC64 */