archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-25 22:14:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge commit r32895 from trunk:

Browse source 
* ext/fiddle/conversions.c (generic_to_value): ffi_arg and ffi_sarg
      should be used to handle shorter return value. fix [Bug #3861]
      [ruby-core:32504]
    * ext/fiddle/closure.c (callback): ditto
    * ext/fiddle/conversions.h (fiddle_generic): ditto
    * ext/fiddle/conversions.c (value_to_generic): char, short and int
      are strictly distinguished on big-endian CPU, e.g. sparc64.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33015 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ngoto 2011-08-21 02:35:12 +00:00
parent aef5decf8b
commit 01db73f6c2
4 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -1,3 +1,18 @@
Sun Aug 21 11:13:54 2011 Naohisa Goto <ngotogenome@gmail.com>
* backport r32895 from trunk.
* ext/fiddle/conversions.c (generic_to_value): ffi_arg and ffi_sarg
should be used to handle shorter return value. fix [Bug #3861]
[ruby-core:32504]
* ext/fiddle/closure.c (callback): ditto
* ext/fiddle/conversions.h (fiddle_generic): ditto
* ext/fiddle/conversions.c (value_to_generic): char, short and int
are strictly distinguished on big-endian CPU, e.g. sparc64.
Sat Aug 20 13:28:32 2011 Kazuki Tsujimoto <kazuki@callcc.net>
* backport r33013 from trunk.

7
ext/fiddle/closure.c
View file

@ -110,14 +110,13 @@ callback(ffi_cif *cif, void *resp, void **args, void *ctx)
*(long *)resp = NUM2LONG(ret);
break;
case TYPE_CHAR:
*(char *)resp = NUM2INT(ret);
case TYPE_SHORT:
case TYPE_INT:
*(ffi_sarg *)resp = NUM2INT(ret);
break;
case TYPE_VOIDP:
*(void **)resp = NUM2PTR(ret);
break;
case TYPE_INT:
*(int *)resp = NUM2INT(ret);
break;
case TYPE_DOUBLE:
*(double *)resp = NUM2DBL(ret);
break;

11
ext/fiddle/conversions.c
View file

@ -56,7 +56,11 @@ value_to_generic(int type, VALUE src, fiddle_generic * dst)
dst->pointer = NUM2PTR(rb_Integer(src));
break;
case TYPE_CHAR:
dst->schar = NUM2INT(src);
break;
case TYPE_SHORT:
dst->sshort = NUM2INT(src);
break;
case TYPE_INT:
dst->sint = NUM2INT(src);
break;
@ -103,9 +107,14 @@ generic_to_value(VALUE rettype, fiddle_generic retval)
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((unsigned char)retval.fffi_arg);
case TYPE_SHORT:
if (signed_p) return INT2NUM((short)retval.fffi_sarg);
return INT2NUM((unsigned short)retval.fffi_arg);
case TYPE_INT:
return INT2NUM(retval.sint);
if (signed_p) return INT2NUM((int)retval.fffi_sarg);
return UINT2NUM((unsigned int)retval.fffi_arg);
case TYPE_LONG:
if (signed_p) return LONG2NUM(retval.slong);
return ULONG2NUM(retval.ulong);

2
ext/fiddle/conversions.h
View file

@ -5,6 +5,8 @@
typedef union
{
ffi_arg fffi_arg; /* rvalue smaller than unsigned long */
ffi_sarg fffi_sarg; /* rvalue smaller than signed long */
unsigned char uchar; /* ffi_type_uchar */
signed char schar; /* ffi_type_schar */
unsigned short ushort; /* ffi_type_sshort */