ffi 1.9.18-x64-mingw32 → 1.9.21-x64-mingw32

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 (384) hide show
  1. checksums.yaml +5 -5
  2. data/README.md +3 -2
  3. data/Rakefile +14 -4
  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/Makefile.in +923 -938
  17. data/ext/ffi_c/libffi/README +164 -52
  18. data/ext/ffi_c/libffi/acinclude.m4 +381 -0
  19. data/ext/ffi_c/libffi/aclocal.m4 +645 -384
  20. data/ext/ffi_c/libffi/autogen.sh +2 -0
  21. data/ext/ffi_c/libffi/autom4te.cache/output.0 +21972 -0
  22. data/ext/ffi_c/libffi/autom4te.cache/output.1 +21972 -0
  23. data/ext/ffi_c/libffi/autom4te.cache/output.2 +21972 -0
  24. data/ext/ffi_c/libffi/autom4te.cache/output.3 +21972 -0
  25. data/ext/ffi_c/libffi/autom4te.cache/requests +331 -0
  26. data/ext/ffi_c/libffi/autom4te.cache/traces.0 +4010 -0
  27. data/ext/ffi_c/libffi/autom4te.cache/traces.1 +1005 -0
  28. data/ext/ffi_c/libffi/autom4te.cache/traces.2 +4010 -0
  29. data/ext/ffi_c/libffi/autom4te.cache/traces.3 +4010 -0
  30. data/ext/ffi_c/libffi/compile +218 -14
  31. data/ext/ffi_c/libffi/config.guess +329 -368
  32. data/ext/ffi_c/libffi/config.sub +232 -112
  33. data/ext/ffi_c/libffi/configure +6970 -2189
  34. data/ext/ffi_c/libffi/configure.ac +148 -256
  35. data/ext/ffi_c/libffi/configure.host +265 -4
  36. data/ext/ffi_c/libffi/depcomp +346 -185
  37. data/ext/ffi_c/libffi/doc/Makefile.am +3 -0
  38. data/ext/ffi_c/libffi/doc/Makefile.in +811 -0
  39. data/ext/ffi_c/libffi/doc/libffi.texi +430 -45
  40. data/ext/ffi_c/libffi/{mdate-sh → doc/mdate-sh} +40 -13
  41. data/ext/ffi_c/libffi/{texinfo.tex → doc/texinfo.tex} +3990 -1121
  42. data/ext/ffi_c/libffi/doc/version.texi +4 -4
  43. data/ext/ffi_c/libffi/fficonfig.h.in +24 -13
  44. data/ext/ffi_c/libffi/fficonfig.h.in~ +210 -0
  45. data/ext/ffi_c/libffi/generate-darwin-source-and-headers.py +207 -0
  46. data/ext/ffi_c/libffi/include/Makefile.am +3 -3
  47. data/ext/ffi_c/libffi/include/Makefile.in +188 -71
  48. data/ext/ffi_c/libffi/include/ffi.h.in +107 -50
  49. data/ext/ffi_c/libffi/include/ffi_cfi.h +55 -0
  50. data/ext/ffi_c/libffi/include/ffi_common.h +32 -11
  51. data/ext/ffi_c/libffi/install-sh +190 -202
  52. data/ext/ffi_c/libffi/libffi.map.in +80 -0
  53. data/ext/ffi_c/libffi/libffi.pc.in +3 -2
  54. data/ext/ffi_c/libffi/libffi.xcodeproj/project.pbxproj +637 -0
  55. data/ext/ffi_c/libffi/libtool-ldflags +106 -0
  56. data/ext/ffi_c/libffi/libtool-version +1 -1
  57. data/ext/ffi_c/libffi/ltmain.sh +3553 -2033
  58. data/ext/ffi_c/libffi/m4/asmcfi.m4 +13 -0
  59. data/ext/ffi_c/libffi/m4/ax_append_flag.m4 +69 -0
  60. data/ext/ffi_c/libffi/m4/ax_cc_maxopt.m4 +13 -8
  61. data/ext/ffi_c/libffi/m4/ax_cflags_warn_all.m4 +31 -104
  62. data/ext/ffi_c/libffi/m4/{ax_check_compiler_flags.m4 → ax_check_compile_flag.m4} +30 -34
  63. data/ext/ffi_c/libffi/m4/ax_compiler_vendor.m4 +32 -11
  64. data/ext/ffi_c/libffi/m4/ax_enable_builddir.m4 +6 -5
  65. data/ext/ffi_c/libffi/m4/ax_gcc_archflag.m4 +31 -21
  66. data/ext/ffi_c/libffi/m4/libtool.m4 +1691 -1135
  67. data/ext/ffi_c/libffi/m4/ltoptions.m4 +104 -36
  68. data/ext/ffi_c/libffi/m4/ltsugar.m4 +4 -3
  69. data/ext/ffi_c/libffi/m4/ltversion.m4 +6 -6
  70. data/ext/ffi_c/libffi/m4/lt~obsolete.m4 +4 -3
  71. data/ext/ffi_c/libffi/man/Makefile.am +2 -2
  72. data/ext/ffi_c/libffi/man/Makefile.in +141 -49
  73. data/ext/ffi_c/libffi/man/ffi.3 +10 -0
  74. data/ext/ffi_c/libffi/man/ffi_prep_cif.3 +6 -4
  75. data/ext/ffi_c/libffi/man/ffi_prep_cif_var.3 +73 -0
  76. data/ext/ffi_c/libffi/missing +150 -311
  77. data/ext/ffi_c/libffi/msvcc.sh +72 -9
  78. data/ext/ffi_c/libffi/src/aarch64/ffi.c +941 -0
  79. data/ext/ffi_c/libffi/src/aarch64/ffitarget.h +81 -0
  80. data/ext/ffi_c/libffi/src/aarch64/internal.h +67 -0
  81. data/ext/ffi_c/libffi/src/aarch64/sysv.S +438 -0
  82. data/ext/ffi_c/libffi/src/alpha/ffi.c +335 -98
  83. data/ext/ffi_c/libffi/src/alpha/ffitarget.h +10 -1
  84. data/ext/ffi_c/libffi/src/alpha/internal.h +23 -0
  85. data/ext/ffi_c/libffi/src/alpha/osf.S +161 -266
  86. data/ext/ffi_c/libffi/src/arc/arcompact.S +135 -0
  87. data/ext/ffi_c/libffi/src/arc/ffi.c +266 -0
  88. data/ext/ffi_c/libffi/src/arc/ffitarget.h +53 -0
  89. data/ext/ffi_c/libffi/src/arm/ffi.c +597 -517
  90. data/ext/ffi_c/libffi/src/arm/ffitarget.h +24 -7
  91. data/ext/ffi_c/libffi/src/arm/internal.h +7 -0
  92. data/ext/ffi_c/libffi/src/arm/sysv.S +303 -417
  93. data/ext/ffi_c/libffi/src/avr32/ffitarget.h +6 -1
  94. data/ext/ffi_c/libffi/src/bfin/ffi.c +196 -0
  95. data/ext/ffi_c/libffi/src/bfin/ffitarget.h +43 -0
  96. data/ext/ffi_c/libffi/src/bfin/sysv.S +179 -0
  97. data/ext/ffi_c/libffi/src/closures.c +319 -44
  98. data/ext/ffi_c/libffi/src/cris/ffi.c +10 -7
  99. data/ext/ffi_c/libffi/src/cris/ffitarget.h +6 -1
  100. data/ext/ffi_c/libffi/src/debug.c +6 -1
  101. data/ext/ffi_c/libffi/src/dlmalloc.c +16 -11
  102. data/ext/ffi_c/libffi/src/frv/ffi.c +1 -1
  103. data/ext/ffi_c/libffi/src/frv/ffitarget.h +6 -1
  104. data/ext/ffi_c/libffi/src/ia64/ffi.c +11 -7
  105. data/ext/ffi_c/libffi/src/ia64/ffitarget.h +6 -1
  106. data/ext/ffi_c/libffi/src/java_raw_api.c +23 -5
  107. data/ext/ffi_c/libffi/src/m32r/ffi.c +1 -1
  108. data/ext/ffi_c/libffi/src/m32r/ffitarget.h +6 -1
  109. data/ext/ffi_c/libffi/src/m68k/ffi.c +87 -13
  110. data/ext/ffi_c/libffi/src/m68k/ffitarget.h +6 -1
  111. data/ext/ffi_c/libffi/src/m68k/sysv.S +119 -32
  112. data/ext/ffi_c/libffi/src/m88k/ffi.c +400 -0
  113. data/ext/ffi_c/libffi/src/m88k/ffitarget.h +49 -0
  114. data/ext/ffi_c/libffi/src/m88k/obsd.S +209 -0
  115. data/ext/ffi_c/libffi/src/metag/ffi.c +330 -0
  116. data/ext/ffi_c/libffi/{fficonfig.hw → src/metag/ffitarget.h} +22 -26
  117. data/ext/ffi_c/libffi/src/metag/sysv.S +311 -0
  118. data/ext/ffi_c/libffi/src/microblaze/ffi.c +321 -0
  119. data/ext/ffi_c/libffi/src/microblaze/ffitarget.h +53 -0
  120. data/ext/ffi_c/libffi/src/microblaze/sysv.S +302 -0
  121. data/ext/ffi_c/libffi/src/mips/ffi.c +95 -28
  122. data/ext/ffi_c/libffi/src/mips/ffitarget.h +9 -2
  123. data/ext/ffi_c/libffi/src/mips/n32.S +126 -56
  124. data/ext/ffi_c/libffi/src/mips/o32.S +148 -27
  125. data/ext/ffi_c/libffi/src/moxie/eabi.S +55 -82
  126. data/ext/ffi_c/libffi/src/moxie/ffi.c +40 -44
  127. data/ext/ffi_c/libffi/src/moxie/ffitarget.h +52 -0
  128. data/ext/ffi_c/libffi/src/nios2/ffi.c +304 -0
  129. data/ext/ffi_c/libffi/src/nios2/ffitarget.h +52 -0
  130. data/ext/ffi_c/libffi/src/nios2/sysv.S +136 -0
  131. data/ext/ffi_c/libffi/src/or1k/ffi.c +328 -0
  132. data/ext/ffi_c/libffi/src/or1k/ffitarget.h +58 -0
  133. data/ext/ffi_c/libffi/src/or1k/sysv.S +107 -0
  134. data/ext/ffi_c/libffi/src/pa/ffitarget.h +8 -1
  135. data/ext/ffi_c/libffi/src/powerpc/aix.S +6 -6
  136. data/ext/ffi_c/libffi/src/powerpc/aix_closure.S +3 -1
  137. data/ext/ffi_c/libffi/src/powerpc/asm.h +2 -2
  138. data/ext/ffi_c/libffi/src/powerpc/darwin.S +2 -7
  139. data/ext/ffi_c/libffi/src/powerpc/darwin_closure.S +22 -26
  140. data/ext/ffi_c/libffi/src/powerpc/ffi.c +103 -1378
  141. data/ext/ffi_c/libffi/src/powerpc/ffi_darwin.c +25 -25
  142. data/ext/ffi_c/libffi/src/powerpc/ffi_linux64.c +945 -0
  143. data/ext/ffi_c/libffi/src/powerpc/ffi_powerpc.h +94 -0
  144. data/ext/ffi_c/libffi/src/powerpc/ffi_sysv.c +923 -0
  145. data/ext/ffi_c/libffi/src/powerpc/ffitarget.h +100 -44
  146. data/ext/ffi_c/libffi/src/powerpc/linux64.S +100 -59
  147. data/ext/ffi_c/libffi/src/powerpc/linux64_closure.S +360 -108
  148. data/ext/ffi_c/libffi/src/powerpc/ppc_closure.S +138 -68
  149. data/ext/ffi_c/libffi/src/powerpc/sysv.S +68 -112
  150. data/ext/ffi_c/libffi/src/prep_cif.c +108 -24
  151. data/ext/ffi_c/libffi/src/raw_api.c +18 -5
  152. data/ext/ffi_c/libffi/src/s390/ffi.c +294 -318
  153. data/ext/ffi_c/libffi/src/s390/ffitarget.h +9 -1
  154. data/ext/ffi_c/libffi/src/s390/internal.h +11 -0
  155. data/ext/ffi_c/libffi/src/s390/sysv.S +257 -366
  156. data/ext/ffi_c/libffi/src/sh/ffi.c +4 -3
  157. data/ext/ffi_c/libffi/src/sh/ffitarget.h +6 -1
  158. data/ext/ffi_c/libffi/src/sh64/ffi.c +3 -2
  159. data/ext/ffi_c/libffi/src/sh64/ffitarget.h +6 -1
  160. data/ext/ffi_c/libffi/src/sparc/ffi.c +326 -527
  161. data/ext/ffi_c/libffi/src/sparc/ffi64.c +608 -0
  162. data/ext/ffi_c/libffi/src/sparc/ffitarget.h +20 -7
  163. data/ext/ffi_c/libffi/src/sparc/internal.h +26 -0
  164. data/ext/ffi_c/libffi/src/sparc/v8.S +364 -234
  165. data/ext/ffi_c/libffi/src/sparc/v9.S +340 -207
  166. data/ext/ffi_c/libffi/src/tile/ffi.c +355 -0
  167. data/ext/ffi_c/libffi/src/tile/ffitarget.h +65 -0
  168. data/ext/ffi_c/libffi/src/tile/tile.S +360 -0
  169. data/ext/ffi_c/libffi/src/types.c +43 -14
  170. data/ext/ffi_c/libffi/src/vax/elfbsd.S +195 -0
  171. data/ext/ffi_c/libffi/src/vax/ffi.c +276 -0
  172. data/ext/ffi_c/libffi/src/vax/ffitarget.h +49 -0
  173. data/ext/ffi_c/libffi/src/x86/asmnames.h +30 -0
  174. data/ext/ffi_c/libffi/src/x86/ffi.c +589 -500
  175. data/ext/ffi_c/libffi/src/x86/ffi64.c +338 -116
  176. data/ext/ffi_c/libffi/src/x86/ffitarget.h +55 -35
  177. data/ext/ffi_c/libffi/src/x86/ffiw64.c +287 -0
  178. data/ext/ffi_c/libffi/src/x86/internal.h +29 -0
  179. data/ext/ffi_c/libffi/src/x86/internal64.h +22 -0
  180. data/ext/ffi_c/libffi/src/x86/sysv.S +975 -400
  181. data/ext/ffi_c/libffi/src/x86/unix64.S +398 -299
  182. data/ext/ffi_c/libffi/src/x86/win64.S +222 -458
  183. data/ext/ffi_c/libffi/src/x86/win64_intel.S +237 -0
  184. data/ext/ffi_c/libffi/src/xtensa/ffi.c +298 -0
  185. data/ext/ffi_c/libffi/src/xtensa/ffitarget.h +53 -0
  186. data/ext/ffi_c/libffi/src/xtensa/sysv.S +253 -0
  187. data/ext/ffi_c/libffi/stamp-h.in +1 -0
  188. data/ext/ffi_c/libffi/testsuite/Makefile.am +78 -73
  189. data/ext/ffi_c/libffi/testsuite/Makefile.in +218 -111
  190. data/ext/ffi_c/libffi/testsuite/lib/libffi.exp +120 -25
  191. data/ext/ffi_c/libffi/testsuite/lib/target-libpath.exp +21 -1
  192. data/ext/ffi_c/libffi/testsuite/libffi.call/align_mixed.c +46 -0
  193. data/ext/ffi_c/libffi/testsuite/libffi.call/call.exp +4 -6
  194. data/ext/ffi_c/libffi/testsuite/libffi.call/{closure_stdcall.c → closure_simple.c} +7 -16
  195. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_12byte.c +4 -4
  196. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_16byte.c +4 -4
  197. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_18byte.c +4 -4
  198. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_19byte.c +4 -4
  199. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_1_1byte.c +4 -4
  200. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_20byte.c +4 -4
  201. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_20byte1.c +4 -4
  202. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_24byte.c +5 -5
  203. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_2byte.c +4 -4
  204. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_3_1byte.c +4 -4
  205. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_3byte1.c +4 -4
  206. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_3byte2.c +4 -4
  207. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_4_1byte.c +4 -4
  208. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_4byte.c +4 -4
  209. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_5_1_byte.c +4 -4
  210. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_5byte.c +4 -4
  211. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_64byte.c +5 -5
  212. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_6_1_byte.c +4 -4
  213. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_6byte.c +4 -4
  214. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_7_1_byte.c +4 -4
  215. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_7byte.c +4 -4
  216. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_8byte.c +4 -4
  217. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_9byte1.c +4 -4
  218. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_9byte2.c +4 -4
  219. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_double.c +4 -4
  220. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_float.c +4 -4
  221. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_longdouble.c +4 -4
  222. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_longdouble_split.c +4 -6
  223. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_longdouble_split2.c +4 -6
  224. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_pointer.c +4 -4
  225. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_sint16.c +4 -4
  226. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_sint32.c +4 -4
  227. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_sint64.c +4 -4
  228. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_uint16.c +4 -4
  229. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_uint32.c +4 -4
  230. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_align_uint64.c +4 -4
  231. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_dbls_struct.c +4 -4
  232. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_double_va.c +10 -9
  233. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_longdouble.c +3 -3
  234. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_longdouble_va.c +10 -9
  235. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_many_mixed_args.c +70 -0
  236. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_many_mixed_float_double.c +55 -0
  237. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_pointer.c +1 -1
  238. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_pointer_stack.c +11 -9
  239. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_struct_va1.c +114 -0
  240. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_uchar_va.c +44 -0
  241. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_uint_va.c +45 -0
  242. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_ulong_va.c +45 -0
  243. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_ulonglong.c +5 -5
  244. data/ext/ffi_c/libffi/testsuite/libffi.call/cls_ushort_va.c +44 -0
  245. data/ext/ffi_c/libffi/testsuite/libffi.call/err_bad_typedef.c +2 -2
  246. data/ext/ffi_c/libffi/testsuite/libffi.call/ffitest.h +23 -40
  247. data/ext/ffi_c/libffi/testsuite/libffi.call/float1.c +3 -1
  248. data/ext/ffi_c/libffi/testsuite/libffi.call/float2.c +6 -4
  249. data/ext/ffi_c/libffi/testsuite/libffi.call/float3.c +4 -2
  250. data/ext/ffi_c/libffi/testsuite/libffi.call/float_va.c +107 -0
  251. data/ext/ffi_c/libffi/testsuite/libffi.call/huge_struct.c +18 -19
  252. data/ext/ffi_c/libffi/testsuite/libffi.call/many.c +6 -16
  253. data/ext/ffi_c/libffi/testsuite/libffi.call/many2.c +57 -0
  254. data/ext/ffi_c/libffi/testsuite/libffi.call/many_double.c +70 -0
  255. data/ext/ffi_c/libffi/testsuite/libffi.call/many_mixed.c +78 -0
  256. data/ext/ffi_c/libffi/testsuite/libffi.call/negint.c +0 -1
  257. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct.c +6 -6
  258. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct1.c +8 -8
  259. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct10.c +6 -6
  260. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct11.c +121 -0
  261. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct2.c +5 -5
  262. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct3.c +5 -5
  263. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct4.c +5 -5
  264. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct5.c +5 -5
  265. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct6.c +6 -6
  266. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct7.c +5 -5
  267. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct8.c +6 -6
  268. data/ext/ffi_c/libffi/testsuite/libffi.call/nested_struct9.c +6 -6
  269. data/ext/ffi_c/libffi/testsuite/libffi.call/offsets.c +46 -0
  270. data/ext/ffi_c/libffi/testsuite/libffi.call/pr1172638.c +127 -0
  271. data/ext/ffi_c/libffi/testsuite/libffi.call/return_dbl.c +1 -0
  272. data/ext/ffi_c/libffi/testsuite/libffi.call/return_ldl.c +1 -1
  273. data/ext/ffi_c/libffi/testsuite/libffi.call/return_sc.c +1 -1
  274. data/ext/ffi_c/libffi/testsuite/libffi.call/return_uc.c +1 -1
  275. data/ext/ffi_c/libffi/testsuite/libffi.call/stret_large.c +7 -7
  276. data/ext/ffi_c/libffi/testsuite/libffi.call/stret_large2.c +7 -7
  277. data/ext/ffi_c/libffi/testsuite/libffi.call/stret_medium.c +5 -5
  278. data/ext/ffi_c/libffi/testsuite/libffi.call/stret_medium2.c +5 -5
  279. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen.c +2 -2
  280. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen2.c +49 -0
  281. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen3.c +49 -0
  282. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen4.c +55 -0
  283. data/ext/ffi_c/libffi/testsuite/libffi.call/struct1.c +9 -7
  284. data/ext/ffi_c/libffi/testsuite/libffi.call/struct2.c +7 -7
  285. data/ext/ffi_c/libffi/testsuite/libffi.call/struct3.c +7 -6
  286. data/ext/ffi_c/libffi/testsuite/libffi.call/struct4.c +9 -8
  287. data/ext/ffi_c/libffi/testsuite/libffi.call/struct5.c +9 -8
  288. data/ext/ffi_c/libffi/testsuite/libffi.call/struct6.c +9 -9
  289. data/ext/ffi_c/libffi/testsuite/libffi.call/struct7.c +9 -9
  290. data/ext/ffi_c/libffi/testsuite/libffi.call/struct8.c +9 -8
  291. data/ext/ffi_c/libffi/testsuite/libffi.call/struct9.c +9 -8
  292. data/ext/ffi_c/libffi/testsuite/libffi.call/testclosure.c +2 -2
  293. data/ext/ffi_c/libffi/testsuite/libffi.call/uninitialized.c +61 -0
  294. data/ext/ffi_c/libffi/testsuite/{libffi.special → libffi.call}/unwindtest.cc +3 -10
  295. data/ext/ffi_c/libffi/testsuite/{libffi.special → libffi.call}/unwindtest_ffi_call.cc +2 -1
  296. data/ext/ffi_c/libffi/testsuite/libffi.call/va_1.c +196 -0
  297. data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct1.c +121 -0
  298. data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct2.c +123 -0
  299. data/ext/ffi_c/libffi/testsuite/libffi.call/va_struct3.c +125 -0
  300. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_align_complex.inc +91 -0
  301. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_align_complex_double.c +10 -0
  302. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_align_complex_float.c +10 -0
  303. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_align_complex_longdouble.c +10 -0
  304. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex.inc +42 -0
  305. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_double.c +10 -0
  306. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_float.c +10 -0
  307. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_longdouble.c +10 -0
  308. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_struct.inc +71 -0
  309. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_struct_double.c +10 -0
  310. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_struct_float.c +10 -0
  311. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_struct_longdouble.c +10 -0
  312. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_va.inc +80 -0
  313. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_va_double.c +10 -0
  314. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_va_float.c +16 -0
  315. data/ext/ffi_c/libffi/testsuite/libffi.complex/cls_complex_va_longdouble.c +10 -0
  316. data/ext/ffi_c/libffi/testsuite/{libffi.special/special.exp → libffi.complex/complex.exp} +9 -8
  317. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex.inc +51 -0
  318. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex_defs_double.inc +7 -0
  319. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex_defs_float.inc +7 -0
  320. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex_defs_longdouble.inc +7 -0
  321. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex_double.c +10 -0
  322. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex_float.c +10 -0
  323. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex_int.c +86 -0
  324. data/ext/ffi_c/libffi/testsuite/libffi.complex/complex_longdouble.c +10 -0
  325. data/ext/ffi_c/libffi/testsuite/libffi.complex/ffitest.h +1 -0
  326. data/ext/ffi_c/libffi/testsuite/libffi.complex/many_complex.inc +78 -0
  327. data/ext/ffi_c/libffi/testsuite/libffi.complex/many_complex_double.c +10 -0
  328. data/ext/ffi_c/libffi/testsuite/libffi.complex/many_complex_float.c +10 -0
  329. data/ext/ffi_c/libffi/testsuite/libffi.complex/many_complex_longdouble.c +10 -0
  330. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex.inc +37 -0
  331. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex1.inc +41 -0
  332. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex1_double.c +10 -0
  333. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex1_float.c +10 -0
  334. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex1_longdouble.c +10 -0
  335. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex2.inc +44 -0
  336. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex2_double.c +10 -0
  337. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex2_float.c +10 -0
  338. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex2_longdouble.c +10 -0
  339. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex_double.c +10 -0
  340. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex_float.c +10 -0
  341. data/ext/ffi_c/libffi/testsuite/libffi.complex/return_complex_longdouble.c +10 -0
  342. data/ext/ffi_c/libffi/testsuite/libffi.go/aa-direct.c +34 -0
  343. data/ext/ffi_c/libffi/testsuite/libffi.go/closure1.c +28 -0
  344. data/ext/ffi_c/libffi/testsuite/libffi.go/ffitest.h +1 -0
  345. data/ext/ffi_c/libffi/testsuite/libffi.go/go.exp +36 -0
  346. data/ext/ffi_c/libffi/testsuite/libffi.go/static-chain.h +19 -0
  347. data/ffi.gemspec +2 -2
  348. data/lib/2.0/ffi_c.so +0 -0
  349. data/lib/2.1/ffi_c.so +0 -0
  350. data/lib/2.2/ffi_c.so +0 -0
  351. data/lib/2.3/ffi_c.so +0 -0
  352. data/lib/2.4/ffi_c.so +0 -0
  353. data/lib/2.5/ffi_c.so +0 -0
  354. data/lib/ffi/enum.rb +124 -0
  355. data/lib/ffi/library.rb +65 -13
  356. data/lib/ffi/platform.rb +7 -2
  357. data/lib/ffi/platform/sparc64-linux/types.conf +102 -0
  358. data/lib/ffi/platform/x86_64-windows/types.conf +113 -20
  359. data/lib/ffi/pointer.rb +1 -0
  360. data/lib/ffi/struct.rb +0 -2
  361. data/lib/ffi/version.rb +1 -1
  362. data/spec/ffi/bitmask_spec.rb +575 -0
  363. data/spec/ffi/embed-test/ext/Makefile +242 -0
  364. data/spec/ffi/fixtures/BitmaskTest.c +51 -0
  365. data/spec/ffi/rbx/memory_pointer_spec.rb +4 -0
  366. data/spec/ffi/struct_spec.rb +0 -4
  367. metadata +158 -32
  368. data/ext/ffi_c/libffi/Makefile.vc +0 -141
  369. data/ext/ffi_c/libffi/Makefile.vc64 +0 -141
  370. data/ext/ffi_c/libffi/build-ios.sh +0 -67
  371. data/ext/ffi_c/libffi/doc/libffi.info +0 -593
  372. data/ext/ffi_c/libffi/doc/stamp-vti +0 -4
  373. data/ext/ffi_c/libffi/include/ffi.h.vc +0 -427
  374. data/ext/ffi_c/libffi/include/ffi.h.vc64 +0 -427
  375. data/ext/ffi_c/libffi/src/arm/gentramp.sh +0 -118
  376. data/ext/ffi_c/libffi/src/arm/trampoline.S +0 -4450
  377. data/ext/ffi_c/libffi/src/x86/darwin.S +0 -444
  378. data/ext/ffi_c/libffi/src/x86/darwin64.S +0 -416
  379. data/ext/ffi_c/libffi/src/x86/freebsd.S +0 -458
  380. data/ext/ffi_c/libffi/src/x86/win32.S +0 -1065
  381. data/ext/ffi_c/libffi/testsuite/lib/libffi-dg.exp +0 -300
  382. data/ext/ffi_c/libffi/testsuite/libffi.call/many_win32.c +0 -63
  383. data/ext/ffi_c/libffi/testsuite/libffi.call/strlen_win32.c +0 -44
  384. data/ext/ffi_c/libffi/testsuite/libffi.special/ffitestcxx.h +0 -96
@@ -1,7 +1,7 @@
1
1
  /* -----------------------------------------------------------------------
2
- eabi.S - Copyright (c) 2004 Anthony Green
2
+ eabi.S - Copyright (c) 2012, 2013 Anthony Green
3
3
 
4
- FR-V Assembly glue.
4
+ Moxie Assembly glue.
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
@@ -34,95 +34,68 @@
34
34
  .globl ffi_call_EABI
35
35
  .type ffi_call_EABI, @function
36
36
 
37
- # gr8 : ffi_prep_args
38
- # gr9 : &ecif
39
- # gr10: cif->bytes
40
- # gr11: fig->flags
41
- # gr12: ecif.rvalue
42
- # gr13: fn
37
+ # $r0 : ffi_prep_args
38
+ # $r1 : &ecif
39
+ # $r2 : cif->bytes
40
+ # $r3 : fig->flags
41
+ # $r4 : ecif.rvalue
42
+ # $r5 : fn
43
43
 
44
- ffi_call_EABI:
45
- addi sp, #-80, sp
46
- sti fp, @(sp, #24)
47
- addi sp, #24, fp
48
- movsg lr, gr5
44
+ ffi_call_EABI:
45
+ push $sp, $r6
46
+ push $sp, $r7
47
+ push $sp, $r8
48
+ dec $sp, 24
49
49
 
50
- /* Make room for the new arguments. */
51
- /* subi sp, fp, gr10 */
52
-
53
- /* Store return address and incoming args on stack. */
54
- sti gr5, @(fp, #8)
55
- sti gr8, @(fp, #-4)
56
- sti gr9, @(fp, #-8)
57
- sti gr10, @(fp, #-12)
58
- sti gr11, @(fp, #-16)
59
- sti gr12, @(fp, #-20)
60
- sti gr13, @(fp, #-24)
61
-
62
- sub sp, gr10, sp
50
+ /* Store incoming args on stack. */
51
+ sto.l 0($sp), $r0 /* ffi_prep_args */
52
+ sto.l 4($sp), $r1 /* ecif */
53
+ sto.l 8($sp), $r2 /* bytes */
54
+ sto.l 12($sp), $r3 /* flags */
55
+ sto.l 16($sp), $r4 /* &rvalue */
56
+ sto.l 20($sp), $r5 /* fn */
63
57
 
64
58
  /* Call ffi_prep_args. */
65
- ldi @(fp, #-4), gr4
66
- addi sp, #0, gr8
67
- ldi @(fp, #-8), gr9
68
- #ifdef __FRV_FDPIC__
69
- ldd @(gr4, gr0), gr14
70
- calll @(gr14, gr0)
71
- #else
72
- calll @(gr4, gr0)
73
- #endif
74
-
75
- /* ffi_prep_args returns the new stack pointer. */
76
- mov gr8, gr4
77
-
78
- ldi @(sp, #0), gr8
79
- ldi @(sp, #4), gr9
80
- ldi @(sp, #8), gr10
81
- ldi @(sp, #12), gr11
82
- ldi @(sp, #16), gr12
83
- ldi @(sp, #20), gr13
59
+ mov $r6, $r4 /* Save result buffer */
60
+ mov $r7, $r5 /* Save the target fn */
61
+ mov $r8, $r3 /* Save the flags */
62
+ sub.l $sp, $r2 /* Allocate stack space */
63
+ mov $r0, $sp /* We can stomp over $r0 */
64
+ /* $r1 is already set up */
65
+ jsra ffi_prep_args
84
66
 
85
- /* Always copy the return value pointer into the hidden
86
- parameter register. This is only strictly necessary
87
- when we're returning an aggregate type, but it doesn't
88
- hurt to do this all the time, and it saves a branch. */
89
- ldi @(fp, #-20), gr3
90
-
91
- /* Use the ffi_prep_args return value for the new sp. */
92
- mov gr4, sp
67
+ /* Load register arguments. */
68
+ ldo.l $r0, 0($sp)
69
+ ldo.l $r1, 4($sp)
70
+ ldo.l $r2, 8($sp)
71
+ ldo.l $r3, 12($sp)
72
+ ldo.l $r4, 16($sp)
73
+ ldo.l $r5, 20($sp)
93
74
 
94
75
  /* Call the target function. */
95
- ldi @(fp, -24), gr4
96
- #ifdef __FRV_FDPIC__
97
- ldd @(gr4, gr0), gr14
98
- calll @(gr14, gr0)
99
- #else
100
- calll @(gr4, gr0)
101
- #endif
76
+ jsr $r7
77
+
78
+ ldi.l $r7, 0xffffffff
79
+ cmp $r8, $r7
80
+ beq retstruct
81
+
82
+ ldi.l $r7, 4
83
+ cmp $r8, $r7
84
+ bgt ret2reg
102
85
 
103
- /* Store the result. */
104
- ldi @(fp, #-16), gr10 /* fig->flags */
105
- ldi @(fp, #-20), gr4 /* ecif.rvalue */
86
+ st.l ($r6), $r0
87
+ jmpa retdone
106
88
 
107
- /* Is the return value stored in two registers? */
108
- cmpi gr10, #8, icc0
109
- bne icc0, 0, .L2
110
- /* Yes, save them. */
111
- sti gr8, @(gr4, #0)
112
- sti gr9, @(gr4, #4)
113
- bra .L3
114
- .L2:
115
- /* Is the return value a structure? */
116
- cmpi gr10, #-1, icc0
117
- beq icc0, 0, .L3
118
- /* No, save a 4 byte return value. */
119
- sti gr8, @(gr4, #0)
120
- .L3:
89
+ ret2reg:
90
+ st.l ($r6), $r0
91
+ sto.l 4($r6), $r1
121
92
 
122
- /* Restore the stack, and return. */
123
- ldi @(fp, 8), gr5
124
- ld @(fp, gr0), fp
125
- addi sp,#80,sp
126
- jmpl @(gr5,gr0)
93
+ retstruct:
94
+ retdone:
95
+ /* Return. */
96
+ ldo.l $r6, -4($fp)
97
+ ldo.l $r7, -8($fp)
98
+ ldo.l $r8, -12($fp)
99
+ ret
127
100
  .size ffi_call_EABI, .-ffi_call_EABI
128
101
 
@@ -1,5 +1,5 @@
1
1
  /* -----------------------------------------------------------------------
2
- ffi.c - Copyright (C) 2009 Anthony Green
2
+ ffi.c - Copyright (C) 2012, 2013 Anthony Green
3
3
 
4
4
  Moxie Foreign Function Interface
5
5
 
@@ -43,6 +43,12 @@ void *ffi_prep_args(char *stack, extended_cif *ecif)
43
43
  p_argv = ecif->avalue;
44
44
  argp = stack;
45
45
 
46
+ if (ecif->cif->rtype->type == FFI_TYPE_STRUCT)
47
+ {
48
+ *(void **) argp = ecif->rvalue;
49
+ argp += 4;
50
+ }
51
+
46
52
  for (i = ecif->cif->nargs, p_arg = ecif->cif->arg_types;
47
53
  (i != 0);
48
54
  i--, p_arg++)
@@ -56,17 +62,6 @@ void *ffi_prep_args(char *stack, extended_cif *ecif)
56
62
  z = sizeof(void*);
57
63
  *(void **) argp = *p_argv;
58
64
  }
59
- /* if ((*p_arg)->type == FFI_TYPE_FLOAT)
60
- {
61
- if (count > 24)
62
- {
63
- // This is going on the stack. Turn it into a double.
64
- *(double *) argp = (double) *(float*)(* p_argv);
65
- z = sizeof(double);
66
- }
67
- else
68
- *(void **) argp = *(void **)(* p_argv);
69
- } */
70
65
  else if (z < sizeof(int))
71
66
  {
72
67
  z = sizeof(int);
@@ -116,7 +111,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
116
111
  else
117
112
  cif->flags = cif->rtype->size;
118
113
 
119
- cif->bytes = ALIGN (cif->bytes, 8);
114
+ cif->bytes = FFI_ALIGN (cif->bytes, 8);
120
115
 
121
116
  return FFI_OK;
122
117
  }
@@ -147,8 +142,7 @@ void ffi_call(ffi_cif *cif,
147
142
  }
148
143
  else
149
144
  ecif.rvalue = rvalue;
150
-
151
-
145
+
152
146
  switch (cif->abi)
153
147
  {
154
148
  case FFI_EABI:
@@ -165,19 +159,25 @@ void ffi_closure_eabi (unsigned arg1, unsigned arg2, unsigned arg3,
165
159
  unsigned arg4, unsigned arg5, unsigned arg6)
166
160
  {
167
161
  /* This function is called by a trampoline. The trampoline stows a
168
- pointer to the ffi_closure object in gr7. We must save this
162
+ pointer to the ffi_closure object in $r7. We must save this
169
163
  pointer in a place that will persist while we do our work. */
170
- register ffi_closure *creg __asm__ ("gr7");
164
+ register ffi_closure *creg __asm__ ("$r12");
171
165
  ffi_closure *closure = creg;
172
166
 
173
167
  /* Arguments that don't fit in registers are found on the stack
174
168
  at a fixed offset above the current frame pointer. */
175
- register char *frame_pointer __asm__ ("fp");
176
- char *stack_args = frame_pointer + 16;
169
+ register char *frame_pointer __asm__ ("$fp");
170
+
171
+ /* Pointer to a struct return value. */
172
+ void *struct_rvalue = (void *) arg1;
173
+
174
+ /* 6 words reserved for register args + 3 words from jsr */
175
+ char *stack_args = frame_pointer + 9*4;
177
176
 
178
177
  /* Lay the register arguments down in a continuous chunk of memory. */
179
178
  unsigned register_args[6] =
180
179
  { arg1, arg2, arg3, arg4, arg5, arg6 };
180
+ char *register_args_ptr = (char *) register_args;
181
181
 
182
182
  ffi_cif *cif = closure->cif;
183
183
  ffi_type **arg_types = cif->arg_types;
@@ -185,6 +185,12 @@ void ffi_closure_eabi (unsigned arg1, unsigned arg2, unsigned arg3,
185
185
  char *ptr = (char *) register_args;
186
186
  int i;
187
187
 
188
+ /* preserve struct type return pointer passing */
189
+ if ((cif->rtype != NULL) && (cif->rtype->type == FFI_TYPE_STRUCT)) {
190
+ ptr += 4;
191
+ register_args_ptr = (char *)&register_args[1];
192
+ }
193
+
188
194
  /* Find the address of each argument. */
189
195
  for (i = 0; i < cif->nargs; i++)
190
196
  {
@@ -201,6 +207,7 @@ void ffi_closure_eabi (unsigned arg1, unsigned arg2, unsigned arg3,
201
207
  case FFI_TYPE_SINT32:
202
208
  case FFI_TYPE_UINT32:
203
209
  case FFI_TYPE_FLOAT:
210
+ case FFI_TYPE_POINTER:
204
211
  avalue[i] = ptr;
205
212
  break;
206
213
  case FFI_TYPE_STRUCT:
@@ -216,30 +223,21 @@ void ffi_closure_eabi (unsigned arg1, unsigned arg2, unsigned arg3,
216
223
 
217
224
  /* If we've handled more arguments than fit in registers,
218
225
  start looking at the those passed on the stack. */
219
- if (ptr == ((char *)register_args + (6*4)))
226
+ if (ptr == &register_args[6])
220
227
  ptr = stack_args;
221
228
  }
222
229
 
223
230
  /* Invoke the closure. */
224
- if (cif->rtype->type == FFI_TYPE_STRUCT)
231
+ if (cif->rtype && (cif->rtype->type == FFI_TYPE_STRUCT))
225
232
  {
226
- /* The caller allocates space for the return structure, and
227
- passes a pointer to this space in gr3. Use this value directly
228
- as the return value. */
229
- register void *return_struct_ptr __asm__("gr3");
230
- (closure->fun) (cif, return_struct_ptr, avalue, closure->user_data);
233
+ (closure->fun) (cif, struct_rvalue, avalue, closure->user_data);
231
234
  }
232
235
  else
233
236
  {
234
237
  /* Allocate space for the return value and call the function. */
235
238
  long long rvalue;
236
239
  (closure->fun) (cif, &rvalue, avalue, closure->user_data);
237
-
238
- /* Functions return 4-byte or smaller results in gr8. 8-byte
239
- values also use gr9. We fill the both, even for small return
240
- values, just to avoid a branch. */
241
- asm ("ldi @(%0, #0), gr8" : : "r" (&rvalue));
242
- asm ("ldi @(%0, #0), gr9" : : "r" (&((int *) &rvalue)[1]));
240
+ asm ("mov $r12, %0\n ld.l $r0, ($r12)\n ldo.l $r1, 4($r12)" : : "r" (&rvalue));
243
241
  }
244
242
  }
245
243
 
@@ -250,27 +248,25 @@ ffi_prep_closure_loc (ffi_closure* closure,
250
248
  void *user_data,
251
249
  void *codeloc)
252
250
  {
253
- unsigned int *tramp = (unsigned int *) &closure->tramp[0];
251
+ unsigned short *tramp = (unsigned short *) &closure->tramp[0];
254
252
  unsigned long fn = (long) ffi_closure_eabi;
255
253
  unsigned long cls = (long) codeloc;
256
- int i;
254
+
255
+ if (cif->abi != FFI_EABI)
256
+ return FFI_BAD_ABI;
257
257
 
258
258
  fn = (unsigned long) ffi_closure_eabi;
259
259
 
260
- tramp[0] = 0x8cfc0000 + (fn & 0xffff); /* setlos lo(fn), gr6 */
261
- tramp[1] = 0x8efc0000 + (cls & 0xffff); /* setlos lo(cls), gr7 */
262
- tramp[2] = 0x8cf80000 + (fn >> 16); /* sethi hi(fn), gr6 */
263
- tramp[3] = 0x8ef80000 + (cls >> 16); /* sethi hi(cls), gr7 */
264
- tramp[4] = 0x80300006; /* jmpl @(gr0, gr6) */
260
+ tramp[0] = 0x01e0; /* ldi.l $r7, .... */
261
+ tramp[1] = cls >> 16;
262
+ tramp[2] = cls & 0xffff;
263
+ tramp[3] = 0x1a00; /* jmpa .... */
264
+ tramp[4] = fn >> 16;
265
+ tramp[5] = fn & 0xffff;
265
266
 
266
267
  closure->cif = cif;
267
268
  closure->fun = fun;
268
269
  closure->user_data = user_data;
269
270
 
270
- /* Cache flushing. */
271
- for (i = 0; i < FFI_TRAMPOLINE_SIZE; i++)
272
- __asm__ volatile ("dcf @(%0,%1)\n\tici @(%2,%1)" :: "r" (tramp), "r" (i),
273
- "r" (codeloc));
274
-
275
271
  return FFI_OK;
276
272
  }
@@ -0,0 +1,52 @@
1
+ /* -----------------------------------------------------------------*-C-*-
2
+ ffitarget.h - Copyright (c) 2012, 2013 Anthony Green
3
+ Target configuration macros for Moxie
4
+
5
+ Permission is hereby granted, free of charge, to any person obtaining
6
+ a copy of this software and associated documentation files (the
7
+ ``Software''), to deal in the Software without restriction, including
8
+ without limitation the rights to use, copy, modify, merge, publish,
9
+ distribute, sublicense, and/or sell copies of the Software, and to
10
+ permit persons to whom the Software is furnished to do so, subject to
11
+ the following conditions:
12
+
13
+ The above copyright notice and this permission notice shall be included
14
+ in all copies or substantial portions of the Software.
15
+
16
+ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
17
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
20
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
21
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23
+ DEALINGS IN THE SOFTWARE.
24
+
25
+ ----------------------------------------------------------------------- */
26
+
27
+ #ifndef LIBFFI_TARGET_H
28
+ #define LIBFFI_TARGET_H
29
+
30
+ /* ---- System specific configurations ----------------------------------- */
31
+
32
+ #ifndef LIBFFI_ASM
33
+ typedef unsigned long ffi_arg;
34
+ typedef signed long ffi_sarg;
35
+
36
+ typedef enum ffi_abi {
37
+ FFI_FIRST_ABI = 0,
38
+ FFI_EABI,
39
+ FFI_DEFAULT_ABI = FFI_EABI,
40
+ FFI_LAST_ABI = FFI_DEFAULT_ABI + 1
41
+ } ffi_abi;
42
+ #endif
43
+
44
+ /* ---- Definitions for closures ----------------------------------------- */
45
+
46
+ #define FFI_CLOSURES 1
47
+ #define FFI_NATIVE_RAW_API 0
48
+
49
+ /* Trampolines are 12-bytes long. See ffi_prep_closure_loc. */
50
+ #define FFI_TRAMPOLINE_SIZE (12)
51
+
52
+ #endif
@@ -0,0 +1,304 @@
1
+ /* libffi support for Altera Nios II.
2
+
3
+ Copyright (c) 2013 Mentor Graphics.
4
+
5
+ Permission is hereby granted, free of charge, to any person obtaining
6
+ a copy of this software and associated documentation files (the
7
+ ``Software''), to deal in the Software without restriction, including
8
+ without limitation the rights to use, copy, modify, merge, publish,
9
+ distribute, sublicense, and/or sell copies of the Software, and to
10
+ permit persons to whom the Software is furnished to do so, subject to
11
+ the following conditions:
12
+
13
+ The above copyright notice and this permission notice shall be
14
+ included in all copies or substantial portions of the Software.
15
+
16
+ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
17
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
19
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
20
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
21
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
22
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
23
+
24
+
25
+ #include <ffi.h>
26
+ #include <ffi_common.h>
27
+
28
+ #include <stdlib.h>
29
+
30
+ /* The Nios II Processor Reference Handbook defines the procedure call
31
+ ABI as follows.
32
+
33
+ Arguments are passed as if a structure containing the types of
34
+ the arguments were constructed. The first 16 bytes are passed in r4
35
+ through r7, the remainder on the stack. The first 16 bytes of a function
36
+ taking variable arguments are passed in r4-r7 in the same way.
37
+
38
+ Return values of types up to 8 bytes are returned in r2 and r3. For
39
+ return values greater than 8 bytes, the caller must allocate memory for
40
+ the result and pass the address as if it were argument 0.
41
+
42
+ While this isn't specified explicitly in the ABI documentation, GCC
43
+ promotes integral arguments smaller than int size to 32 bits.
44
+
45
+ Also of note, the ABI specifies that all structure objects are
46
+ aligned to 32 bits even if all their fields have a smaller natural
47
+ alignment. See FFI_AGGREGATE_ALIGNMENT. */
48
+
49
+
50
+ /* Declare the assembly language hooks. */
51
+
52
+ extern UINT64 ffi_call_sysv (void (*) (char *, extended_cif *),
53
+ extended_cif *,
54
+ unsigned,
55
+ void (*fn) (void));
56
+ extern void ffi_closure_sysv (void);
57
+
58
+ /* Perform machine-dependent cif processing. */
59
+
60
+ ffi_status ffi_prep_cif_machdep (ffi_cif *cif)
61
+ {
62
+ /* We always want at least 16 bytes in the parameter block since it
63
+ simplifies the low-level call function. Also round the parameter
64
+ block size up to a multiple of 4 bytes to preserve
65
+ 32-bit alignment of the stack pointer. */
66
+ if (cif->bytes < 16)
67
+ cif->bytes = 16;
68
+ else
69
+ cif->bytes = (cif->bytes + 3) & ~3;
70
+
71
+ return FFI_OK;
72
+ }
73
+
74
+
75
+ /* ffi_prep_args is called by the assembly routine to transfer arguments
76
+ to the stack using the pointers in the ecif array.
77
+ Note that the stack buffer is big enough to fit all the arguments,
78
+ but the first 16 bytes will be copied to registers for the actual
79
+ call. */
80
+
81
+ void ffi_prep_args (char *stack, extended_cif *ecif)
82
+ {
83
+ char *argp = stack;
84
+ unsigned int i;
85
+
86
+ /* The implicit return value pointer is passed as if it were a hidden
87
+ first argument. */
88
+ if (ecif->cif->rtype->type == FFI_TYPE_STRUCT
89
+ && ecif->cif->rtype->size > 8)
90
+ {
91
+ (*(void **) argp) = ecif->rvalue;
92
+ argp += 4;
93
+ }
94
+
95
+ for (i = 0; i < ecif->cif->nargs; i++)
96
+ {
97
+ void *avalue = ecif->avalue[i];
98
+ ffi_type *atype = ecif->cif->arg_types[i];
99
+ size_t size = atype->size;
100
+ size_t alignment = atype->alignment;
101
+
102
+ /* Align argp as appropriate for the argument type. */
103
+ if ((alignment - 1) & (unsigned) argp)
104
+ argp = (char *) FFI_ALIGN (argp, alignment);
105
+
106
+ /* Copy the argument, promoting integral types smaller than a
107
+ word to word size. */
108
+ if (size < sizeof (int))
109
+ {
110
+ size = sizeof (int);
111
+ switch (atype->type)
112
+ {
113
+ case FFI_TYPE_SINT8:
114
+ *(signed int *) argp = (signed int) *(SINT8 *) avalue;
115
+ break;
116
+
117
+ case FFI_TYPE_UINT8:
118
+ *(unsigned int *) argp = (unsigned int) *(UINT8 *) avalue;
119
+ break;
120
+
121
+ case FFI_TYPE_SINT16:
122
+ *(signed int *) argp = (signed int) *(SINT16 *) avalue;
123
+ break;
124
+
125
+ case FFI_TYPE_UINT16:
126
+ *(unsigned int *) argp = (unsigned int) *(UINT16 *) avalue;
127
+ break;
128
+
129
+ case FFI_TYPE_STRUCT:
130
+ memcpy (argp, avalue, atype->size);
131
+ break;
132
+
133
+ default:
134
+ FFI_ASSERT(0);
135
+ }
136
+ }
137
+ else if (size == sizeof (int))
138
+ *(unsigned int *) argp = (unsigned int) *(UINT32 *) avalue;
139
+ else
140
+ memcpy (argp, avalue, size);
141
+ argp += size;
142
+ }
143
+ }
144
+
145
+
146
+ /* Call FN using the prepared CIF. RVALUE points to space allocated by
147
+ the caller for the return value, and AVALUE is an array of argument
148
+ pointers. */
149
+
150
+ void ffi_call (ffi_cif *cif, void (*fn) (void), void *rvalue, void **avalue)
151
+ {
152
+
153
+ extended_cif ecif;
154
+ UINT64 result;
155
+
156
+ /* If bigret is true, this is the case where a return value of larger
157
+ than 8 bytes is handled by being passed by reference as an implicit
158
+ argument. */
159
+ int bigret = (cif->rtype->type == FFI_TYPE_STRUCT
160
+ && cif->rtype->size > 8);
161
+
162
+ ecif.cif = cif;
163
+ ecif.avalue = avalue;
164
+
165
+ /* Allocate space for return value if this is the pass-by-reference case
166
+ and the caller did not provide a buffer. */
167
+ if (rvalue == NULL && bigret)
168
+ ecif.rvalue = alloca (cif->rtype->size);
169
+ else
170
+ ecif.rvalue = rvalue;
171
+
172
+ result = ffi_call_sysv (ffi_prep_args, &ecif, cif->bytes, fn);
173
+
174
+ /* Now result contains the 64 bit contents returned from fn in
175
+ r2 and r3. Copy the value of the appropriate size to the user-provided
176
+ rvalue buffer. */
177
+ if (rvalue && !bigret)
178
+ switch (cif->rtype->size)
179
+ {
180
+ case 1:
181
+ *(UINT8 *)rvalue = (UINT8) result;
182
+ break;
183
+ case 2:
184
+ *(UINT16 *)rvalue = (UINT16) result;
185
+ break;
186
+ case 4:
187
+ *(UINT32 *)rvalue = (UINT32) result;
188
+ break;
189
+ case 8:
190
+ *(UINT64 *)rvalue = (UINT64) result;
191
+ break;
192
+ default:
193
+ memcpy (rvalue, (void *)&result, cif->rtype->size);
194
+ break;
195
+ }
196
+ }
197
+
198
+ /* This function is invoked from the closure trampoline to invoke
199
+ CLOSURE with argument block ARGS. Parse ARGS according to
200
+ CLOSURE->cfi and invoke CLOSURE->fun. */
201
+
202
+ static UINT64
203
+ ffi_closure_helper (unsigned char *args,
204
+ ffi_closure *closure)
205
+ {
206
+ ffi_cif *cif = closure->cif;
207
+ unsigned char *argp = args;
208
+ void **parsed_args = alloca (cif->nargs * sizeof (void *));
209
+ UINT64 result;
210
+ void *retptr;
211
+ unsigned int i;
212
+
213
+ /* First figure out what to do about the return type. If this is the
214
+ big-structure-return case, the first arg is the hidden return buffer
215
+ allocated by the caller. */
216
+ if (cif->rtype->type == FFI_TYPE_STRUCT
217
+ && cif->rtype->size > 8)
218
+ {
219
+ retptr = *((void **) argp);
220
+ argp += 4;
221
+ }
222
+ else
223
+ retptr = (void *) &result;
224
+
225
+ /* Fill in the array of argument pointers. */
226
+ for (i = 0; i < cif->nargs; i++)
227
+ {
228
+ size_t size = cif->arg_types[i]->size;
229
+ size_t alignment = cif->arg_types[i]->alignment;
230
+
231
+ /* Align argp as appropriate for the argument type. */
232
+ if ((alignment - 1) & (unsigned) argp)
233
+ argp = (char *) FFI_ALIGN (argp, alignment);
234
+
235
+ /* Arguments smaller than an int are promoted to int. */
236
+ if (size < sizeof (int))
237
+ size = sizeof (int);
238
+
239
+ /* Store the pointer. */
240
+ parsed_args[i] = argp;
241
+ argp += size;
242
+ }
243
+
244
+ /* Call the user-supplied function. */
245
+ (closure->fun) (cif, retptr, parsed_args, closure->user_data);
246
+ return result;
247
+ }
248
+
249
+
250
+ /* Initialize CLOSURE with a trampoline to call FUN with
251
+ CIF and USER_DATA. */
252
+ ffi_status
253
+ ffi_prep_closure_loc (ffi_closure* closure,
254
+ ffi_cif* cif,
255
+ void (*fun) (ffi_cif*, void*, void**, void*),
256
+ void *user_data,
257
+ void *codeloc)
258
+ {
259
+ unsigned int *tramp = (unsigned int *) &closure->tramp[0];
260
+ int i;
261
+
262
+ if (cif->abi != FFI_SYSV)
263
+ return FFI_BAD_ABI;
264
+
265
+ /* The trampoline looks like:
266
+ movhi r8, %hi(ffi_closure_sysv)
267
+ ori r8, r8, %lo(ffi_closure_sysv)
268
+ movhi r9, %hi(ffi_closure_helper)
269
+ ori r0, r9, %lo(ffi_closure_helper)
270
+ movhi r10, %hi(closure)
271
+ ori r10, r10, %lo(closure)
272
+ jmp r8
273
+ and then ffi_closure_sysv retrieves the closure pointer out of r10
274
+ in addition to the arguments passed in the normal way for the call,
275
+ and invokes ffi_closure_helper. We encode the pointer to
276
+ ffi_closure_helper in the trampoline because making a PIC call
277
+ to it in ffi_closure_sysv would be messy (it would have to indirect
278
+ through the GOT). */
279
+
280
+ #define HI(x) ((((unsigned int) (x)) >> 16) & 0xffff)
281
+ #define LO(x) (((unsigned int) (x)) & 0xffff)
282
+ tramp[0] = (0 << 27) | (8 << 22) | (HI (ffi_closure_sysv) << 6) | 0x34;
283
+ tramp[1] = (8 << 27) | (8 << 22) | (LO (ffi_closure_sysv) << 6) | 0x14;
284
+ tramp[2] = (0 << 27) | (9 << 22) | (HI (ffi_closure_helper) << 6) | 0x34;
285
+ tramp[3] = (9 << 27) | (9 << 22) | (LO (ffi_closure_helper) << 6) | 0x14;
286
+ tramp[4] = (0 << 27) | (10 << 22) | (HI (closure) << 6) | 0x34;
287
+ tramp[5] = (10 << 27) | (10 << 22) | (LO (closure) << 6) | 0x14;
288
+ tramp[6] = (8 << 27) | (0x0d << 11) | 0x3a;
289
+ #undef HI
290
+ #undef LO
291
+
292
+ /* Flush the caches.
293
+ See Example 9-4 in the Nios II Software Developer's Handbook. */
294
+ for (i = 0; i < 7; i++)
295
+ asm volatile ("flushd 0(%0); flushi %0" :: "r"(tramp + i) : "memory");
296
+ asm volatile ("flushp" ::: "memory");
297
+
298
+ closure->cif = cif;
299
+ closure->fun = fun;
300
+ closure->user_data = user_data;
301
+
302
+ return FFI_OK;
303
+ }
304
+