Get Fiddle MRI tests working

Author: chrisseaton

lib/truffle/truffle/fiddle_backend.rb

@@ -12,7 +12,9 @@ module Truffle::Fiddle
   SIZEOF_LONG   = Truffle::FFI::Pointer.find_type_size(:long)
 
   INT_NFI_TYPE  = "SINT#{SIZEOF_INT * 8}"
+  UINT_NFI_TYPE  = "UINT#{SIZEOF_INT * 8}"
   LONG_NFI_TYPE = "SINT#{SIZEOF_LONG * 8}"
+  ULONG_NFI_TYPE = "UINT#{SIZEOF_LONG * 8}"
 
   def self.type_to_nfi(type)
     case type
@@ -28,12 +30,14 @@ def self.type_to_nfi(type)
       INT_NFI_TYPE
     when Fiddle::TYPE_LONG
       LONG_NFI_TYPE
+    when -Fiddle::TYPE_LONG
+      ULONG_NFI_TYPE
     when Fiddle::TYPE_FLOAT
       'FLOAT'
     when Fiddle::TYPE_DOUBLE
       'DOUBLE'
     else
-      raise 'not implemented'
+      raise "#{type} not implemented"
     end
   end
 
@@ -66,7 +70,9 @@ def self.convert_ruby_to_native(type, val)
       end
     when Fiddle::TYPE_INT
       Integer(val)
-    when Fiddle::TYPE_DOUBLE
+    when -Fiddle::TYPE_LONG
+      Integer(val)
+    when Fiddle::TYPE_FLOAT, Fiddle::TYPE_DOUBLE
       Float(val)
     else 
       raise "#{val.inspect} to type #{type}"
@@ -79,7 +85,7 @@ def self.convert_native_to_ruby(type, val)
       nil
     when Fiddle::TYPE_VOIDP
       Fiddle::Pointer.new(Truffle::Interop.to_native(val))
-    when Fiddle::TYPE_INT, Fiddle::TYPE_DOUBLE
+    when Fiddle::TYPE_INT, Fiddle::TYPE_FLOAT, Fiddle::TYPE_DOUBLE
       val
     else 
       raise "#{val.inspect} from type #{type}"
@@ -169,14 +175,19 @@ class Function
 
     DEFAULT = :default_abi
 
-    def initialize(ptr, args, ret_type, abi = DEFAULT, name:)
+    def initialize(ptr, args, ret_type, abi = DEFAULT, name: nil)
       @arg_types = args
       @ret_type = ret_type
       args = args.map { |arg| Truffle::Fiddle.type_to_nfi(arg) }
       ret_type = Truffle::Fiddle.type_to_nfi(ret_type)
       signature = "(#{args.join(',')}):#{ret_type}"
-      ptr = Truffle::POSIX.nfi_symbol_from_pointer(ptr, signature)
-      @function = ptr.bind(signature)
+
+      if ptr.is_a?(Closure)
+        @function = ptr.method(:call)
+      else
+        ptr = Truffle::POSIX.nfi_symbol_from_pointer(ptr, signature)
+        @function = ptr.bind(signature)
+      end
     end
 
     def call(*args)
@@ -189,8 +200,8 @@ def call(*args)
 
   class Closure
 
-    def initialize(*args)
-      raise 'not implemented'
+    def initialize(ret, args, abi = Function::DEFAULT)
+      # does nothing - 'not implemented' when used
     end
 
     def to_i(*args)

test/mri/excludes/Fiddle/TestCStructEntity.rb

@@ -1,5 +1,3 @@
-exclude :test_class_size, "needs investigation"
-exclude :test_class_size_with_count, "needs investigation"
 exclude :test_aref_pointer, "needs investigation"
 exclude :test_aref_pointer_array, "needs investigation"
 exclude :test_set_ctypes, "needs investigation"

test/mri/excludes/Fiddle/TestCUnionEntity.rb

@@ -1,3 +1 @@
 exclude :test_set_ctypes, "needs investigation"
-exclude :test_class_size_with_count, "needs investigation"
-exclude :test_class_size, "needs investigation"

test/mri/excludes/Fiddle/TestClosure.rb

@@ -1,5 +1,14 @@
 exclude :test_argument_errors, "needs investigation"
 exclude :test_block_caller, "needs investigation"
 exclude :test_call, "needs investigation"
+exclude :test_conversion_char, "needs investigation"
+exclude :test_conversion_int, "needs investigation"
+exclude :test_conversion_long, "needs investigation"
+exclude :test_conversion_long_long, "needs investigation"
+exclude :test_conversion_short, "needs investigation"
+exclude :test_conversion_unsigned_char, "needs investigation"
+exclude :test_conversion_unsigned_int, "needs investigation"
+exclude :test_conversion_unsigned_long, "needs investigation"
+exclude :test_conversion_unsigned_long_long, "needs investigation"
+exclude :test_conversion_unsigned_short, "needs investigation"
 exclude :test_returner, "needs investigation"
-exclude :test_memsize, "needs investigation"

test/mri/excludes/Fiddle/TestFunc.rb

@@ -1,8 +1,5 @@
-exclude :test_isdigit, "needs investigation"
 exclude :test_string, "needs investigation"
-exclude :test_random, "needs investigation"
 exclude :test_strtod, "needs investigation"
-exclude :test_atof, "needs investigation"
 exclude :test_qsort1, "needs investigation"
 exclude :test_sinf, "needs investigation"
 exclude :test_syscall_with_tainted_string, "needs investigation"

test/mri/excludes/Fiddle/TestHandle.rb

@@ -8,9 +8,7 @@
 exclude :test_handle_close, "needs investigation"
 exclude :test_handle_close_twice, "needs investigation"
 exclude :test_to_i, "needs investigation"
-exclude :test_initialize_flags, "needs investigation"
 exclude :test_sym_closed_handle, "needs investigation"
-exclude :test_dlopen_returns_handle, "needs investigation"
 exclude :test_initialize_noargs, "needs investigation"
 exclude :test_disable_close, "needs investigation"
 exclude :test_static_sym, "needs investigation"

test/mri/excludes/Fiddle/TestImport.rb

@@ -1,12 +1,6 @@
-exclude :test_ensure_call_dlload, "needs investigation"
 exclude :test_strcpy, "needs investigation"
-exclude :test_atof, "needs investigation"
-exclude :test_malloc, "needs investigation"
 exclude :test_struct, "needs investigation"
 exclude :test_unsigned_result, "needs investigation"
 exclude :test_value, "needs investigation"
-exclude :test_isdigit, "needs investigation"
-exclude :test_sizeof_double, "needs investigation"
 exclude :test_io, "needs investigation"
 exclude :test_sizeof, "needs investigation"
-exclude :test_no_message_with_debug, "needs investigation"

test/mri/excludes/Fiddle/TestPointer.rb

@@ -1,4 +1,3 @@
-exclude :test_no_memory_leak, "needs investigation"
 exclude :test_minus, "needs investigation"
 exclude :test_inspect, "needs investigation"
 exclude :test_to_str, "needs investigation"

test/mri/failing.exclude

@@ -135,7 +135,6 @@ dtrace/test_require.rb
 dtrace/test_singleton_function.rb
 dtrace/test_string.rb
 erb/test_erb_command.rb
-fiddle/test_cparser.rb
 irb/test_completion.rb
 irb/test_option.rb
 irb/test_raise_no_backtrace_exception.rb

test/mri/tests/fiddle/test_pointer.rb

@@ -226,7 +226,7 @@ def test_null_pointer
     end
 
     def test_no_memory_leak
-      assert_no_memory_leak(%w[-W0 -rfiddle.so], '', '100_000.times {Fiddle::Pointer.allocate}', rss: true)
+      assert_no_memory_leak(%w[-W0 -rfiddle], '', '100_000.times {Fiddle::Pointer.allocate}', rss: true) # TruffleRuby - MRI was -rfiddle.so
     end
   end
 end if defined?(Fiddle)