[前][次][番号順一覧][スレッド一覧]

ruby-changes:22587

From: naruse <ko1@a...>
Date: Thu, 16 Feb 2012 06:31:48 +0900 (JST)
Subject: [ruby-changes:22587] naruse:r34636 (ruby_1_9_3): merge revision(s) 34626,34627:

naruse	2012-02-16 06:31:16 +0900 (Thu, 16 Feb 2012)

  New Revision: 34636

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34636

  Log:
    merge revision(s) 34626,34627:
    
    * ext/fiddle/closure.c (callback): same as r34506.
    
    * ext/fiddle/closure.c (callback): deal with unsinged integers.
      [ruby-core:42458][Bug #5991][Bug #6022]
    
    * ext/fiddle/conversions.c (value_to_generic, generic_to_value):
      ditto.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/fiddle/closure.c
    branches/ruby_1_9_3/ext/fiddle/conversions.c
    branches/ruby_1_9_3/ext/fiddle/conversions.h
    branches/ruby_1_9_3/ext/fiddle/fiddle.h
    branches/ruby_1_9_3/test/fiddle/test_closure.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34635)
+++ ruby_1_9_3/ChangeLog	(revision 34636)
@@ -1,3 +1,13 @@
+Thu Feb 16 06:30:37 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/fiddle/closure.c (callback): deal with unsinged integers.
+	  [ruby-core:42458][Bug #5991][Bug #6022]
+
+	* ext/fiddle/conversions.c (value_to_generic, generic_to_value):
+	  ditto.
+
+	* ext/fiddle/closure.c (callback): same as r34506.
+
 Wed Feb 15 10:35:43 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* include/ruby/ruby.h (FIXNUM_P): simple flag should be int.
Index: ruby_1_9_3/ext/fiddle/conversions.c
===================================================================
--- ruby_1_9_3/ext/fiddle/conversions.c	(revision 34635)
+++ ruby_1_9_3/ext/fiddle/conversions.c	(revision 34636)
@@ -27,7 +27,7 @@
 	return rb_ffi_type_of(long);
 #if HAVE_LONG_LONG
       case TYPE_LONG_LONG:
-	return rb_ffi_type_of(int64);
+	return rb_ffi_type_of(long_long);
 #endif
       case TYPE_FLOAT:
 	return &ffi_type_float;
@@ -42,13 +42,6 @@
 void
 value_to_generic(int type, VALUE src, fiddle_generic * dst)
 {
-    int signed_p = 1;
-
-    if (type < 0) {
-	type = -1 * type;
-	signed_p = 0;
-    }
-
     switch (type) {
       case TYPE_VOID:
 	break;
@@ -56,24 +49,36 @@
 	dst->pointer = NUM2PTR(rb_Integer(src));
 	break;
       case TYPE_CHAR:
-	dst->schar = NUM2INT(src);
+	dst->schar = (signed char)NUM2INT(src);
 	break;
+      case -TYPE_CHAR:
+	dst->uchar = (unsigned char)NUM2UINT(src);
+	break;
       case TYPE_SHORT:
-	dst->sshort = NUM2INT(src);
+	dst->sshort = (unsigned short)NUM2INT(src);
 	break;
+      case -TYPE_SHORT:
+	dst->sshort = (signed short)NUM2UINT(src);
+	break;
       case TYPE_INT:
 	dst->sint = NUM2INT(src);
 	break;
+      case -TYPE_INT:
+	dst->uint = NUM2UINT(src);
+	break;
       case TYPE_LONG:
-	if (signed_p)
-	    dst->slong = NUM2LONG(src);
-	else
-	    dst->ulong = NUM2LONG(src);
+	dst->slong = NUM2LONG(src);
 	break;
+      case -TYPE_LONG:
+	dst->ulong = NUM2ULONG(src);
+	break;
 #if HAVE_LONG_LONG
       case TYPE_LONG_LONG:
-	dst->long_long = NUM2ULL(src);
+	dst->slong_long = NUM2LL(src);
 	break;
+      case -TYPE_LONG_LONG:
+	dst->ulong_long = NUM2ULL(src);
+	break;
 #endif
       case TYPE_FLOAT:
 	dst->ffloat = (float)NUM2DBL(src);
@@ -89,17 +94,11 @@
 VALUE
 generic_to_value(VALUE rettype, fiddle_generic retval)
 {
-    int signed_p = 1;
     int type = NUM2INT(rettype);
     VALUE cPointer;
 
     cPointer = rb_const_get(mFiddle, rb_intern("Pointer"));
 
-    if (type < 0) {
-	type = -1 * type;
-	signed_p = 0;
-    }
-
     switch (type) {
       case TYPE_VOID:
 	return Qnil;
@@ -107,21 +106,26 @@
         return rb_funcall(cPointer, rb_intern("[]"), 1,
           PTR2NUM((void *)retval.pointer));
       case TYPE_CHAR:
-	if (signed_p) return INT2NUM((char)retval.fffi_sarg);
+	return INT2NUM((signed char)retval.fffi_sarg);
+      case -TYPE_CHAR:
 	return INT2NUM((unsigned char)retval.fffi_arg);
       case TYPE_SHORT:
-	if (signed_p) return INT2NUM((short)retval.fffi_sarg);
+	return INT2NUM((signed short)retval.fffi_sarg);
+      case -TYPE_SHORT:
 	return INT2NUM((unsigned short)retval.fffi_arg);
       case TYPE_INT:
-	if (signed_p) return INT2NUM((int)retval.fffi_sarg);
+	return INT2NUM((signed int)retval.fffi_sarg);
+      case -TYPE_INT:
 	return UINT2NUM((unsigned int)retval.fffi_arg);
       case TYPE_LONG:
-	if (signed_p) return LONG2NUM(retval.slong);
+	return LONG2NUM(retval.slong);
+      case -TYPE_LONG:
 	return ULONG2NUM(retval.ulong);
 #if HAVE_LONG_LONG
       case TYPE_LONG_LONG:
-	return rb_ll2inum(retval.long_long);
-	break;
+	return LL2NUM(retval.slong_long);
+      case -TYPE_LONG_LONG:
+	return ULL2NUM(retval.ulong_long);
 #endif
       case TYPE_FLOAT:
 	return rb_float_new(retval.ffloat);
Index: ruby_1_9_3/ext/fiddle/closure.c
===================================================================
--- ruby_1_9_3/ext/fiddle/closure.c	(revision 34635)
+++ ruby_1_9_3/ext/fiddle/closure.c	(revision 34636)
@@ -72,6 +72,9 @@
 	  case TYPE_INT:
 	    rb_ary_push(params, INT2NUM(*(int *)args[i]));
 	    break;
+	  case -TYPE_INT:
+	    rb_ary_push(params, UINT2NUM(*(unsigned int *)args[i]));
+	    break;
 	  case TYPE_VOIDP:
 	    rb_ary_push(params,
 			rb_funcall(cPointer, rb_intern("[]"), 1,
@@ -80,9 +83,21 @@
 	  case TYPE_LONG:
 	    rb_ary_push(params, LONG2NUM(*(long *)args[i]));
 	    break;
+	  case -TYPE_LONG:
+	    rb_ary_push(params, ULONG2NUM(*(unsigned long *)args[i]));
+	    break;
 	  case TYPE_CHAR:
-	    rb_ary_push(params, INT2NUM(*(char *)args[i]));
+	    rb_ary_push(params, INT2NUM(*(signed char *)args[i]));
 	    break;
+	  case -TYPE_CHAR:
+	    rb_ary_push(params, UINT2NUM(*(unsigned char *)args[i]));
+	    break;
+	  case TYPE_SHORT:
+	    rb_ary_push(params, INT2NUM(*(signed short *)args[i]));
+	    break;
+	  case -TYPE_SHORT:
+	    rb_ary_push(params, UINT2NUM(*(unsigned short *)args[i]));
+	    break;
 	  case TYPE_DOUBLE:
 	    rb_ary_push(params, rb_float_new(*(double *)args[i]));
 	    break;
@@ -91,8 +106,11 @@
 	    break;
 #if HAVE_LONG_LONG
 	  case TYPE_LONG_LONG:
-	    rb_ary_push(params, rb_ull2inum(*(unsigned LONG_LONG *)args[i]));
+	    rb_ary_push(params, LL2NUM(*(LONG_LONG *)args[i]));
 	    break;
+	  case -TYPE_LONG_LONG:
+	    rb_ary_push(params, ULL2NUM(*(unsigned LONG_LONG *)args[i]));
+	    break;
 #endif
 	  default:
 	    rb_raise(rb_eRuntimeError, "closure args: %d", type);
@@ -109,11 +127,19 @@
       case TYPE_LONG:
 	*(long *)resp = NUM2LONG(ret);
 	break;
+      case -TYPE_LONG:
+	*(unsigned long *)resp = NUM2ULONG(ret);
+	break;
       case TYPE_CHAR:
       case TYPE_SHORT:
       case TYPE_INT:
 	*(ffi_sarg *)resp = NUM2INT(ret);
 	break;
+      case -TYPE_CHAR:
+      case -TYPE_SHORT:
+      case -TYPE_INT:
+	*(ffi_arg *)resp = NUM2UINT(ret);
+	break;
       case TYPE_VOIDP:
 	*(void **)resp = NUM2PTR(ret);
 	break;
@@ -125,8 +151,11 @@
 	break;
 #if HAVE_LONG_LONG
       case TYPE_LONG_LONG:
-	*(unsigned LONG_LONG *)resp = rb_big2ull(ret);
+	*(LONG_LONG *)resp = NUM2LL(ret);
 	break;
+      case -TYPE_LONG_LONG:
+	*(unsigned LONG_LONG *)resp = NUM2ULL(ret);
+	break;
 #endif
       default:
 	rb_raise(rb_eRuntimeError, "closure retval: %d", type);
Index: ruby_1_9_3/ext/fiddle/fiddle.h
===================================================================
--- ruby_1_9_3/ext/fiddle/fiddle.h	(revision 34635)
+++ ruby_1_9_3/ext/fiddle/fiddle.h	(revision 34636)
@@ -67,6 +67,15 @@
 #  error "long size not supported"
 # endif
 
+#if HAVE_LONG_LONG
+# if SIZEOF_LONG_LONG == 8
+#   define ffi_type_slong_long ffi_type_sint64
+#   define ffi_type_ulong_long ffi_type_uint64
+# else
+#  error "long long size not supported"
+# endif
+#endif
+
 #include <closure.h>
 #include <conversions.h>
 #include <function.h>
Index: ruby_1_9_3/ext/fiddle/conversions.h
===================================================================
--- ruby_1_9_3/ext/fiddle/conversions.h	(revision 34635)
+++ ruby_1_9_3/ext/fiddle/conversions.h	(revision 34636)
@@ -18,7 +18,8 @@
     float ffloat;          /* ffi_type_float */
     double ddouble;        /* ffi_type_double */
 #if HAVE_LONG_LONG
-    unsigned LONG_LONG long_long; /* ffi_type_uint64 */
+    unsigned LONG_LONG ulong_long; /* ffi_type_ulong_long */
+    signed LONG_LONG slong_long; /* ffi_type_ulong_long */
 #endif
     void * pointer;        /* ffi_type_pointer */
 } fiddle_generic;
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34635)
+++ ruby_1_9_3/version.h	(revision 34636)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 120
+#define RUBY_PATCHLEVEL 121
 
 #define RUBY_RELEASE_DATE "2012-02-16"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/test/fiddle/test_closure.rb
===================================================================
--- ruby_1_9_3/test/fiddle/test_closure.rb	(revision 34635)
+++ ruby_1_9_3/test/fiddle/test_closure.rb	(revision 34636)
@@ -55,5 +55,30 @@
       n = 10000
       assert_equal(n, n.times {ObjectSpace.memsize_of(Closure.allocate)}, bug)
     end
+
+    %w[INT SHORT CHAR LONG LONG_LONG].each do |name|
+      type = DL.const_get("TYPE_#{name}") rescue next
+      size = DL.const_get("SIZEOF_#{name}")
+      [[type, size-1, name], [-type, size, "unsigned_"+name]].each do |t, s, n|
+        define_method("test_conversion_#{n.downcase}") do
+          arg = nil
+
+          clos = Class.new(Closure) do
+            define_method(:call) {|x| arg = x}
+          end.new(t, [t])
+
+          v = ~(~0 << (8*s))
+
+          arg = nil
+          assert_equal(v, clos.call(v))
+          assert_equal(arg, v, n)
+
+          arg = nil
+          func = Function.new(clos, [t], t)
+          assert_equal(v, func.call(v))
+          assert_equal(arg, v, n)
+        end
+      end
+    end
   end
 end if defined?(Fiddle)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]