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
data/ext/ffi_c/Call.c CHANGED
@@ -43,10 +43,8 @@
43
43
  #endif
44
44
  #include <errno.h>
45
45
  #include <ruby.h>
46
- #if defined(HAVE_RUBY_THREAD_H)
47
46
  #include <ruby/thread.h>
48
- #endif
49
- #if defined(HAVE_NATIVETHREAD) && (defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)) && !defined(_WIN32)
47
+ #if defined(HAVE_NATIVETHREAD) && !defined(_WIN32)
50
48
  # include <signal.h>
51
49
  # include <pthread.h>
52
50
  #endif
@@ -116,7 +114,7 @@ rbffi_SetupCallParams(int argc, VALUE* argv, int paramCount, Type** paramTypes,
116
114
  Type* paramType = paramTypes[i];
117
115
  int type;
118
116
 
119
-
117
+
120
118
  if (unlikely(paramType->nativeType == NATIVE_MAPPED)) {
121
119
  VALUE values[] = { argv[argidx], Qnil };
122
120
  argv[argidx] = rb_funcall2(((MappedType *) paramType)->rbConverter, id_to_native, 2, values);
@@ -297,13 +295,9 @@ rbffi_SetupCallParams(int argc, VALUE* argv, int paramCount, Type** paramTypes,
297
295
 
298
296
  case NATIVE_STRING:
299
297
  if (type == T_NIL) {
300
- param->ptr = NULL;
301
-
302
- } else {
303
- if (rb_safe_level() >= 1 && OBJ_TAINTED(argv[argidx])) {
304
- rb_raise(rb_eSecurityError, "Unsafe string parameter");
305
- }
298
+ param->ptr = NULL;
306
299
 
300
+ } else {
307
301
  param->ptr = StringValueCStr(argv[argidx]);
308
302
  }
309
303
 
@@ -345,23 +339,27 @@ static void *
345
339
  call_blocking_function(void* data)
346
340
  {
347
341
  rbffi_blocking_call_t* b = (rbffi_blocking_call_t *) data;
342
+ #ifndef HAVE_RUBY_THREAD_HAS_GVL_P
348
343
  b->frame->has_gvl = false;
344
+ #endif
349
345
  ffi_call(&b->cif, FFI_FN(b->function), b->retval, b->ffiValues);
346
+ #ifndef HAVE_RUBY_THREAD_HAS_GVL_P
350
347
  b->frame->has_gvl = true;
348
+ #endif
351
349
 
352
350
  return NULL;
353
351
  }
354
352
 
355
353
  VALUE
356
- rbffi_do_blocking_call(void *data)
354
+ rbffi_do_blocking_call(VALUE data)
357
355
  {
358
- rbffi_thread_blocking_region(call_blocking_function, data, (void *) -1, NULL);
356
+ rb_thread_call_without_gvl(call_blocking_function, (void*)data, (void *) -1, NULL);
359
357
 
360
358
  return Qnil;
361
359
  }
362
360
 
363
361
  VALUE
364
- rbffi_save_frame_exception(void *data, VALUE exc)
362
+ rbffi_save_frame_exception(VALUE data, VALUE exc)
365
363
  {
366
364
  rbffi_frame_t* frame = (rbffi_frame_t *) data;
367
365
  frame->exc = exc;
@@ -376,28 +374,17 @@ rbffi_CallFunction(int argc, VALUE* argv, void* function, FunctionType* fnInfo)
376
374
  FFIStorage* params;
377
375
  VALUE rbReturnValue;
378
376
  rbffi_frame_t frame = { 0 };
379
-
377
+
380
378
  retval = alloca(MAX(fnInfo->ffi_cif.rtype->size, FFI_SIZEOF_ARG));
381
-
379
+
382
380
  if (unlikely(fnInfo->blocking)) {
383
381
  rbffi_blocking_call_t* bc;
384
382
 
385
- /*
386
- * due to the way thread switching works on older ruby variants, we
387
- * cannot allocate anything passed to the blocking function on the stack
388
- */
389
- #if defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
383
+ /* allocate information passed to the blocking function on the stack */
390
384
  ffiValues = ALLOCA_N(void *, fnInfo->parameterCount);
391
385
  params = ALLOCA_N(FFIStorage, fnInfo->parameterCount);
392
386
  bc = ALLOCA_N(rbffi_blocking_call_t, 1);
393
387
  bc->retval = retval;
394
- #else
395
- ffiValues = ALLOC_N(void *, fnInfo->parameterCount);
396
- params = ALLOC_N(FFIStorage, fnInfo->parameterCount);
397
- bc = ALLOC_N(rbffi_blocking_call_t, 1);
398
- bc->retval = xmalloc(MAX(fnInfo->ffi_cif.rtype->size, FFI_SIZEOF_ARG));
399
- bc->stkretval = retval;
400
- #endif
401
388
  bc->cif = fnInfo->ffi_cif;
402
389
  bc->function = function;
403
390
  bc->ffiValues = ffiValues;
@@ -408,18 +395,10 @@ rbffi_CallFunction(int argc, VALUE* argv, void* function, FunctionType* fnInfo)
408
395
  fnInfo->parameterCount, fnInfo->parameterTypes, params, ffiValues,
409
396
  fnInfo->callbackParameters, fnInfo->callbackCount, fnInfo->rbEnums);
410
397
 
411
- rbffi_frame_push(&frame);
398
+ rbffi_frame_push(&frame);
412
399
  rb_rescue2(rbffi_do_blocking_call, (VALUE) bc, rbffi_save_frame_exception, (VALUE) &frame, rb_eException, (VALUE) 0);
413
400
  rbffi_frame_pop(&frame);
414
401
 
415
- #if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL))
416
- memcpy(bc->stkretval, bc->retval, MAX(bc->cif.rtype->size, FFI_SIZEOF_ARG));
417
- xfree(bc->params);
418
- xfree(bc->ffiValues);
419
- xfree(bc->retval);
420
- xfree(bc);
421
- #endif
422
-
423
402
  } else {
424
403
 
425
404
  ffiValues = ALLOCA_N(void *, fnInfo->parameterCount);
@@ -436,7 +415,7 @@ rbffi_CallFunction(int argc, VALUE* argv, void* function, FunctionType* fnInfo)
436
415
 
437
416
  if (unlikely(!fnInfo->ignoreErrno)) {
438
417
  rbffi_save_errno();
439
- }
418
+ }
440
419
 
441
420
  if (RTEST(frame.exc) && frame.exc != Qnil) {
442
421
  rb_exc_raise(frame.exc);
@@ -444,7 +423,7 @@ rbffi_CallFunction(int argc, VALUE* argv, void* function, FunctionType* fnInfo)
444
423
 
445
424
  RB_GC_GUARD(rbReturnValue) = rbffi_NativeValue_ToRuby(fnInfo->returnType, fnInfo->rbReturnType, retval);
446
425
  RB_GC_GUARD(fnInfo->rbReturnType);
447
-
426
+
448
427
  return rbReturnValue;
449
428
  }
450
429
 
@@ -461,7 +440,7 @@ getPointer(VALUE value, int type)
461
440
  return memory != NULL ? memory->address : NULL;
462
441
 
463
442
  } else if (type == T_STRING) {
464
-
443
+
465
444
  return StringValuePtr(value);
466
445
 
467
446
  } else if (type == T_NIL) {
data/ext/ffi_c/Call.h CHANGED
@@ -48,7 +48,7 @@ extern "C" {
48
48
  #if (defined(__i386__) || defined(__x86_64__)) && !(defined(_WIN32) || defined(__WIN32__))
49
49
  # define BYPASS_FFI 1
50
50
  #endif
51
-
51
+
52
52
  typedef union {
53
53
  #ifdef USE_RAW
54
54
  signed int s8, s16, s32;
@@ -70,7 +70,7 @@ typedef union {
70
70
  double f64;
71
71
  long double ld;
72
72
  } FFIStorage;
73
-
73
+
74
74
  extern void rbffi_Call_Init(VALUE moduleFFI);
75
75
 
76
76
  extern void rbffi_SetupCallParams(int argc, VALUE* argv, int paramCount, Type** paramTypes,
@@ -94,13 +94,10 @@ typedef struct rbffi_blocking_call {
94
94
  void **ffiValues;
95
95
  void* retval;
96
96
  void* params;
97
- #if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL))
98
- void* stkretval;
99
- #endif
100
97
  } rbffi_blocking_call_t;
101
98
 
102
- VALUE rbffi_do_blocking_call(void* data);
103
- VALUE rbffi_save_frame_exception(void *data, VALUE exc);
99
+ VALUE rbffi_do_blocking_call(VALUE data);
100
+ VALUE rbffi_save_frame_exception(VALUE data, VALUE exc);
104
101
 
105
102
  #ifdef __cplusplus
106
103
  }
@@ -164,7 +164,7 @@ library_dlerror(VALUE self)
164
164
  {
165
165
  char errmsg[1024];
166
166
  dl_error(errmsg, sizeof(errmsg));
167
- return rb_tainted_str_new2(errmsg);
167
+ return rb_str_new2(errmsg);
168
168
  }
169
169
 
170
170
  static void
data/ext/ffi_c/Function.c CHANGED
@@ -47,9 +47,7 @@
47
47
  # endif
48
48
  #endif
49
49
  #include <ruby.h>
50
- #if defined(HAVE_RUBY_THREAD_H)
51
50
  #include <ruby/thread.h>
52
- #endif
53
51
 
54
52
  #include <ffi.h>
55
53
  #if defined(HAVE_NATIVETHREAD) && !defined(_WIN32)
@@ -90,8 +88,8 @@ static VALUE function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc);
90
88
  static void callback_invoke(ffi_cif* cif, void* retval, void** parameters, void* user_data);
91
89
  static bool callback_prep(void* ctx, void* code, Closure* closure, char* errmsg, size_t errmsgsize);
92
90
  static void* callback_with_gvl(void* data);
93
- static VALUE invoke_callback(void* data);
94
- static VALUE save_callback_exception(void* data, VALUE exc);
91
+ static VALUE invoke_callback(VALUE data);
92
+ static VALUE save_callback_exception(VALUE data, VALUE exc);
95
93
 
96
94
  #define DEFER_ASYNC_CALLBACK 1
97
95
 
@@ -101,10 +99,27 @@ static VALUE async_cb_event(void *);
101
99
  static VALUE async_cb_call(void *);
102
100
  #endif
103
101
 
104
- #ifdef HAVE_RB_THREAD_CALL_WITH_GVL
105
- extern void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
102
+ #ifdef HAVE_RUBY_THREAD_HAS_GVL_P
103
+ extern int ruby_thread_has_gvl_p(void);
104
+ #define rbffi_thread_has_gvl_p(frame) ruby_thread_has_gvl_p()
105
+ #else
106
+ static int rbffi_thread_has_gvl_p(rbffi_frame_t *frame)
107
+ {
108
+ return frame != NULL && frame->has_gvl;
109
+ }
106
110
  #endif
107
111
 
112
+ #ifdef HAVE_RUBY_NATIVE_THREAD_P
113
+ extern int ruby_native_thread_p(void);
114
+ #define rbffi_native_thread_p(frame) ruby_native_thread_p()
115
+ #else
116
+ static int rbffi_native_thread_p(rbffi_frame_t *frame)
117
+ {
118
+ return frame != NULL;
119
+ }
120
+ #endif
121
+
122
+
108
123
  VALUE rbffi_FunctionClass = Qnil;
109
124
 
110
125
  #if defined(DEFER_ASYNC_CALLBACK)
@@ -136,15 +151,9 @@ static struct gvl_callback* async_cb_list = NULL;
136
151
  # ifndef _WIN32
137
152
  static pthread_mutex_t async_cb_mutex = PTHREAD_MUTEX_INITIALIZER;
138
153
  static pthread_cond_t async_cb_cond = PTHREAD_COND_INITIALIZER;
139
- # if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL))
140
- static int async_cb_pipe[2];
141
- # endif
142
154
  # else
143
155
  static HANDLE async_cb_cond;
144
156
  static CRITICAL_SECTION async_cb_lock;
145
- # if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL))
146
- static int async_cb_pipe[2];
147
- # endif
148
157
  # endif
149
158
  #endif
150
159
 
@@ -323,16 +332,8 @@ function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc)
323
332
 
324
333
  #if defined(DEFER_ASYNC_CALLBACK)
325
334
  if (async_cb_thread == Qnil) {
326
- #if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)) && defined(_WIN32)
327
- _pipe(async_cb_pipe, 1024, O_BINARY);
328
- #elif !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL))
329
- pipe(async_cb_pipe);
330
- fcntl(async_cb_pipe[0], F_SETFL, fcntl(async_cb_pipe[0], F_GETFL) | O_NONBLOCK);
331
- fcntl(async_cb_pipe[1], F_SETFL, fcntl(async_cb_pipe[1], F_GETFL) | O_NONBLOCK);
332
- #endif
333
335
  async_cb_thread = rb_thread_create(async_cb_event, NULL);
334
336
  }
335
-
336
337
  #endif
337
338
 
338
339
  fn->closure = rbffi_Closure_Alloc(fn->info->closurePool);
@@ -474,13 +475,13 @@ callback_invoke(ffi_cif* cif, void* retval, void** parameters, void* user_data)
474
475
  cb.frame = rbffi_frame_current();
475
476
 
476
477
  if (cb.frame != NULL) cb.frame->exc = Qnil;
477
- if (cb.frame != NULL && cb.frame->has_gvl) {
478
- callback_with_gvl(&cb);
479
478
 
480
- #if defined(HAVE_RB_THREAD_CALL_WITH_GVL)
481
- } else if (cb.frame != NULL) {
479
+ if (rbffi_native_thread_p(cb.frame)) {
480
+ if(rbffi_thread_has_gvl_p(cb.frame)) {
481
+ callback_with_gvl(&cb);
482
+ } else {
482
483
  rb_thread_call_with_gvl(callback_with_gvl, &cb);
483
- #endif
484
+ }
484
485
  #if defined(DEFER_ASYNC_CALLBACK) && !defined(_WIN32)
485
486
  } else {
486
487
  bool empty = false;
@@ -494,17 +495,8 @@ callback_invoke(ffi_cif* cif, void* retval, void** parameters, void* user_data)
494
495
  cb.next = async_cb_list;
495
496
  async_cb_list = &cb;
496
497
 
497
- #if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL))
498
- pthread_mutex_unlock(&async_cb_mutex);
499
- /* Only signal if the list was empty */
500
- if (empty) {
501
- char c;
502
- write(async_cb_pipe[1], &c, 1);
503
- }
504
- #else
505
498
  pthread_cond_signal(&async_cb_cond);
506
499
  pthread_mutex_unlock(&async_cb_mutex);
507
- #endif
508
500
 
509
501
  /* Wait for the thread executing the ruby callback to signal it is done */
510
502
  pthread_mutex_lock(&cb.async_mutex);
@@ -528,15 +520,7 @@ callback_invoke(ffi_cif* cif, void* retval, void** parameters, void* user_data)
528
520
  async_cb_list = &cb;
529
521
  LeaveCriticalSection(&async_cb_lock);
530
522
 
531
- #if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL))
532
- /* Only signal if the list was empty */
533
- if (empty) {
534
- char c;
535
- write(async_cb_pipe[1], &c, 1);
536
- }
537
- #else
538
523
  SetEvent(async_cb_cond);
539
- #endif
540
524
 
541
525
  /* Wait for the thread executing the ruby callback to signal it is done */
542
526
  WaitForSingleObject(cb.async_event, INFINITE);
@@ -554,7 +538,6 @@ struct async_wait {
554
538
  static void * async_cb_wait(void *);
555
539
  static void async_cb_stop(void *);
556
540
 
557
- #if defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
558
541
  static VALUE
559
542
  async_cb_event(void* unused)
560
543
  {
@@ -562,11 +545,7 @@ async_cb_event(void* unused)
562
545
 
563
546
  w.stop = false;
564
547
  while (!w.stop) {
565
- #if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
566
548
  rb_thread_call_without_gvl(async_cb_wait, &w, async_cb_stop, &w);
567
- #else
568
- rb_thread_blocking_region(async_cb_wait, &w, async_cb_stop, &w);
569
- #endif
570
549
  if (w.cb != NULL) {
571
550
  /* Start up a new ruby thread to run the ruby callback */
572
551
  rb_thread_create(async_cb_call, w.cb);
@@ -576,69 +555,6 @@ async_cb_event(void* unused)
576
555
  return Qnil;
577
556
  }
578
557
 
579
- #elif defined(_WIN32)
580
- static VALUE
581
- async_cb_event(void* unused)
582
- {
583
- while (true) {
584
- struct gvl_callback* cb;
585
- char buf[64];
586
- fd_set rfds;
587
-
588
- FD_ZERO(&rfds);
589
- FD_SET(async_cb_pipe[0], &rfds);
590
- rb_thread_select(async_cb_pipe[0] + 1, &rfds, NULL, NULL, NULL);
591
- read(async_cb_pipe[0], buf, sizeof(buf));
592
-
593
- EnterCriticalSection(&async_cb_lock);
594
- cb = async_cb_list;
595
- async_cb_list = NULL;
596
- LeaveCriticalSection(&async_cb_lock);
597
-
598
- while (cb != NULL) {
599
- struct gvl_callback* next = cb->next;
600
- /* Start up a new ruby thread to run the ruby callback */
601
- rb_thread_create(async_cb_call, cb);
602
- cb = next;
603
- }
604
- }
605
-
606
- return Qnil;
607
- }
608
- #else
609
- static VALUE
610
- async_cb_event(void* unused)
611
- {
612
- while (true) {
613
- struct gvl_callback* cb;
614
- char buf[64];
615
-
616
- if (read(async_cb_pipe[0], buf, sizeof(buf)) < 0) {
617
- rb_thread_wait_fd(async_cb_pipe[0]);
618
- while (read(async_cb_pipe[0], buf, sizeof (buf)) < 0) {
619
- if (rb_io_wait_readable(async_cb_pipe[0]) != Qtrue) {
620
- return Qfalse;
621
- }
622
- }
623
- }
624
-
625
- pthread_mutex_lock(&async_cb_mutex);
626
- cb = async_cb_list;
627
- async_cb_list = NULL;
628
- pthread_mutex_unlock(&async_cb_mutex);
629
-
630
- while (cb != NULL) {
631
- struct gvl_callback* next = cb->next;
632
- /* Start up a new ruby thread to run the ruby callback */
633
- rb_thread_create(async_cb_call, cb);
634
- cb = next;
635
- }
636
- }
637
-
638
- return Qnil;
639
- }
640
- #endif
641
-
642
558
  #ifdef _WIN32
643
559
  static void *
644
560
  async_cb_wait(void *data)
@@ -742,7 +658,7 @@ callback_with_gvl(void* data)
742
658
  }
743
659
 
744
660
  static VALUE
745
- invoke_callback(void* data)
661
+ invoke_callback(VALUE data)
746
662
  {
747
663
  struct gvl_callback* cb = (struct gvl_callback *) data;
748
664
 
@@ -808,7 +724,7 @@ invoke_callback(void* data)
808
724
  param = rbffi_longdouble_new(*(long double *) parameters[i]);
809
725
  break;
810
726
  case NATIVE_STRING:
811
- param = (*(void **) parameters[i] != NULL) ? rb_tainted_str_new2(*(char **) parameters[i]) : Qnil;
727
+ param = (*(void **) parameters[i] != NULL) ? rb_str_new2(*(char **) parameters[i]) : Qnil;
812
728
  break;
813
729
  case NATIVE_POINTER:
814
730
  param = rbffi_Pointer_NewInstance(*(void **) parameters[i]);
@@ -932,7 +848,7 @@ invoke_callback(void* data)
932
848
  }
933
849
 
934
850
  static VALUE
935
- save_callback_exception(void* data, VALUE exc)
851
+ save_callback_exception(VALUE data, VALUE exc)
936
852
  {
937
853
  struct gvl_callback* cb = (struct gvl_callback *) data;
938
854
 
@@ -49,8 +49,17 @@
49
49
  # define USE_PTHREAD_LOCAL
50
50
  #endif
51
51
 
52
+ #if defined(__CYGWIN__)
53
+ typedef uint32_t DWORD;
54
+ DWORD __stdcall GetLastError(void);
55
+ void __stdcall SetLastError(DWORD);
56
+ #endif
57
+
52
58
  typedef struct ThreadData {
53
59
  int td_errno;
60
+ #if defined(_WIN32) || defined(__CYGWIN__)
61
+ DWORD td_winapi_errno;
62
+ #endif
54
63
  } ThreadData;
55
64
 
56
65
  #if defined(USE_PTHREAD_LOCAL)
@@ -126,6 +135,19 @@ get_last_error(VALUE self)
126
135
  return INT2NUM(thread_data_get()->td_errno);
127
136
  }
128
137
 
138
+ #if defined(_WIN32) || defined(__CYGWIN__)
139
+ /*
140
+ * call-seq: winapi_error
141
+ * @return [Numeric]
142
+ * Get +GetLastError()+ value. Only Windows or Cygwin.
143
+ */
144
+ static VALUE
145
+ get_last_winapi_error(VALUE self)
146
+ {
147
+ return INT2NUM(thread_data_get()->td_winapi_errno);
148
+ }
149
+ #endif
150
+
129
151
 
130
152
  /*
131
153
  * call-seq: error(error)
@@ -146,22 +168,40 @@ set_last_error(VALUE self, VALUE error)
146
168
  return Qnil;
147
169
  }
148
170
 
171
+ #if defined(_WIN32) || defined(__CYGWIN__)
172
+ /*
173
+ * call-seq: error(error)
174
+ * @param [Numeric] error
175
+ * @return [nil]
176
+ * Set +GetLastError()+ value. Only on Windows and Cygwin.
177
+ */
178
+ static VALUE
179
+ set_last_winapi_error(VALUE self, VALUE error)
180
+ {
181
+ SetLastError(NUM2INT(error));
182
+ return Qnil;
183
+ }
184
+ #endif
185
+
149
186
 
150
187
  void
151
188
  rbffi_save_errno(void)
152
189
  {
153
190
  int error = 0;
154
-
155
191
  #ifdef _WIN32
156
192
  error = GetLastError();
157
193
  #else
158
194
  error = errno;
159
195
  #endif
160
196
 
197
+ #if defined(_WIN32) || defined(__CYGWIN__)
198
+ DWORD winapi_error = GetLastError();
199
+ thread_data_get()->td_winapi_errno = winapi_error;
200
+ #endif
201
+
161
202
  thread_data_get()->td_errno = error;
162
203
  }
163
204
 
164
-
165
205
  void
166
206
  rbffi_LastError_Init(VALUE moduleFFI)
167
207
  {
@@ -175,6 +215,11 @@ rbffi_LastError_Init(VALUE moduleFFI)
175
215
  rb_define_module_function(moduleError, "error", get_last_error, 0);
176
216
  rb_define_module_function(moduleError, "error=", set_last_error, 1);
177
217
 
218
+ #if defined(_WIN32) || defined(__CYGWIN__)
219
+ rb_define_module_function(moduleError, "winapi_error", get_last_winapi_error, 0);
220
+ rb_define_module_function(moduleError, "winapi_error=", set_last_winapi_error, 1);
221
+ #endif
222
+
178
223
  #if defined(USE_PTHREAD_LOCAL)
179
224
  pthread_key_create(&threadDataKey, thread_data_free);
180
225
  #else
@@ -9,9 +9,9 @@
9
9
 
10
10
  static VALUE rb_cBigDecimal = Qnil;
11
11
  static VALUE bigdecimal_load(VALUE unused);
12
- static VALUE bigdecimal_failed(VALUE value);
12
+ static VALUE bigdecimal_failed(VALUE value, VALUE exc);
13
13
 
14
- VALUE
14
+ VALUE
15
15
  rbffi_longdouble_new(long double ld)
16
16
  {
17
17
  if (!RTEST(rb_cBigDecimal)) {
@@ -28,13 +28,13 @@ rbffi_longdouble_new(long double ld)
28
28
  return rb_float_new(ld);
29
29
  }
30
30
 
31
- long double
31
+ long double
32
32
  rbffi_num2longdouble(VALUE value)
33
33
  {
34
34
  if (TYPE(value) == T_FLOAT) {
35
35
  return rb_num2dbl(value);
36
36
  }
37
-
37
+
38
38
  if (!RTEST(rb_cBigDecimal) && rb_const_defined(rb_cObject, rb_intern("BigDecimal"))) {
39
39
  rb_cBigDecimal = rb_const_get(rb_cObject, rb_intern("BigDecimal"));
40
40
  }
@@ -49,15 +49,15 @@ rbffi_num2longdouble(VALUE value)
49
49
  }
50
50
 
51
51
 
52
- static VALUE
52
+ static VALUE
53
53
  bigdecimal_load(VALUE unused)
54
54
  {
55
55
  rb_require("bigdecimal");
56
56
  return rb_const_get(rb_cObject, rb_intern("BigDecimal"));
57
57
  }
58
58
 
59
- static VALUE
60
- bigdecimal_failed(VALUE value)
59
+ static VALUE
60
+ bigdecimal_failed(VALUE value, VALUE exc)
61
61
  {
62
62
  return value;
63
63
  }
data/ext/ffi_c/Platform.c CHANGED
@@ -49,51 +49,6 @@
49
49
 
50
50
  static VALUE PlatformModule = Qnil;
51
51
 
52
- /*
53
- * Determine the cpu type at compile time - useful for MacOSX where the the
54
- * system installed ruby incorrectly reports 'host_cpu' as 'powerpc' when running
55
- * on intel.
56
- */
57
- #if defined(__x86_64__) || defined(__x86_64) || defined(__amd64) || defined(_M_X64) || defined(_M_AMD64)
58
- # define CPU "x86_64"
59
-
60
- #elif defined(__i386__) || defined(__i386) || defined(_M_IX86)
61
- # define CPU "i386"
62
-
63
- #elif defined(__ppc64__) || defined(__powerpc64__) || defined(_M_PPC)
64
- # define CPU "ppc64"
65
-
66
- #elif defined(__ppc__) || defined(__powerpc__) || defined(__powerpc)
67
- # define CPU "ppc"
68
-
69
- /*
70
- * Need to check for __sparcv9 first, because __sparc will be defined either way.
71
- * Note that __sparcv9 seems to only be set for Solaris. On Linux, __sparc will
72
- * be set, along with __arch64__ if a 64-bit platform.
73
- */
74
- #elif defined(__sparcv9__) || defined(__sparcv9)
75
- # define CPU "sparcv9"
76
-
77
- #elif defined(__sparc__) || defined(__sparc)
78
- # if defined(__arch64__)
79
- # define CPU "sparcv9"
80
- # else
81
- # define CPU "sparc"
82
- # endif
83
-
84
- #elif defined(__arm__) || defined(__arm)
85
- # define CPU "arm"
86
-
87
- #elif defined(__mips__) || defined(__mips)
88
- # define CPU "mips"
89
-
90
- #elif defined(__s390__)
91
- # define CPU "s390"
92
-
93
- #else
94
- # define CPU "unknown"
95
- #endif
96
-
97
52
  static void
98
53
  export_primitive_types(VALUE module)
99
54
  {
@@ -120,10 +75,8 @@ rbffi_Platform_Init(VALUE moduleFFI)
120
75
  rb_define_const(PlatformModule, "BYTE_ORDER", INT2FIX(BYTE_ORDER));
121
76
  rb_define_const(PlatformModule, "LITTLE_ENDIAN", INT2FIX(LITTLE_ENDIAN));
122
77
  rb_define_const(PlatformModule, "BIG_ENDIAN", INT2FIX(BIG_ENDIAN));
123
- rb_define_const(PlatformModule, "CPU", rb_str_new2(CPU));
124
78
  #if defined(__GNU__) || defined(__GLIBC__)
125
79
  rb_define_const(PlatformModule, "GNU_LIBC", rb_str_new2(LIBC_SO));
126
80
  #endif
127
81
  export_primitive_types(PlatformModule);
128
82
  }
129
-