ffi 1.13.1 → 1.15.1

data/lib/ffi/platform/x86_64-msys/types.conf

@@ -0,0 +1,119 @@
+rbx.platform.typedef.*addr_t = char
+rbx.platform.typedef.__ULong = uint
+rbx.platform.typedef.__blkcnt_t = long
+rbx.platform.typedef.__blksize_t = int
+rbx.platform.typedef.__clock_t = ulong
+rbx.platform.typedef.__clockid_t = ulong
+rbx.platform.typedef.__cpu_mask = ulong
+rbx.platform.typedef.__dev_t = uint
+rbx.platform.typedef.__fsblkcnt_t = ulong
+rbx.platform.typedef.__fsfilcnt_t = ulong
+rbx.platform.typedef.__gid_t = uint
+rbx.platform.typedef.__id_t = uint
+rbx.platform.typedef.__ino_t = ulong
+rbx.platform.typedef.__int32_t = int
+rbx.platform.typedef.__int64_t = long
+rbx.platform.typedef.__int8_t = char
+rbx.platform.typedef.__int_least32_t = int
+rbx.platform.typedef.__int_least64_t = long
+rbx.platform.typedef.__int_least8_t = char
+rbx.platform.typedef.__intmax_t = long
+rbx.platform.typedef.__intptr_t = long
+rbx.platform.typedef.__key_t = long_long
+rbx.platform.typedef.__loff_t = long_long
+rbx.platform.typedef.__mode_t = uint
+rbx.platform.typedef.__nl_item = int
+rbx.platform.typedef.__nlink_t = ushort
+rbx.platform.typedef.__off_t = long
+rbx.platform.typedef.__pid_t = int
+rbx.platform.typedef.__sigset_t = ulong
+rbx.platform.typedef.__size_t = ulong
+rbx.platform.typedef.__socklen_t = int
+rbx.platform.typedef.__suseconds_t = long
+rbx.platform.typedef.__time_t = long
+rbx.platform.typedef.__timer_t = ulong
+rbx.platform.typedef.__uid_t = uint
+rbx.platform.typedef.__uint32_t = uint
+rbx.platform.typedef.__uint64_t = ulong
+rbx.platform.typedef.__uint8_t = uchar
+rbx.platform.typedef.__uint_least32_t = uint
+rbx.platform.typedef.__uint_least64_t = ulong
+rbx.platform.typedef.__uint_least8_t = uchar
+rbx.platform.typedef.__uintmax_t = ulong
+rbx.platform.typedef.__uintptr_t = ulong
+rbx.platform.typedef.__useconds_t = ulong
+rbx.platform.typedef._fpos64_t = long_long
+rbx.platform.typedef._fpos_t = long
+rbx.platform.typedef._off64_t = long_long
+rbx.platform.typedef._off_t = long
+rbx.platform.typedef.blkcnt_t = long
+rbx.platform.typedef.blksize_t = int
+rbx.platform.typedef.caddr_t = string
+rbx.platform.typedef.clock_t = ulong
+rbx.platform.typedef.clockid_t = ulong
+rbx.platform.typedef.daddr_t = long
+rbx.platform.typedef.dev_t = uint
+rbx.platform.typedef.fd_mask = ulong
+rbx.platform.typedef.fsblkcnt_t = ulong
+rbx.platform.typedef.fsfilcnt_t = ulong
+rbx.platform.typedef.gid_t = uint
+rbx.platform.typedef.id_t = uint
+rbx.platform.typedef.in_addr_t = uint
+rbx.platform.typedef.ino_t = ulong
+rbx.platform.typedef.int32_t = int
+rbx.platform.typedef.int64_t = long
+rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.int_fast16_t = long
+rbx.platform.typedef.int_fast32_t = long
+rbx.platform.typedef.int_fast64_t = long
+rbx.platform.typedef.int_fast8_t = char
+rbx.platform.typedef.int_least32_t = int
+rbx.platform.typedef.int_least64_t = long
+rbx.platform.typedef.int_least8_t = char
+rbx.platform.typedef.intmax_t = long
+rbx.platform.typedef.intptr_t = long
+rbx.platform.typedef.key_t = long_long
+rbx.platform.typedef.loff_t = long_long
+rbx.platform.typedef.mode_t = uint
+rbx.platform.typedef.nlink_t = ushort
+rbx.platform.typedef.off_t = long
+rbx.platform.typedef.pid_t = int
+rbx.platform.typedef.ptrdiff_t = long
+rbx.platform.typedef.register_t = long
+rbx.platform.typedef.rlim_t = ulong
+rbx.platform.typedef.sbintime_t = long
+rbx.platform.typedef.sig_atomic_t = int
+rbx.platform.typedef.sigset_t = ulong
+rbx.platform.typedef.size_t = ulong
+rbx.platform.typedef.socklen_t = int
+rbx.platform.typedef.suseconds_t = long
+rbx.platform.typedef.time_t = long
+rbx.platform.typedef.timer_t = ulong
+rbx.platform.typedef.u_char = uchar
+rbx.platform.typedef.u_int = uint
+rbx.platform.typedef.u_int32_t = uint
+rbx.platform.typedef.u_int64_t = ulong
+rbx.platform.typedef.u_int8_t = uchar
+rbx.platform.typedef.u_long = ulong
+rbx.platform.typedef.u_register_t = ulong
+rbx.platform.typedef.u_short = ushort
+rbx.platform.typedef.uid_t = uint
+rbx.platform.typedef.uint = uint
+rbx.platform.typedef.uint32_t = uint
+rbx.platform.typedef.uint64_t = ulong
+rbx.platform.typedef.uint8_t = uchar
+rbx.platform.typedef.uint_fast16_t = ulong
+rbx.platform.typedef.uint_fast32_t = ulong
+rbx.platform.typedef.uint_fast64_t = ulong
+rbx.platform.typedef.uint_fast8_t = uchar
+rbx.platform.typedef.uint_least32_t = uint
+rbx.platform.typedef.uint_least64_t = ulong
+rbx.platform.typedef.uint_least8_t = uchar
+rbx.platform.typedef.uintmax_t = ulong
+rbx.platform.typedef.uintptr_t = ulong
+rbx.platform.typedef.ulong = ulong
+rbx.platform.typedef.useconds_t = ulong
+rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.vm_offset_t = ulong
+rbx.platform.typedef.vm_size_t = ulong
+rbx.platform.typedef.wint_t = uint

data/lib/ffi/pointer.rb

@@ -52,7 +52,7 @@ module FFI
 
     # @param [nil,Numeric] len length of string to return
     # @return [String]
-    # Read pointer's contents as a string, or the first +len+ bytes of the 
+    # Read pointer's contents as a string, or the first +len+ bytes of the
     # equivalent string if +len+ is not +nil+.
     def read_string(len=nil)
       if len
@@ -96,7 +96,7 @@ module FFI
     # @param [String] str string to write
     # @param [Numeric] len length of string to return
     # @return [self]
-    # Write +str+ in pointer's contents, or first +len+ bytes if 
+    # Write +str+ in pointer's contents, or first +len+ bytes if
     # +len+ is not +nil+.
     def write_string(str, len=nil)
       len = str.bytesize unless len

data/lib/ffi/tools/const_generator.rb

@@ -124,7 +124,8 @@ module FFI
         f.puts "\n\treturn 0;\n}"
         f.flush
 
-        output = `gcc #{options[:cppflags]} -D_DARWIN_USE_64_BIT_INODE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -x c -Wall -Werror #{f.path} -o #{binary} 2>&1`
+        cc = ENV['CC'] || 'gcc'
+        output = `#{cc} #{options[:cppflags]} -D_DARWIN_USE_64_BIT_INODE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -x c -Wall -Werror #{f.path} -o #{binary} 2>&1`
 
         unless $?.success? then
           output = output.split("\n").map { |l| "\t#{l}" }.join "\n"

data/lib/ffi/tools/struct_generator.rb

@@ -82,7 +82,8 @@ module FFI
         f.puts "\n  return 0;\n}"
         f.flush
 
-        output = `gcc #{options[:cppflags]} #{options[:cflags]} -D_DARWIN_USE_64_BIT_INODE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -x c -Wall -Werror #{f.path} -o #{binary} 2>&1`
+        cc = ENV['CC'] || 'gcc'
+        output = `#{cc} #{options[:cppflags]} #{options[:cflags]} -D_DARWIN_USE_64_BIT_INODE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -x c -Wall -Werror #{f.path} -o #{binary} 2>&1`
 
         unless $?.success? then
           @found = false

data/lib/ffi/variadic.rb

@@ -31,16 +31,7 @@
 #
 
 module FFI
-  class VariadicInvoker    
-    def init(arg_types, type_map)
-      @fixed = Array.new
-      @type_map = type_map
-      arg_types.each_with_index do |type, i|
-        @fixed << type unless type == Type::VARARGS
-      end
-    end
-
-
+  class VariadicInvoker
     def call(*args, &block)
       param_types = Array.new(@fixed)
       param_values = Array.new

data/lib/ffi/version.rb

@@ -1,3 +1,3 @@
 module FFI
-  VERSION = '1.13.1'
+  VERSION = '1.15.1'
 end

data/rakelib/ffi_gem_helper.rb

@@ -0,0 +1,65 @@
+require 'bundler'
+require 'bundler/gem_helper'
+
+class FfiGemHelper < Bundler::GemHelper
+  attr_accessor :cross_platforms
+
+  def install
+    super
+
+    task "release:guard_clean" => ["release:update_history"]
+
+    task "release:update_history" do
+      update_history
+    end
+
+    task "release:rubygem_push" => ["gem:windows", "gem:java"]
+  end
+
+  def hfile
+    "CHANGELOG.md"
+  end
+
+  def headline
+    '([^\w]*)(\d+\.\d+\.\d+(?:\.\w+)?)([^\w]+)([2Y][0Y][0-9Y][0-9Y]-[0-1M][0-9M]-[0-3D][0-9D])([^\w]*|$)'
+  end
+
+  def reldate
+    Time.now.strftime("%Y-%m-%d")
+  end
+
+  def update_history
+    hin = File.read(hfile)
+    hout = hin.sub(/#{headline}/) do
+      raise "#{hfile} isn't up-to-date for version #{version}" unless $2==version.to_s
+      $1 + $2 + $3 + reldate + $5
+    end
+    if hout != hin
+      Bundler.ui.confirm "Updating #{hfile} for release."
+      File.write(hfile, hout)
+      Rake::FileUtilsExt.sh "git", "commit", hfile, "-m", "Update release date in #{hfile}"
+    end
+  end
+
+  def tag_version
+    Bundler.ui.confirm "Tag release with annotation:"
+    m = File.read(hfile).match(/(?<annotation>#{headline}.*?)#{headline}/m) || raise("Unable to find release notes in #{hfile}")
+    Bundler.ui.info(m[:annotation].gsub(/^/, "    "))
+    IO.popen(["git", "tag", "--file=-", version_tag], "w") do |fd|
+      fd.write m[:annotation]
+    end
+    yield if block_given?
+  rescue
+    Bundler.ui.error "Untagging #{version_tag} due to error."
+    sh_with_code "git tag -d #{version_tag}"
+    raise
+  end
+
+  def rubygem_push(path)
+    cross_platforms.each do |ruby_platform|
+      super(path.gsub(/\.gem\z/, "-#{ruby_platform}.gem"))
+    end
+    super(path.gsub(/\.gem\z/, "-java.gem"))
+    super(path)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.15.1
 platform: ruby
 authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2021-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -87,12 +87,6 @@ extensions:
 - ext/ffi_c/extconf.rb
 extra_rdoc_files: []
 files:
-- ".appveyor.yml"
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- ".gitmodules"
-- ".travis.yml"
-- ".yardopts"
 - CHANGELOG.md
 - COPYING
 - Gemfile
@@ -251,6 +245,9 @@ files:
 - ext/ffi_c/libffi/src/cris/ffi.c
 - ext/ffi_c/libffi/src/cris/ffitarget.h
 - ext/ffi_c/libffi/src/cris/sysv.S
+- ext/ffi_c/libffi/src/csky/ffi.c
+- ext/ffi_c/libffi/src/csky/ffitarget.h
+- ext/ffi_c/libffi/src/csky/sysv.S
 - ext/ffi_c/libffi/src/debug.c
 - ext/ffi_c/libffi/src/dlmalloc.c
 - ext/ffi_c/libffi/src/frv/eabi.S
@@ -261,6 +258,10 @@ files:
 - ext/ffi_c/libffi/src/ia64/ia64_flags.h
 - ext/ffi_c/libffi/src/ia64/unix.S
 - ext/ffi_c/libffi/src/java_raw_api.c
+- ext/ffi_c/libffi/src/kvx/asm.h
+- ext/ffi_c/libffi/src/kvx/ffi.c
+- ext/ffi_c/libffi/src/kvx/ffitarget.h
+- ext/ffi_c/libffi/src/kvx/sysv.S
 - ext/ffi_c/libffi/src/m32r/ffi.c
 - ext/ffi_c/libffi/src/m32r/ffitarget.h
 - ext/ffi_c/libffi/src/m32r/sysv.S
@@ -565,10 +566,9 @@ files:
 - ext/ffi_c/libffi/testsuite/libffi.go/static-chain.h
 - ext/ffi_c/rbffi.h
 - ext/ffi_c/rbffi_endian.h
-- ext/ffi_c/win32/stdbool.h
-- ext/ffi_c/win32/stdint.h
 - ffi.gemspec
 - lib/ffi.rb
+- lib/ffi/abstract_memory.rb
 - lib/ffi/autopointer.rb
 - lib/ffi/buffer.rb
 - lib/ffi/callback.rb
@@ -581,9 +581,11 @@ files:
 - lib/ffi/managedstruct.rb
 - lib/ffi/memorypointer.rb
 - lib/ffi/platform.rb
+- lib/ffi/platform/aarch64-darwin/types.conf
 - lib/ffi/platform/aarch64-freebsd/types.conf
 - lib/ffi/platform/aarch64-freebsd12/types.conf
 - lib/ffi/platform/aarch64-linux/types.conf
+- lib/ffi/platform/aarch64-openbsd/types.conf
 - lib/ffi/platform/arm-freebsd/types.conf
 - lib/ffi/platform/arm-freebsd12/types.conf
 - lib/ffi/platform/arm-linux/types.conf
@@ -611,6 +613,8 @@ files:
 - lib/ffi/platform/powerpc-linux/types.conf
 - lib/ffi/platform/powerpc-openbsd/types.conf
 - lib/ffi/platform/powerpc64-linux/types.conf
+- lib/ffi/platform/powerpc64le-linux/types.conf
+- lib/ffi/platform/riscv64-linux/types.conf
 - lib/ffi/platform/s390-linux/types.conf
 - lib/ffi/platform/s390x-linux/types.conf
 - lib/ffi/platform/sparc-linux/types.conf
@@ -623,7 +627,9 @@ files:
 - lib/ffi/platform/x86_64-dragonflybsd/types.conf
 - lib/ffi/platform/x86_64-freebsd/types.conf
 - lib/ffi/platform/x86_64-freebsd12/types.conf
+- lib/ffi/platform/x86_64-haiku/types.conf
 - lib/ffi/platform/x86_64-linux/types.conf
+- lib/ffi/platform/x86_64-msys/types.conf
 - lib/ffi/platform/x86_64-netbsd/types.conf
 - lib/ffi/platform/x86_64-openbsd/types.conf
 - lib/ffi/platform/x86_64-solaris/types.conf
@@ -642,6 +648,7 @@ files:
 - lib/ffi/union.rb
 - lib/ffi/variadic.rb
 - lib/ffi/version.rb
+- rakelib/ffi_gem_helper.rb
 - samples/getlogin.rb
 - samples/getpid.rb
 - samples/gettimeofday.rb
@@ -676,7 +683,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Ruby FFI

data/.appveyor.yml

@@ -1,30 +0,0 @@
-install:
-  - SET PATH=C:\Ruby%RUBYVER%\bin;%PATH%
-  - SET RAKEOPT=-rdevkit
-  - ps: |
-      if ($env:RUBYVER -like "*head*") {
-        $(new-object net.webclient).DownloadFile("https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-$env:RUBYVER.exe", "$pwd/ruby-setup.exe")
-        cmd /c ruby-setup.exe /verysilent /dir=C:/Ruby$env:RUBYVER
-      }
-  - ridk version
-  - gem --version
-  - gem install bundler --quiet --no-document
-  - bundle install
-  # Update to libffi-3.3 since Appveyor version fails on LongDouble specs
-  - ridk exec pacman --sync --refresh --needed --noconfirm  mingw-w64-x86_64-libffi mingw-w64-i686-libffi
-build: off
-build_script:
-  - bundle exec rake libffi compile -- %EXTCONFOPTS% || bundle exec rake compile -- %EXTCONFOPTS%
-test_script:
-  - bundle exec rake test
-  - bundle exec rake types_conf && git --no-pager diff
-environment:
-  matrix:
-    - RUBYVER: "head-x64"
-      EXTCONFOPTS: "--disable-system-libffi"
-    - RUBYVER: 24
-      EXTCONFOPTS: "--disable-system-libffi"
-    - RUBYVER: 25-x64
-      EXTCONFOPTS: "--enable-system-libffi"
-    - RUBYVER: 26
-      EXTCONFOPTS: "--enable-system-libffi"

data/.github/workflows/ci.yml

@@ -1,64 +0,0 @@
-name: CI
-on: [push, pull_request]
-jobs:
-  system-libffi:
-    # Run on latest MRI with explicit selection of system or builtin libffi
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu, macos, windows ]
-        extconfopts: [ --disable-system-libffi, --enable-system-libffi ]
-    runs-on: ${{ matrix.os }}-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: 2.7
-
-    - run: brew install automake libffi pkg-config
-      if: matrix.os == 'macos'
-    - run: ridk exec pacman --sync --refresh --needed --noconfirm  mingw-w64-x86_64-libffi
-      if: matrix.os == 'windows' && matrix.extconfopts == '--enable-system-libffi'
-
-    - run: bundle install
-    - run: bundle exec rake libffi
-    - run: bundle exec rake compile -- ${{ matrix.extconfopts }}
-      env:
-        # work around misconfiguration of libffi on MacOS with homebrew
-        PKG_CONFIG_PATH: ${{ env.PKG_CONFIG_PATH }}:/usr/local/opt/libffi/lib/pkgconfig
-    - run: bundle exec rake test
-    - run: bundle exec rake types_conf && git --no-pager diff
-
-  specs:
-    # Run all specs on all ruby implementations
-    # Use automatic libffi selection on MRI
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu, macos, windows ]
-        ruby: [ 2.3, 2.4, 2.5, 2.6, 2.7, ruby-head, truffleruby-head ]
-        exclude:
-        - os: windows
-          ruby: truffleruby-head
-        - os: windows
-          ruby: 2.3 # compilation fails
-    runs-on: ${{ matrix.os }}-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-
-    - run: brew install automake
-      if: matrix.os == 'macos'
-
-    - run: bundle install
-    - run: bundle exec rake libffi
-    - run: bundle exec rake compile
-
-    - run: bundle exec rake test
-
-    - run: bundle exec rake bench:all
-      if: matrix.ruby != 'truffleruby-head'
-      env:
-        ITER: 10