ffi 1.13.0 → 1.15.5

data/lib/ffi/platform.rb

@@ -63,7 +63,7 @@ module FFI
     ARCH = case CPU.downcase
     when /amd64|x86_64|x64/
       "x86_64"
-    when /i?86|x86|i86pc/
+    when /i\d86|x86|i86pc/
       "i386"
     when /ppc64|powerpc64/
       "powerpc64"
@@ -71,13 +71,16 @@ module FFI
       "powerpc"
     when /sparcv9|sparc64/
       "sparcv9"
-    else
-      case RbConfig::CONFIG['host_cpu']
-      when /^arm/
-        "arm"
+    when /arm64|aarch64/  # MacOS calls it "arm64", other operating systems "aarch64"
+      "aarch64"
+    when /^arm/
+      if OS == "darwin"   # Ruby before 3.0 reports "arm" instead of "arm64" as host_cpu on darwin
+        "aarch64"
       else
-        RbConfig::CONFIG['host_cpu']
+        "arm"
       end
+    else
+      RbConfig::CONFIG['host_cpu']
     end
 
     private
@@ -129,7 +132,8 @@ module FFI
     end
 
     LIBC = if IS_WINDOWS
-      "ucrtbase.dll"
+      crtname = RbConfig::CONFIG["RUBY_SO_NAME"][/msvc\w+/] || 'ucrtbase'
+      "#{crtname}.dll"
     elsif IS_GNU
       GNU_LIBC
     elsif OS == 'cygwin'
@@ -141,6 +145,12 @@ module FFI
       "#{LIBPREFIX}c.#{LIBSUFFIX}"
     end
 
+    LITTLE_ENDIAN = 1234 unless defined?(LITTLE_ENDIAN)
+    BIG_ENDIAN = 4321 unless defined?(BIG_ENDIAN)
+    unless defined?(BYTE_ORDER)
+      BYTE_ORDER = [0x12345678].pack("I") == [0x12345678].pack("N") ? BIG_ENDIAN : LITTLE_ENDIAN
+    end
+
     # Test if current OS is a *BSD (include MAC)
     # @return [Boolean]
     def self.bsd?

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

@@ -105,9 +105,10 @@ module FFI
     # @return [nil]
     # @raise if a constant is missing and +:required+ was set to +true+ (see {#initialize})
     def calculate(options = {})
-      binary = File.join Dir.tmpdir, "rb_const_gen_bin_#{Process.pid}"
+      binary_path = nil
 
       Tempfile.open("#{@prefix}.const_generator") do |f|
+        binary_path = f.path + ".bin"
         @includes.each do |inc|
           f.puts "#include <#{inc}>"
         end
@@ -124,7 +125,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_path} 2>&1`
 
         unless $?.success? then
           output = output.split("\n").map { |l| "\t#{l}" }.join "\n"
@@ -132,8 +134,8 @@ module FFI
         end
       end
 
-      output = `#{binary}`
-      File.unlink(binary + (FFI::Platform.windows? ? ".exe" : ""))
+      output = `#{binary_path}`
+      File.unlink(binary_path + (FFI::Platform.windows? ? ".exe" : ""))
       output.each_line do |line|
         line =~ /^(\S+)\s(.*)$/
         const = @constants[$1]

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.0'
+  VERSION = '1.15.5'
 end

data/lib/ffi.rb

@@ -1,5 +1,4 @@
-if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
-  Object.send(:remove_const, :FFI) if defined?(::FFI)
+if RUBY_ENGINE == 'ruby'
   begin
     require RUBY_VERSION.split('.')[0, 2].join('.') + '/ffi_c'
   rescue Exception
@@ -8,11 +7,11 @@ if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
 
   require 'ffi/ffi'
 
-elsif RUBY_ENGINE == 'jruby' && Gem::Version.new(RUBY_ENGINE_VERSION) >= Gem::Version.new("9.3.pre")
+elsif RUBY_ENGINE == 'jruby' && (RUBY_ENGINE_VERSION.split('.').map(&:to_i) <=> [9, 2, 20]) >= 0
   JRuby::Util.load_ext("org.jruby.ext.ffi.FFIService")
   require 'ffi/ffi'
 
-elsif RUBY_ENGINE == 'truffleruby' && Gem::Version.new(RUBY_ENGINE_VERSION) >= Gem::Version.new("20.1.0-dev-a")
+elsif RUBY_ENGINE == 'truffleruby' && (RUBY_ENGINE_VERSION.split('.').map(&:to_i) <=> [20, 1, 0]) >= 0
   require 'truffleruby/ffi_backend'
   require 'ffi/ffi'
 

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:native", "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.0
+  version: 1.15.5
 platform: ruby
 authors:
 - Wayne Meissner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2022-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.1
-- !ruby/object:Gem::Dependency
-  name: rubygems-tasks
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.4
 description: Ruby FFI library
 email: wmeissner@gmail.com
 executables: []
@@ -87,12 +73,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 +231,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 +244,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 +552,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 +567,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 +599,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 +613,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 +634,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
@@ -659,7 +652,7 @@ metadata:
   wiki_uri: https://github.com/ffi/ffi/wiki
   source_code_uri: https://github.com/ffi/ffi/
   mailing_list_uri: http://groups.google.com/group/ruby-ffi
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--exclude=ext/ffi_c/.*\\.o$"
 - "--exclude=ffi_c\\.(bundle|so)$"
@@ -676,8 +669,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.4
+signing_key:
 specification_version: 4
 summary: Ruby FFI
 test_files: []

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

data/.gitignore

@@ -1,25 +0,0 @@
-doc/
-bin/
-.yardoc
-*.orig
-nbproject/private
-pkg
-*.orig
-*.rej
-*.patch
-*.diff
-build
-*.so
-*.[oa]
-core
-lib/ffi/types.conf
-lib/ffi_c.bundle
-lib/ffi_c.so
-vendor
-.bundle
-Gemfile.lock
-types_log
-*.gem
-embed-test.log
-spec/ffi/embed-test/ext/Makefile
-spec/ffi/embed-test/ext/embed_test.bundle

data/.gitmodules

@@ -1,4 +0,0 @@
-[submodule "ext/ffi_c/libffi"]
-	path = ext/ffi_c/libffi
-	url = https://github.com/libffi/libffi.git
-	branch = master

data/.travis.yml

@@ -1,58 +0,0 @@
-dist: trusty
-group: beta
-language: ruby
-git:
-  submodules: false
-
-script:
-  - bundle exec rake libffi
-  - bundle exec rake compile
-  - bundle exec rake test
-  - |
-      if [[ $(ruby -v) != *truffleruby* ]]; then
-        ITER=10 bundle exec rake bench:all
-      fi
-  - bundle exec rake types_conf && git --no-pager diff
-os:
-  - linux
-  - osx
-rvm:
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.5
-  - 2.7.0
-  - ruby-head
-  - truffleruby-head
-
-env:
-  - CC=gcc
-  - CC=clang
-matrix:
-  allow_failures:
-    - os: osx
-      rvm: ruby-head
-    - os: osx
-      rvm: 2.3.8
-    - os: linux
-      rvm: ruby-head
-  include:
-    - name: powerpc
-      language: generic
-      before_install: |
-        docker run --rm --privileged multiarch/qemu-user-static:register --reset &&
-          docker build --rm -t ffi-powerpc -f spec/env/Dockerfile.powerpc .
-      script: |
-        docker run --rm -t -v `pwd`:/ffi ffi-powerpc
-    - name: armhf
-      language: generic
-      before_install: |
-        docker run --rm --privileged multiarch/qemu-user-static:register --reset &&
-          docker build --rm -t ffi-armhf -f spec/env/Dockerfile.armhf .
-      script: |
-        docker run --rm -t -v `pwd`:/ffi ffi-armhf
-  exclude:
-    - os: osx
-      rvm: truffleruby-head
-after_failure:
-  - "find build -name mkmf.log | xargs cat"

data/.yardopts

@@ -1,5 +0,0 @@
---title "Ruby FFI"
---charset UTF-8
---private
-lib/**/*.rb
-ext/**/*.c

data/ext/ffi_c/win32/stdbool.h

@@ -1,8 +0,0 @@
-#ifndef FFI_STDBOOL_H
-#define FFI_STDBOOL_H
-
-typedef int bool;
-#define true 1
-#define false 0
-
-#endif /* FFI_STDBOOL_H */