ffi 1.9.25 → 1.12.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (285) hide show
  1. checksums.yaml +4 -4
  2. data/{appveyor.yml → .appveyor.yml} +7 -2
  3. data/.gitignore +3 -0
  4. data/.gitmodules +1 -0
  5. data/.travis.yml +22 -30
  6. data/CHANGELOG.md +107 -0
  7. data/Gemfile +2 -2
  8. data/README.md +29 -17
  9. data/Rakefile +17 -89
  10. data/ext/ffi_c/AbstractMemory.c +5 -9
  11. data/ext/ffi_c/Call.c +18 -39
  12. data/ext/ffi_c/Call.h +4 -7
  13. data/ext/ffi_c/DynamicLibrary.c +1 -1
  14. data/ext/ffi_c/Function.c +29 -113
  15. data/ext/ffi_c/LastError.c +47 -2
  16. data/ext/ffi_c/LongDouble.c +7 -7
  17. data/ext/ffi_c/Platform.c +0 -47
  18. data/ext/ffi_c/Struct.c +47 -51
  19. data/ext/ffi_c/Struct.h +12 -6
  20. data/ext/ffi_c/StructLayout.c +13 -12
  21. data/ext/ffi_c/Thread.c +6 -222
  22. data/ext/ffi_c/Thread.h +2 -13
  23. data/ext/ffi_c/Type.c +0 -18
  24. data/ext/ffi_c/Type.h +0 -1
  25. data/ext/ffi_c/Types.c +1 -1
  26. data/ext/ffi_c/Variadic.c +9 -15
  27. data/ext/ffi_c/extconf.rb +34 -21
  28. data/ext/ffi_c/ffi.c +3 -8
  29. data/ext/ffi_c/libffi/.appveyor.yml +29 -13
  30. data/ext/ffi_c/libffi/.gitattributes +4 -0
  31. data/ext/ffi_c/libffi/.travis/bfin-sim.exp +58 -0
  32. data/ext/ffi_c/libffi/.travis/build-cross-in-container.sh +14 -0
  33. data/ext/ffi_c/libffi/.travis/build-in-container.sh +12 -0
  34. data/ext/ffi_c/libffi/.travis/build.sh +112 -8
  35. data/ext/ffi_c/libffi/.travis/install.sh +65 -16
  36. data/ext/ffi_c/libffi/.travis/m32r-sim.exp +58 -0
  37. data/ext/ffi_c/libffi/.travis/or1k-sim.exp +58 -0
  38. data/ext/ffi_c/libffi/.travis/powerpc-eabisim.exp +58 -0
  39. data/ext/ffi_c/libffi/.travis/site.exp +10 -1
  40. data/ext/ffi_c/libffi/.travis/wine-sim.exp +55 -0
  41. data/ext/ffi_c/libffi/.travis.yml +47 -2
  42. data/ext/ffi_c/libffi/{ChangeLog.libffi-3.1 → ChangeLog.old} +1407 -0
  43. data/ext/ffi_c/libffi/LICENSE +1 -1
  44. data/ext/ffi_c/libffi/LICENSE-BUILDTOOLS +5 -4
  45. data/ext/ffi_c/libffi/Makefile.am +33 -40
  46. data/ext/ffi_c/libffi/Makefile.in +392 -176
  47. data/ext/ffi_c/libffi/README.md +23 -8
  48. data/ext/ffi_c/libffi/configure +319 -343
  49. data/ext/ffi_c/libffi/configure.ac +6 -2
  50. data/ext/ffi_c/libffi/configure.host +26 -9
  51. data/ext/ffi_c/libffi/doc/Makefile.in +9 -5
  52. data/ext/ffi_c/libffi/doc/libffi.texi +26 -14
  53. data/ext/ffi_c/libffi/doc/version.texi +4 -4
  54. data/ext/ffi_c/libffi/fficonfig.h.in +4 -0
  55. data/ext/ffi_c/libffi/generate-darwin-source-and-headers.py +1 -3
  56. data/ext/ffi_c/libffi/include/Makefile.in +10 -6
  57. data/ext/ffi_c/libffi/include/ffi.h.in +11 -7
  58. data/ext/ffi_c/libffi/include/ffi_common.h +5 -1
  59. data/ext/ffi_c/libffi/install-sh +23 -13
  60. data/ext/ffi_c/libffi/libffi.xcodeproj/project.pbxproj +2 -48
  61. data/ext/ffi_c/libffi/ltmain.sh +153 -60
  62. data/ext/ffi_c/libffi/m4/asmcfi.m4 +1 -1
  63. data/ext/ffi_c/libffi/m4/ax_append_flag.m4 +5 -26
  64. data/ext/ffi_c/libffi/m4/ax_check_compile_flag.m4 +5 -26
  65. data/ext/ffi_c/libffi/m4/ax_compiler_vendor.m4 +2 -1
  66. data/ext/ffi_c/libffi/m4/ax_configure_args.m4 +5 -26
  67. data/ext/ffi_c/libffi/m4/ax_gcc_archflag.m4 +7 -3
  68. data/ext/ffi_c/libffi/make_sunver.pl +333 -0
  69. data/ext/ffi_c/libffi/man/Makefile.in +9 -5
  70. data/ext/ffi_c/libffi/missing +8 -8
  71. data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.sln +33 -0
  72. data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.vcxproj +130 -0
  73. data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.vcxproj.filters +57 -0
  74. data/ext/ffi_c/libffi/msvc_build/aarch64/Ffi_staticLib.vcxproj.user +4 -0
  75. data/ext/ffi_c/libffi/msvc_build/aarch64/aarch64_include/ffi.h +511 -0
  76. data/ext/ffi_c/libffi/msvc_build/aarch64/aarch64_include/fficonfig.h +219 -0
  77. data/ext/ffi_c/libffi/msvcc.sh +27 -2
  78. data/ext/ffi_c/libffi/src/aarch64/ffi.c +126 -58
  79. data/ext/ffi_c/libffi/src/aarch64/ffitarget.h +13 -2
  80. data/ext/ffi_c/libffi/src/aarch64/sysv.S +8 -6
  81. data/ext/ffi_c/libffi/src/aarch64/win64_armasm.S +506 -0
  82. data/ext/ffi_c/libffi/src/arm/ffi.c +40 -5
  83. data/ext/ffi_c/libffi/src/arm/ffitarget.h +8 -1
  84. data/ext/ffi_c/libffi/src/arm/sysv.S +2 -0
  85. data/ext/ffi_c/libffi/src/arm/sysv_msvc_arm32.S +311 -0
  86. data/ext/ffi_c/libffi/src/closures.c +41 -9
  87. data/ext/ffi_c/libffi/src/frv/ffi.c +1 -1
  88. data/ext/ffi_c/libffi/src/metag/ffi.c +1 -1
  89. data/ext/ffi_c/libffi/src/mips/o32.S +2 -0
  90. data/ext/ffi_c/libffi/src/moxie/ffi.c +1 -1
  91. data/ext/ffi_c/libffi/src/pa/linux.S +23 -2
  92. data/ext/ffi_c/libffi/src/powerpc/ffi.c +6 -4
  93. data/ext/ffi_c/libffi/src/powerpc/ffi_linux64.c +211 -32
  94. data/ext/ffi_c/libffi/src/powerpc/ffi_powerpc.h +18 -7
  95. data/ext/ffi_c/libffi/src/powerpc/ffitarget.h +10 -4
  96. data/ext/ffi_c/libffi/src/powerpc/linux64.S +83 -28
  97. data/ext/ffi_c/libffi/src/powerpc/linux64_closure.S +68 -4
  98. data/ext/ffi_c/libffi/src/prep_cif.c +4 -2
  99. data/ext/ffi_c/libffi/src/riscv/ffi.c +42 -6
  100. data/ext/ffi_c/libffi/src/riscv/ffitarget.h +1 -0
  101. data/ext/ffi_c/libffi/src/riscv/sysv.S +86 -7
  102. data/ext/ffi_c/libffi/src/x86/ffi.c +14 -6
  103. data/ext/ffi_c/libffi/src/x86/ffi64.c +5 -3
  104. data/ext/ffi_c/libffi/src/x86/ffiw64.c +5 -2
  105. data/ext/ffi_c/libffi/src/x86/sysv.S +90 -4
  106. data/ext/ffi_c/libffi/src/x86/sysv_intel.S +995 -0
  107. data/ext/ffi_c/libffi/src/x86/unix64.S +41 -0
  108. data/ext/ffi_c/libffi/src/x86/win64.S +5 -0
  109. data/ext/ffi_c/libffi/testsuite/Makefile.am +114 -109
  110. data/ext/ffi_c/libffi/testsuite/Makefile.in +124 -84
  111. data/ext/ffi_c/libffi/testsuite/lib/libffi.exp +26 -22
  112. data/ext/ffi_c/libffi/testsuite/libffi.bhaible/bhaible.exp +7 -2
  113. data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-call.c +1 -1
  114. data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-callback.c +1 -1
  115. data/ext/ffi_c/libffi/testsuite/libffi.call/call.exp +12 -1
  116. data/ext/ffi_c/libffi/testsuite/libffi.call/float2.c +9 -8
  117. data/ext/ffi_c/libffi/testsuite/libffi.call/va_1.c +1 -1
  118. data/ext/ffi_c/libffi/testsuite/libffi.closures/closure.exp +67 -0
  119. data/ext/ffi_c/libffi/testsuite/libffi.closures/ffitest.h +138 -0
  120. data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/huge_struct.c +1 -1
  121. data/ext/ffi_c/libffi.darwin.mk +1 -1
  122. data/ext/ffi_c/rbffi.h +0 -2
  123. data/ffi.gemspec +12 -5
  124. data/lib/ffi/data_converter.rb +67 -0
  125. data/lib/ffi/ffi.rb +2 -0
  126. data/lib/ffi/library.rb +6 -6
  127. data/lib/ffi/platform/aarch64-freebsd/types.conf +128 -0
  128. data/lib/ffi/platform/aarch64-freebsd12/types.conf +128 -0
  129. data/lib/ffi/platform/aarch64-linux/types.conf +81 -81
  130. data/lib/ffi/platform/arm-freebsd/types.conf +152 -0
  131. data/lib/ffi/platform/arm-freebsd12/types.conf +152 -0
  132. data/lib/ffi/platform/arm-linux/types.conf +79 -79
  133. data/lib/ffi/platform/i386-cygwin/types.conf +1 -1
  134. data/lib/ffi/platform/i386-darwin/types.conf +63 -63
  135. data/lib/ffi/platform/i386-freebsd/types.conf +89 -89
  136. data/lib/ffi/platform/i386-freebsd12/types.conf +152 -0
  137. data/lib/ffi/platform/i386-gnu/types.conf +84 -84
  138. data/lib/ffi/platform/i386-linux/types.conf +77 -77
  139. data/lib/ffi/platform/i386-netbsd/types.conf +87 -87
  140. data/lib/ffi/platform/i386-openbsd/types.conf +89 -89
  141. data/lib/ffi/platform/i386-solaris/types.conf +96 -96
  142. data/lib/ffi/platform/i386-windows/types.conf +84 -84
  143. data/lib/ffi/platform/ia64-linux/types.conf +79 -79
  144. data/lib/ffi/platform/mips-linux/types.conf +79 -79
  145. data/lib/ffi/platform/mips64-linux/types.conf +81 -81
  146. data/lib/ffi/platform/mips64el-linux/types.conf +81 -81
  147. data/lib/ffi/platform/mipsel-linux/types.conf +79 -79
  148. data/lib/ffi/platform/mipsisa32r6-linux/types.conf +79 -79
  149. data/lib/ffi/platform/mipsisa32r6el-linux/types.conf +79 -79
  150. data/lib/ffi/platform/mipsisa64r6-linux/types.conf +81 -81
  151. data/lib/ffi/platform/mipsisa64r6el-linux/types.conf +81 -81
  152. data/lib/ffi/platform/powerpc-aix/types.conf +155 -155
  153. data/lib/ffi/platform/powerpc-darwin/types.conf +63 -63
  154. data/lib/ffi/platform/powerpc-linux/types.conf +77 -77
  155. data/lib/ffi/platform/powerpc64-linux/types.conf +81 -81
  156. data/lib/ffi/platform/s390-linux/types.conf +79 -79
  157. data/lib/ffi/platform/s390x-linux/types.conf +79 -79
  158. data/lib/ffi/platform/sparc-linux/types.conf +79 -79
  159. data/lib/ffi/platform/sparc-solaris/types.conf +103 -103
  160. data/lib/ffi/platform/sparc64-linux/types.conf +79 -79
  161. data/lib/ffi/platform/sparcv9-solaris/types.conf +103 -103
  162. data/lib/ffi/platform/x86_64-cygwin/types.conf +1 -1
  163. data/lib/ffi/platform/x86_64-darwin/types.conf +84 -84
  164. data/lib/ffi/platform/x86_64-dragonflybsd/types.conf +148 -0
  165. data/lib/ffi/platform/x86_64-freebsd/types.conf +90 -90
  166. data/lib/ffi/platform/x86_64-freebsd12/types.conf +158 -0
  167. data/lib/ffi/platform/x86_64-linux/types.conf +86 -77
  168. data/lib/ffi/platform/x86_64-netbsd/types.conf +89 -89
  169. data/lib/ffi/platform/x86_64-openbsd/types.conf +86 -86
  170. data/lib/ffi/platform/x86_64-solaris/types.conf +96 -96
  171. data/lib/ffi/platform/x86_64-windows/types.conf +99 -99
  172. data/lib/ffi/platform.rb +13 -2
  173. data/lib/ffi/pointer.rb +5 -6
  174. data/lib/ffi/struct.rb +5 -66
  175. data/lib/ffi/struct_by_reference.rb +72 -0
  176. data/lib/ffi/struct_layout.rb +96 -0
  177. data/lib/ffi/tools/const_generator.rb +5 -4
  178. data/lib/ffi/tools/generator.rb +47 -2
  179. data/lib/ffi/tools/generator_task.rb +13 -17
  180. data/lib/ffi/tools/struct_generator.rb +4 -4
  181. data/lib/ffi/tools/types_generator.rb +5 -4
  182. data/lib/ffi/types.rb +1 -1
  183. data/lib/ffi/version.rb +1 -1
  184. metadata +144 -115
  185. data/ext/ffi_c/DataConverter.c +0 -91
  186. data/ext/ffi_c/StructByReference.c +0 -190
  187. data/ext/ffi_c/StructByReference.h +0 -50
  188. data/ext/ffi_c/libffi/ChangeLog.libffi +0 -584
  189. data/ext/ffi_c/libffi/ChangeLog.libgcj +0 -40
  190. data/ext/ffi_c/libffi/ChangeLog.v1 +0 -764
  191. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn0.c +0 -0
  192. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn1.c +0 -0
  193. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn2.c +0 -0
  194. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn3.c +0 -0
  195. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn4.c +0 -0
  196. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn5.c +0 -0
  197. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_fn6.c +0 -0
  198. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_loc_fn0.c +0 -0
  199. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/closure_simple.c +0 -0
  200. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_12byte.c +0 -0
  201. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_16byte.c +0 -0
  202. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_18byte.c +0 -0
  203. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_19byte.c +0 -0
  204. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_1_1byte.c +0 -0
  205. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_20byte.c +0 -0
  206. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_20byte1.c +0 -0
  207. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_24byte.c +0 -0
  208. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_2byte.c +0 -0
  209. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3_1byte.c +0 -0
  210. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3byte1.c +0 -0
  211. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3byte2.c +0 -0
  212. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_3float.c +0 -0
  213. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_4_1byte.c +0 -0
  214. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_4byte.c +0 -0
  215. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_5_1_byte.c +0 -0
  216. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_5byte.c +0 -0
  217. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_64byte.c +0 -0
  218. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_6_1_byte.c +0 -0
  219. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_6byte.c +0 -0
  220. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_7_1_byte.c +0 -0
  221. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_7byte.c +0 -0
  222. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_8byte.c +0 -0
  223. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_9byte1.c +0 -0
  224. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_9byte2.c +0 -0
  225. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_double.c +0 -0
  226. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_float.c +0 -0
  227. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_longdouble.c +0 -0
  228. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_longdouble_split.c +0 -0
  229. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_longdouble_split2.c +0 -0
  230. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_pointer.c +0 -0
  231. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint16.c +0 -0
  232. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint32.c +0 -0
  233. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_sint64.c +0 -0
  234. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint16.c +0 -0
  235. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint32.c +0 -0
  236. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_align_uint64.c +0 -0
  237. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_dbls_struct.c +0 -0
  238. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_double.c +0 -0
  239. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_double_va.c +0 -0
  240. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_float.c +0 -0
  241. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_longdouble.c +0 -0
  242. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_longdouble_va.c +0 -0
  243. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_many_mixed_args.c +0 -0
  244. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_many_mixed_float_double.c +0 -0
  245. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_schar.c +0 -0
  246. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_sshort.c +0 -0
  247. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_sshortchar.c +0 -0
  248. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_uchar.c +0 -0
  249. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_ushort.c +0 -0
  250. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_multi_ushortchar.c +0 -0
  251. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_pointer.c +0 -0
  252. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_pointer_stack.c +0 -0
  253. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_schar.c +0 -0
  254. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_sint.c +0 -0
  255. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_sshort.c +0 -0
  256. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_struct_va1.c +0 -0
  257. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uchar.c +0 -0
  258. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uchar_va.c +0 -0
  259. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uint.c +0 -0
  260. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_uint_va.c +0 -0
  261. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ulong_va.c +0 -0
  262. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ulonglong.c +0 -0
  263. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ushort.c +0 -0
  264. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/cls_ushort_va.c +0 -0
  265. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/err_bad_abi.c +0 -0
  266. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct.c +0 -0
  267. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct1.c +0 -0
  268. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct10.c +0 -0
  269. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct11.c +0 -0
  270. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct2.c +0 -0
  271. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct3.c +0 -0
  272. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct4.c +0 -0
  273. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct5.c +0 -0
  274. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct6.c +0 -0
  275. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct7.c +0 -0
  276. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct8.c +0 -0
  277. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/nested_struct9.c +0 -0
  278. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/problem1.c +0 -0
  279. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_large.c +0 -0
  280. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_large2.c +0 -0
  281. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_medium.c +0 -0
  282. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/stret_medium2.c +0 -0
  283. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/testclosure.c +0 -0
  284. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/unwindtest.cc +0 -0
  285. /data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/unwindtest_ffi_call.cc +0 -0
@@ -0,0 +1,506 @@
1
+ /* Copyright (c) 2009, 2010, 2011, 2012 ARM Ltd.
2
+ Permission is hereby granted, free of charge, to any person obtaining
3
+ a copy of this software and associated documentation files (the
4
+ ``Software''), to deal in the Software without restriction, including
5
+ without limitation the rights to use, copy, modify, merge, publish,
6
+ distribute, sublicense, and/or sell copies of the Software, and to
7
+ permit persons to whom the Software is furnished to do so, subject to
8
+ the following conditions:
9
+ The above copyright notice and this permission notice shall be
10
+ included in all copies or substantial portions of the Software.
11
+ THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
12
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
13
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
14
+ IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
15
+ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
16
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
17
+ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
18
+
19
+ #define LIBFFI_ASM
20
+ #include <fficonfig.h>
21
+ #include <ffi.h>
22
+ #include <ffi_cfi.h>
23
+ #include "internal.h"
24
+
25
+ OPT 2 /*disable listing */
26
+ /* For some macros to add unwind information */
27
+ #include "ksarm64.h"
28
+ OPT 1 /*re-enable listing */
29
+
30
+ #define BE(X) 0
31
+ #define PTR_REG(n) x##n
32
+ #define PTR_SIZE 8
33
+
34
+ IMPORT ffi_closure_SYSV_inner
35
+ EXPORT ffi_call_SYSV
36
+ EXPORT ffi_closure_SYSV_V
37
+ EXPORT ffi_closure_SYSV
38
+ EXPORT extend_hfa_type
39
+ EXPORT compress_hfa_type
40
+ #ifdef FFI_GO_CLOSURES
41
+ EXPORT ffi_go_closure_SYSV_V
42
+ EXPORT ffi_go_closure_SYSV
43
+ #endif
44
+
45
+ TEXTAREA, ALLIGN=8
46
+
47
+ /* ffi_call_SYSV
48
+ extern void ffi_call_SYSV (void *stack, void *frame,
49
+ void (*fn)(void), void *rvalue,
50
+ int flags, void *closure);
51
+ Therefore on entry we have:
52
+ x0 stack
53
+ x1 frame
54
+ x2 fn
55
+ x3 rvalue
56
+ x4 flags
57
+ x5 closure
58
+ */
59
+
60
+ NESTED_ENTRY ffi_call_SYSV_fake
61
+
62
+ /* For unwind information, Windows has to store fp and lr */
63
+ PROLOG_SAVE_REG_PAIR x29, x30, #-32!
64
+
65
+ ALTERNATE_ENTRY ffi_call_SYSV
66
+ /* Use a stack frame allocated by our caller. */
67
+ stp x29, x30, [x1]
68
+ mov x29, x1
69
+ mov sp, x0
70
+
71
+ mov x9, x2 /* save fn */
72
+ mov x8, x3 /* install structure return */
73
+ #ifdef FFI_GO_CLOSURES
74
+ /*mov x18, x5 install static chain */
75
+ #endif
76
+ stp x3, x4, [x29, #16] /* save rvalue and flags */
77
+
78
+ /* Load the vector argument passing registers, if necessary. */
79
+ tbz x4, #AARCH64_FLAG_ARG_V_BIT, ffi_call_SYSV_L1
80
+ ldp q0, q1, [sp, #0]
81
+ ldp q2, q3, [sp, #32]
82
+ ldp q4, q5, [sp, #64]
83
+ ldp q6, q7, [sp, #96]
84
+
85
+ ffi_call_SYSV_L1
86
+ /* Load the core argument passing registers, including
87
+ the structure return pointer. */
88
+ ldp x0, x1, [sp, #16*N_V_ARG_REG + 0]
89
+ ldp x2, x3, [sp, #16*N_V_ARG_REG + 16]
90
+ ldp x4, x5, [sp, #16*N_V_ARG_REG + 32]
91
+ ldp x6, x7, [sp, #16*N_V_ARG_REG + 48]
92
+
93
+ /* Deallocate the context, leaving the stacked arguments. */
94
+ add sp, sp, #CALL_CONTEXT_SIZE
95
+
96
+ blr x9 /* call fn */
97
+
98
+ ldp x3, x4, [x29, #16] /* reload rvalue and flags */
99
+
100
+ /* Partially deconstruct the stack frame. */
101
+ mov sp, x29
102
+ ldp x29, x30, [x29]
103
+
104
+ /* Save the return value as directed. */
105
+ adr x5, ffi_call_SYSV_return
106
+ and w4, w4, #AARCH64_RET_MASK
107
+ add x5, x5, x4, lsl #3
108
+ br x5
109
+
110
+ /* Note that each table entry is 2 insns, and thus 8 bytes.
111
+ For integer data, note that we're storing into ffi_arg
112
+ and therefore we want to extend to 64 bits; these types
113
+ have two consecutive entries allocated for them. */
114
+ ALIGN 4
115
+ ffi_call_SYSV_return
116
+ ret /* VOID */
117
+ nop
118
+ str x0, [x3] /* INT64 */
119
+ ret
120
+ stp x0, x1, [x3] /* INT128 */
121
+ ret
122
+ brk #1000 /* UNUSED */
123
+ ret
124
+ brk #1000 /* UNUSED */
125
+ ret
126
+ brk #1000 /* UNUSED */
127
+ ret
128
+ brk #1000 /* UNUSED */
129
+ ret
130
+ brk #1000 /* UNUSED */
131
+ ret
132
+ st4 { v0.s, v1.s, v2.s, v3.s }[0], [x3] /* S4 */
133
+ ret
134
+ st3 { v0.s, v1.s, v2.s }[0], [x3] /* S3 */
135
+ ret
136
+ stp s0, s1, [x3] /* S2 */
137
+ ret
138
+ str s0, [x3] /* S1 */
139
+ ret
140
+ st4 { v0.d, v1.d, v2.d, v3.d }[0], [x3] /* D4 */
141
+ ret
142
+ st3 { v0.d, v1.d, v2.d }[0], [x3] /* D3 */
143
+ ret
144
+ stp d0, d1, [x3] /* D2 */
145
+ ret
146
+ str d0, [x3] /* D1 */
147
+ ret
148
+ str q3, [x3, #48] /* Q4 */
149
+ nop
150
+ str q2, [x3, #32] /* Q3 */
151
+ nop
152
+ stp q0, q1, [x3] /* Q2 */
153
+ ret
154
+ str q0, [x3] /* Q1 */
155
+ ret
156
+ uxtb w0, w0 /* UINT8 */
157
+ str x0, [x3]
158
+ ret /* reserved */
159
+ nop
160
+ uxth w0, w0 /* UINT16 */
161
+ str x0, [x3]
162
+ ret /* reserved */
163
+ nop
164
+ mov w0, w0 /* UINT32 */
165
+ str x0, [x3]
166
+ ret /* reserved */
167
+ nop
168
+ sxtb x0, w0 /* SINT8 */
169
+ str x0, [x3]
170
+ ret /* reserved */
171
+ nop
172
+ sxth x0, w0 /* SINT16 */
173
+ str x0, [x3]
174
+ ret /* reserved */
175
+ nop
176
+ sxtw x0, w0 /* SINT32 */
177
+ str x0, [x3]
178
+ ret /* reserved */
179
+ nop
180
+
181
+
182
+ NESTED_END ffi_call_SYSV_fake
183
+
184
+
185
+ /* ffi_closure_SYSV
186
+ Closure invocation glue. This is the low level code invoked directly by
187
+ the closure trampoline to setup and call a closure.
188
+ On entry x17 points to a struct ffi_closure, x16 has been clobbered
189
+ all other registers are preserved.
190
+ We allocate a call context and save the argument passing registers,
191
+ then invoked the generic C ffi_closure_SYSV_inner() function to do all
192
+ the real work, on return we load the result passing registers back from
193
+ the call context.
194
+ */
195
+
196
+ #define ffi_closure_SYSV_FS (8*2 + CALL_CONTEXT_SIZE + 64)
197
+
198
+ NESTED_ENTRY ffi_closure_SYSV_V
199
+ PROLOG_SAVE_REG_PAIR x29, x30, #-ffi_closure_SYSV_FS!
200
+
201
+ /* Save the argument passing vector registers. */
202
+ stp q0, q1, [sp, #16 + 0]
203
+ stp q2, q3, [sp, #16 + 32]
204
+ stp q4, q5, [sp, #16 + 64]
205
+ stp q6, q7, [sp, #16 + 96]
206
+
207
+ b ffi_closure_SYSV_save_argument
208
+ NESTED_END ffi_closure_SYSV_V
209
+
210
+ NESTED_ENTRY ffi_closure_SYSV
211
+ PROLOG_SAVE_REG_PAIR x29, x30, #-ffi_closure_SYSV_FS!
212
+
213
+ ffi_closure_SYSV_save_argument
214
+ /* Save the argument passing core registers. */
215
+ stp x0, x1, [sp, #16 + 16*N_V_ARG_REG + 0]
216
+ stp x2, x3, [sp, #16 + 16*N_V_ARG_REG + 16]
217
+ stp x4, x5, [sp, #16 + 16*N_V_ARG_REG + 32]
218
+ stp x6, x7, [sp, #16 + 16*N_V_ARG_REG + 48]
219
+
220
+ /* Load ffi_closure_inner arguments. */
221
+ ldp PTR_REG(0), PTR_REG(1), [x17, #FFI_TRAMPOLINE_CLOSURE_OFFSET] /* load cif, fn */
222
+ ldr PTR_REG(2), [x17, #FFI_TRAMPOLINE_CLOSURE_OFFSET+PTR_SIZE*2] /* load user_data */
223
+
224
+ do_closure
225
+ add x3, sp, #16 /* load context */
226
+ add x4, sp, #ffi_closure_SYSV_FS /* load stack */
227
+ add x5, sp, #16+CALL_CONTEXT_SIZE /* load rvalue */
228
+ mov x6, x8 /* load struct_rval */
229
+
230
+ bl ffi_closure_SYSV_inner
231
+
232
+ /* Load the return value as directed. */
233
+ adr x1, ffi_closure_SYSV_return_base
234
+ and w0, w0, #AARCH64_RET_MASK
235
+ add x1, x1, x0, lsl #3
236
+ add x3, sp, #16+CALL_CONTEXT_SIZE
237
+ br x1
238
+
239
+ /* Note that each table entry is 2 insns, and thus 8 bytes. */
240
+ ALIGN 8
241
+ ffi_closure_SYSV_return_base
242
+ b ffi_closure_SYSV_epilog /* VOID */
243
+ nop
244
+ ldr x0, [x3] /* INT64 */
245
+ b ffi_closure_SYSV_epilog
246
+ ldp x0, x1, [x3] /* INT128 */
247
+ b ffi_closure_SYSV_epilog
248
+ brk #1000 /* UNUSED */
249
+ nop
250
+ brk #1000 /* UNUSED */
251
+ nop
252
+ brk #1000 /* UNUSED */
253
+ nop
254
+ brk #1000 /* UNUSED */
255
+ nop
256
+ brk #1000 /* UNUSED */
257
+ nop
258
+ ldr s3, [x3, #12] /* S4 */
259
+ nop
260
+ ldr s2, [x3, #8] /* S3 */
261
+ nop
262
+ ldp s0, s1, [x3] /* S2 */
263
+ b ffi_closure_SYSV_epilog
264
+ ldr s0, [x3] /* S1 */
265
+ b ffi_closure_SYSV_epilog
266
+ ldr d3, [x3, #24] /* D4 */
267
+ nop
268
+ ldr d2, [x3, #16] /* D3 */
269
+ nop
270
+ ldp d0, d1, [x3] /* D2 */
271
+ b ffi_closure_SYSV_epilog
272
+ ldr d0, [x3] /* D1 */
273
+ b ffi_closure_SYSV_epilog
274
+ ldr q3, [x3, #48] /* Q4 */
275
+ nop
276
+ ldr q2, [x3, #32] /* Q3 */
277
+ nop
278
+ ldp q0, q1, [x3] /* Q2 */
279
+ b ffi_closure_SYSV_epilog
280
+ ldr q0, [x3] /* Q1 */
281
+ b ffi_closure_SYSV_epilog
282
+ ldrb w0, [x3, #BE(7)] /* UINT8 */
283
+ b ffi_closure_SYSV_epilog
284
+ brk #1000 /* reserved */
285
+ nop
286
+ ldrh w0, [x3, #BE(6)] /* UINT16 */
287
+ b ffi_closure_SYSV_epilog
288
+ brk #1000 /* reserved */
289
+ nop
290
+ ldr w0, [x3, #BE(4)] /* UINT32 */
291
+ b ffi_closure_SYSV_epilog
292
+ brk #1000 /* reserved */
293
+ nop
294
+ ldrsb x0, [x3, #BE(7)] /* SINT8 */
295
+ b ffi_closure_SYSV_epilog
296
+ brk #1000 /* reserved */
297
+ nop
298
+ ldrsh x0, [x3, #BE(6)] /* SINT16 */
299
+ b ffi_closure_SYSV_epilog
300
+ brk #1000 /* reserved */
301
+ nop
302
+ ldrsw x0, [x3, #BE(4)] /* SINT32 */
303
+ nop
304
+ /* reserved */
305
+
306
+ ffi_closure_SYSV_epilog
307
+ EPILOG_RESTORE_REG_PAIR x29, x30, #ffi_closure_SYSV_FS!
308
+ EPILOG_RETURN
309
+ NESTED_END ffi_closure_SYSV
310
+
311
+
312
+ #ifdef FFI_GO_CLOSURES
313
+ NESTED_ENTRY ffi_go_closure_SYSV_V
314
+ PROLOG_SAVE_REG_PAIR x29, x30, #-ffi_closure_SYSV_FS!
315
+
316
+ /* Save the argument passing vector registers. */
317
+ stp q0, q1, [sp, #16 + 0]
318
+ stp q2, q3, [sp, #16 + 32]
319
+ stp q4, q5, [sp, #16 + 64]
320
+ stp q6, q7, [sp, #16 + 96]
321
+ b ffi_go_closure_SYSV_save_argument
322
+ NESTED_END ffi_go_closure_SYSV_V
323
+
324
+ NESTED_ENTRY ffi_go_closure_SYSV
325
+ PROLOG_SAVE_REG_PAIR x29, x30, #-ffi_closure_SYSV_FS!
326
+
327
+ ffi_go_closure_SYSV_save_argument
328
+ /* Save the argument passing core registers. */
329
+ stp x0, x1, [sp, #16 + 16*N_V_ARG_REG + 0]
330
+ stp x2, x3, [sp, #16 + 16*N_V_ARG_REG + 16]
331
+ stp x4, x5, [sp, #16 + 16*N_V_ARG_REG + 32]
332
+ stp x6, x7, [sp, #16 + 16*N_V_ARG_REG + 48]
333
+
334
+ /* Load ffi_closure_inner arguments. */
335
+ ldp PTR_REG(0), PTR_REG(1), [x18, #PTR_SIZE]/* load cif, fn */
336
+ mov x2, x18 /* load user_data */
337
+ b do_closure
338
+ NESTED_END ffi_go_closure_SYSV
339
+
340
+ #endif /* FFI_GO_CLOSURES */
341
+
342
+
343
+ /* void extend_hfa_type (void *dest, void *src, int h) */
344
+
345
+ LEAF_ENTRY extend_hfa_type
346
+
347
+ adr x3, extend_hfa_type_jump_base
348
+ and w2, w2, #AARCH64_RET_MASK
349
+ sub x2, x2, #AARCH64_RET_S4
350
+ add x3, x3, x2, lsl #4
351
+ br x3
352
+
353
+ ALIGN 4
354
+ extend_hfa_type_jump_base
355
+ ldp s16, s17, [x1] /* S4 */
356
+ ldp s18, s19, [x1, #8]
357
+ b extend_hfa_type_store_4
358
+ nop
359
+
360
+ ldp s16, s17, [x1] /* S3 */
361
+ ldr s18, [x1, #8]
362
+ b extend_hfa_type_store_3
363
+ nop
364
+
365
+ ldp s16, s17, [x1] /* S2 */
366
+ b extend_hfa_type_store_2
367
+ nop
368
+ nop
369
+
370
+ ldr s16, [x1] /* S1 */
371
+ b extend_hfa_type_store_1
372
+ nop
373
+ nop
374
+
375
+ ldp d16, d17, [x1] /* D4 */
376
+ ldp d18, d19, [x1, #16]
377
+ b extend_hfa_type_store_4
378
+ nop
379
+
380
+ ldp d16, d17, [x1] /* D3 */
381
+ ldr d18, [x1, #16]
382
+ b extend_hfa_type_store_3
383
+ nop
384
+
385
+ ldp d16, d17, [x1] /* D2 */
386
+ b extend_hfa_type_store_2
387
+ nop
388
+ nop
389
+
390
+ ldr d16, [x1] /* D1 */
391
+ b extend_hfa_type_store_1
392
+ nop
393
+ nop
394
+
395
+ ldp q16, q17, [x1] /* Q4 */
396
+ ldp q18, q19, [x1, #16]
397
+ b extend_hfa_type_store_4
398
+ nop
399
+
400
+ ldp q16, q17, [x1] /* Q3 */
401
+ ldr q18, [x1, #16]
402
+ b extend_hfa_type_store_3
403
+ nop
404
+
405
+ ldp q16, q17, [x1] /* Q2 */
406
+ b extend_hfa_type_store_2
407
+ nop
408
+ nop
409
+
410
+ ldr q16, [x1] /* Q1 */
411
+ b extend_hfa_type_store_1
412
+
413
+ extend_hfa_type_store_4
414
+ str q19, [x0, #48]
415
+ extend_hfa_type_store_3
416
+ str q18, [x0, #32]
417
+ extend_hfa_type_store_2
418
+ str q17, [x0, #16]
419
+ extend_hfa_type_store_1
420
+ str q16, [x0]
421
+ ret
422
+
423
+ LEAF_END extend_hfa_type
424
+
425
+
426
+ /* void compress_hfa_type (void *dest, void *reg, int h) */
427
+
428
+ LEAF_ENTRY compress_hfa_type
429
+
430
+ adr x3, compress_hfa_type_jump_base
431
+ and w2, w2, #AARCH64_RET_MASK
432
+ sub x2, x2, #AARCH64_RET_S4
433
+ add x3, x3, x2, lsl #4
434
+ br x3
435
+
436
+ ALIGN 4
437
+ compress_hfa_type_jump_base
438
+ ldp q16, q17, [x1] /* S4 */
439
+ ldp q18, q19, [x1, #32]
440
+ st4 { v16.s, v17.s, v18.s, v19.s }[0], [x0]
441
+ ret
442
+
443
+ ldp q16, q17, [x1] /* S3 */
444
+ ldr q18, [x1, #32]
445
+ st3 { v16.s, v17.s, v18.s }[0], [x0]
446
+ ret
447
+
448
+ ldp q16, q17, [x1] /* S2 */
449
+ st2 { v16.s, v17.s }[0], [x0]
450
+ ret
451
+ nop
452
+
453
+ ldr q16, [x1] /* S1 */
454
+ st1 { v16.s }[0], [x0]
455
+ ret
456
+ nop
457
+
458
+ ldp q16, q17, [x1] /* D4 */
459
+ ldp q18, q19, [x1, #32]
460
+ st4 { v16.d, v17.d, v18.d, v19.d }[0], [x0]
461
+ ret
462
+
463
+ ldp q16, q17, [x1] /* D3 */
464
+ ldr q18, [x1, #32]
465
+ st3 { v16.d, v17.d, v18.d }[0], [x0]
466
+ ret
467
+
468
+ ldp q16, q17, [x1] /* D2 */
469
+ st2 { v16.d, v17.d }[0], [x0]
470
+ ret
471
+ nop
472
+
473
+ ldr q16, [x1] /* D1 */
474
+ st1 { v16.d }[0], [x0]
475
+ ret
476
+ nop
477
+
478
+ ldp q16, q17, [x1] /* Q4 */
479
+ ldp q18, q19, [x1, #32]
480
+ b compress_hfa_type_store_q4
481
+ nop
482
+
483
+ ldp q16, q17, [x1] /* Q3 */
484
+ ldr q18, [x1, #32]
485
+ b compress_hfa_type_store_q3
486
+ nop
487
+
488
+ ldp q16, q17, [x1] /* Q2 */
489
+ stp q16, q17, [x0]
490
+ ret
491
+ nop
492
+
493
+ ldr q16, [x1] /* Q1 */
494
+ str q16, [x0]
495
+ ret
496
+
497
+ compress_hfa_type_store_q4
498
+ str q19, [x0, #48]
499
+ compress_hfa_type_store_q3
500
+ str q18, [x0, #32]
501
+ stp q16, q17, [x0]
502
+ ret
503
+
504
+ LEAF_END compress_hfa_type
505
+
506
+ END
@@ -28,6 +28,7 @@
28
28
  DEALINGS IN THE SOFTWARE.
29
29
  ----------------------------------------------------------------------- */
30
30
 
31
+ #if defined(__arm__) || defined(_M_ARM)
31
32
  #include <fficonfig.h>
32
33
  #include <ffi.h>
33
34
  #include <ffi_common.h>
@@ -35,6 +36,11 @@
35
36
  #include <stdlib.h>
36
37
  #include "internal.h"
37
38
 
39
+ #if defined(_MSC_VER) && defined(_M_ARM)
40
+ #define WIN32_LEAN_AND_MEAN
41
+ #include <windows.h>
42
+ #endif
43
+
38
44
  #if FFI_EXEC_TRAMPOLINE_TABLE
39
45
 
40
46
  #ifdef __MACH__
@@ -42,7 +48,11 @@
42
48
  #endif
43
49
 
44
50
  #else
51
+ #ifndef _M_ARM
45
52
  extern unsigned int ffi_arm_trampoline[2] FFI_HIDDEN;
53
+ #else
54
+ extern unsigned int ffi_arm_trampoline[3] FFI_HIDDEN;
55
+ #endif
46
56
  #endif
47
57
 
48
58
  /* Forward declares. */
@@ -88,10 +98,20 @@ ffi_put_arg (ffi_type *ty, void *src, void *dst)
88
98
  case FFI_TYPE_SINT32:
89
99
  case FFI_TYPE_UINT32:
90
100
  case FFI_TYPE_POINTER:
101
+ #ifndef _MSC_VER
91
102
  case FFI_TYPE_FLOAT:
103
+ #endif
92
104
  *(UINT32 *)dst = *(UINT32 *)src;
93
105
  break;
94
106
 
107
+ #ifdef _MSC_VER
108
+ // casting a float* to a UINT32* doesn't work on Windows
109
+ case FFI_TYPE_FLOAT:
110
+ *(uintptr_t *)dst = 0;
111
+ *(float *)dst = *(float *)src;
112
+ break;
113
+ #endif
114
+
95
115
  case FFI_TYPE_SINT64:
96
116
  case FFI_TYPE_UINT64:
97
117
  case FFI_TYPE_DOUBLE:
@@ -210,7 +230,7 @@ ffi_prep_args_VFP (ffi_cif *cif, int flags, void *rvalue,
210
230
  }
211
231
 
212
232
  /* Perform machine dependent cif processing */
213
- ffi_status
233
+ ffi_status FFI_HIDDEN
214
234
  ffi_prep_cif_machdep (ffi_cif *cif)
215
235
  {
216
236
  int flags = 0, cabi = cif->abi;
@@ -301,7 +321,7 @@ ffi_prep_cif_machdep (ffi_cif *cif)
301
321
  }
302
322
 
303
323
  /* Perform machine dependent cif processing for variadic calls */
304
- ffi_status
324
+ ffi_status FFI_HIDDEN
305
325
  ffi_prep_cif_machdep_var (ffi_cif * cif,
306
326
  unsigned int nfixedargs, unsigned int ntotalargs)
307
327
  {
@@ -571,15 +591,28 @@ ffi_prep_closure_loc (ffi_closure * closure,
571
591
  config[0] = closure;
572
592
  config[1] = closure_func;
573
593
  #else
574
- memcpy (closure->tramp, ffi_arm_trampoline, 8);
594
+
595
+ #ifndef _M_ARM
596
+ memcpy(closure->tramp, ffi_arm_trampoline, 8);
597
+ #else
598
+ // cast away function type so MSVC doesn't set the lower bit of the function pointer
599
+ memcpy(closure->tramp, (void*)((uintptr_t)ffi_arm_trampoline & 0xFFFFFFFE), FFI_TRAMPOLINE_CLOSURE_OFFSET);
600
+ #endif
601
+
575
602
  #if defined (__QNX__)
576
603
  msync(closure->tramp, 8, 0x1000000); /* clear data map */
577
604
  msync(codeloc, 8, 0x1000000); /* clear insn map */
605
+ #elif defined(_MSC_VER)
606
+ FlushInstructionCache(GetCurrentProcess(), closure->tramp, FFI_TRAMPOLINE_SIZE);
578
607
  #else
579
608
  __clear_cache(closure->tramp, closure->tramp + 8); /* clear data map */
580
609
  __clear_cache(codeloc, codeloc + 8); /* clear insn map */
581
610
  #endif
611
+ #ifdef _M_ARM
612
+ *(void(**)(void))(closure->tramp + FFI_TRAMPOLINE_CLOSURE_FUNCTION) = closure_func;
613
+ #else
582
614
  *(void (**)(void))(closure->tramp + 8) = closure_func;
615
+ #endif
583
616
  #endif
584
617
 
585
618
  closure->cif = cif;
@@ -781,7 +814,7 @@ place_vfp_arg (ffi_cif *cif, int h)
781
814
  }
782
815
  /* Found regs to allocate. */
783
816
  cif->vfp_used |= new_used;
784
- cif->vfp_args[cif->vfp_nargs++] = reg;
817
+ cif->vfp_args[cif->vfp_nargs++] = (signed char)reg;
785
818
 
786
819
  /* Update vfp_reg_free. */
787
820
  if (cif->vfp_used & (1 << cif->vfp_reg_free))
@@ -803,7 +836,7 @@ place_vfp_arg (ffi_cif *cif, int h)
803
836
  static void
804
837
  layout_vfp_args (ffi_cif * cif)
805
838
  {
806
- int i;
839
+ unsigned int i;
807
840
  /* Init VFP fields */
808
841
  cif->vfp_used = 0;
809
842
  cif->vfp_nargs = 0;
@@ -817,3 +850,5 @@ layout_vfp_args (ffi_cif * cif)
817
850
  break;
818
851
  }
819
852
  }
853
+
854
+ #endif /* __arm__ or _M_ARM */
@@ -43,7 +43,7 @@ typedef enum ffi_abi {
43
43
  FFI_SYSV,
44
44
  FFI_VFP,
45
45
  FFI_LAST_ABI,
46
- #ifdef __ARM_PCS_VFP
46
+ #if defined(__ARM_PCS_VFP) || defined(_M_ARM)
47
47
  FFI_DEFAULT_ABI = FFI_VFP,
48
48
  #else
49
49
  FFI_DEFAULT_ABI = FFI_SYSV,
@@ -57,7 +57,9 @@ typedef enum ffi_abi {
57
57
  signed char vfp_args[16] \
58
58
 
59
59
  #define FFI_TARGET_SPECIFIC_VARIADIC
60
+ #ifndef _M_ARM
60
61
  #define FFI_TARGET_HAS_COMPLEX_TYPE
62
+ #endif
61
63
 
62
64
  /* ---- Definitions for closures ----------------------------------------- */
63
65
 
@@ -74,8 +76,13 @@ typedef enum ffi_abi {
74
76
  #error "No trampoline table implementation"
75
77
  #endif
76
78
 
79
+ #else
80
+ #ifdef _MSC_VER
81
+ #define FFI_TRAMPOLINE_SIZE 16
82
+ #define FFI_TRAMPOLINE_CLOSURE_FUNCTION 12
77
83
  #else
78
84
  #define FFI_TRAMPOLINE_SIZE 12
85
+ #endif
79
86
  #define FFI_TRAMPOLINE_CLOSURE_OFFSET FFI_TRAMPOLINE_SIZE
80
87
  #endif
81
88
 
@@ -25,6 +25,7 @@
25
25
  DEALINGS IN THE SOFTWARE.
26
26
  ----------------------------------------------------------------------- */
27
27
 
28
+ #ifdef __arm__
28
29
  #define LIBFFI_ASM
29
30
  #include <fficonfig.h>
30
31
  #include <ffi.h>
@@ -377,6 +378,7 @@ ARM_FUNC_START(ffi_arm_trampoline)
377
378
  ARM_FUNC_END(ffi_arm_trampoline)
378
379
 
379
380
  #endif /* FFI_EXEC_TRAMPOLINE_TABLE */
381
+ #endif /* __arm__ */
380
382
 
381
383
  #if defined __ELF__ && defined __linux__
382
384
  .section .note.GNU-stack,"",%progbits