diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-03 02:39:18 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-03 02:39:18 +0000 |
commit | 22ba8368ae2a4eadccc87c8de394662ce74003b9 (patch) | |
tree | e2f573a82f668f929f45c4ff59af65501ce009e9 /ext | |
parent | 3c8b23c35a94bc28b1db09aeab278f7db014b955 (diff) | |
download | ruby-22ba8368ae2a4eadccc87c8de394662ce74003b9.tar.gz |
* ext/dl/{closure,function}.c: removed C99 features and warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26548 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/dl/closure.c | 146 | ||||
-rw-r--r-- | ext/dl/function.c | 155 |
2 files changed, 154 insertions, 147 deletions
diff --git a/ext/dl/closure.c b/ext/dl/closure.c index a32b27ebc2..da5ade1d87 100644 --- a/ext/dl/closure.c +++ b/ext/dl/closure.c @@ -27,7 +27,7 @@ dlclosure_free(void * ptr) munmap(cls->pcl, sizeof(cls->pcl)); #endif xfree(cls->cif); - if(cls->argv) xfree(cls->argv); + if (cls->argv) xfree(cls->argv); xfree(cls); } @@ -35,9 +35,9 @@ static size_t dlclosure_memsize(const void * ptr) { dl_closure * cls = (dl_closure *)ptr; - size_t size = 0; - if(ptr) { + + if (ptr) { size += sizeof(*cls); size += ffi_raw_size(cls->cif); size += sizeof(*cls->argv); @@ -59,73 +59,74 @@ dlc_callback(ffi_cif *cif, void *resp, void **args, void *ctx) VALUE ctype = rb_iv_get(self, "@ctype"); int argc = RARRAY_LEN(rbargs); VALUE *params = xcalloc(argc, sizeof(VALUE *)); - - int i; - for(i = 0; i < argc; i++) { - int dl_type = NUM2INT(RARRAY_PTR(rbargs)[i]); - switch(dl_type) { - case DLTYPE_VOID: - argc = 0; - break; - case DLTYPE_INT: - params[i] = INT2NUM(*(int *)args[i]); - break; - case DLTYPE_VOIDP: - params[i] = rb_dlptr_new(*(void **)args[i], 0, NULL); - break; - case DLTYPE_LONG: - params[i] = LONG2NUM(*(long *)args[i]); - break; - case DLTYPE_CHAR: - params[i] = INT2NUM(*(char *)args[i]); - break; - case DLTYPE_DOUBLE: - params[i] = rb_float_new(*(double *)args[i]); - break; - case DLTYPE_FLOAT: - params[i] = rb_float_new(*(float *)args[i]); - break; + VALUE ret; + int i, dl_type; + + for (i = 0; i < argc; i++) { + dl_type = NUM2INT(RARRAY_PTR(rbargs)[i]); + switch (dl_type) { + case DLTYPE_VOID: + argc = 0; + break; + case DLTYPE_INT: + params[i] = INT2NUM(*(int *)args[i]); + break; + case DLTYPE_VOIDP: + params[i] = rb_dlptr_new(*(void **)args[i], 0, NULL); + break; + case DLTYPE_LONG: + params[i] = LONG2NUM(*(long *)args[i]); + break; + case DLTYPE_CHAR: + params[i] = INT2NUM(*(char *)args[i]); + break; + case DLTYPE_DOUBLE: + params[i] = rb_float_new(*(double *)args[i]); + break; + case DLTYPE_FLOAT: + params[i] = rb_float_new(*(float *)args[i]); + break; #if HAVE_LONG_LONG - case DLTYPE_LONG_LONG: - params[i] = rb_ull2inum(*(unsigned LONG_LONG *)args[i]); - break; + case DLTYPE_LONG_LONG: + params[i] = rb_ull2inum(*(unsigned LONG_LONG *)args[i]); + break; #endif - default: - rb_raise(rb_eRuntimeError, "closure args: %d", dl_type); + default: + rb_raise(rb_eRuntimeError, "closure args: %d", dl_type); } } - VALUE ret = rb_funcall2(self, rb_intern("call"), argc, params); - - int dl_type = NUM2INT(ctype); - switch(dl_type) { - case DLTYPE_VOID: - break; - case DLTYPE_LONG: - *(long *)resp = NUM2LONG(ret); - break; - case DLTYPE_CHAR: - *(char *)resp = NUM2INT(ret); - break; - case DLTYPE_VOIDP: - *(void **)resp = NUM2PTR(ret); - break; - case DLTYPE_INT: - *(int *)resp = NUM2INT(ret); - break; - case DLTYPE_DOUBLE: - *(double *)resp = NUM2DBL(ret); - break; - case DLTYPE_FLOAT: - *(float *)resp = NUM2DBL(ret); - break; + ret = rb_funcall2(self, rb_intern("call"), argc, params); + + dl_type = NUM2INT(ctype); + switch (dl_type) { + case DLTYPE_VOID: + break; + case DLTYPE_LONG: + *(long *)resp = NUM2LONG(ret); + break; + case DLTYPE_CHAR: + *(char *)resp = NUM2INT(ret); + break; + case DLTYPE_VOIDP: + *(void **)resp = NUM2PTR(ret); + break; + case DLTYPE_INT: + *(int *)resp = NUM2INT(ret); + break; + case DLTYPE_DOUBLE: + *(double *)resp = NUM2DBL(ret); + break; + case DLTYPE_FLOAT: + *(float *)resp = (float)NUM2DBL(ret); + break; #if HAVE_LONG_LONG - case DLTYPE_LONG_LONG: - *(unsigned LONG_LONG *)resp = rb_big2ull(ret); - break; + case DLTYPE_LONG_LONG: + *(unsigned LONG_LONG *)resp = rb_big2ull(ret); + break; #endif - default: - rb_raise(rb_eRuntimeError, "closure retval: %d", dl_type); + default: + rb_raise(rb_eRuntimeError, "closure retval: %d", dl_type); } xfree(params); } @@ -155,22 +156,22 @@ rb_dlclosure_init(int rbargc, VALUE argv[], VALUE self) VALUE ret; VALUE args; VALUE abi; - dl_closure * cl; ffi_cif * cif; ffi_closure *pcl; + ffi_status result; + int i, argc; - if(2 == rb_scan_args(rbargc, argv, "21", &ret, &args, &abi)) + if (2 == rb_scan_args(rbargc, argv, "21", &ret, &args, &abi)) abi = INT2NUM(FFI_DEFAULT_ABI); - int i; - int argc = RARRAY_LEN(args); + argc = RARRAY_LEN(args); TypedData_Get_Struct(self, dl_closure, &dlclosure_data_type, cl); cl->argv = (ffi_type **)xcalloc(argc + 1, sizeof(ffi_type *)); - for(i = 0; i < argc; i++) { + for (i = 0; i < argc; i++) { int dltype = NUM2INT(RARRAY_PTR(args)[i]); cl->argv[i] = DL2FFI_TYPE(dltype); } @@ -182,11 +183,11 @@ rb_dlclosure_init(int rbargc, VALUE argv[], VALUE self) cif = cl->cif; pcl = cl->pcl; - ffi_status result = ffi_prep_cif(cif, NUM2INT(abi), argc, + result = ffi_prep_cif(cif, NUM2INT(abi), argc, DL2FFI_TYPE(NUM2INT(ret)), cl->argv); - if(FFI_OK != result) + if (FFI_OK != result) rb_raise(rb_eRuntimeError, "error prepping CIF %d", result); #ifdef USE_NEW_CLOSURE_API @@ -198,7 +199,7 @@ rb_dlclosure_init(int rbargc, VALUE argv[], VALUE self) mprotect(pcl, sizeof(pcl), PROT_READ | PROT_EXEC); #endif - if(FFI_OK != result) + if (FFI_OK != result) rb_raise(rb_eRuntimeError, "error prepping closure %d", result); return self; @@ -208,10 +209,11 @@ static VALUE rb_dlclosure_to_i(VALUE self) { dl_closure * cl; + void *code; TypedData_Get_Struct(self, dl_closure, &dlclosure_data_type, cl); - void * code = cl->code; + code = cl->code; return PTR2NUM(code); } diff --git a/ext/dl/function.c b/ext/dl/function.c index 2fa5594e8e..362de8eb97 100644 --- a/ext/dl/function.c +++ b/ext/dl/function.c @@ -11,34 +11,37 @@ VALUE rb_cDLFunction; typedef union { - unsigned char uchar; // ffi_type_uchar - signed char schar; // ffi_type_schar - unsigned short ushort; // ffi_type_sshort - signed short sshort; // ffi_type_ushort - unsigned int uint; // ffi_type_uint - signed int sint; // ffi_type_sint - unsigned long ulong; // ffi_type_ulong - signed long slong; // ffi_type_slong - float ffloat; // ffi_type_float - double ddouble; // ffi_type_double + unsigned char uchar; /* ffi_type_uchar */ + signed char schar; /* ffi_type_schar */ + unsigned short ushort; /* ffi_type_sshort */ + signed short sshort; /* ffi_type_ushort */ + unsigned int uint; /* ffi_type_uint */ + signed int sint; /* ffi_type_sint */ + unsigned long ulong; /* ffi_type_ulong */ + signed long slong; /* ffi_type_slong */ + 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 long_long; /* ffi_type_uint64 */ #endif - void * pointer; // ffi_type_pointer + void * pointer; /* ffi_type_pointer */ } dl_generic; static void -dlfunction_free(ffi_cif *ptr) +dlfunction_free(void *p) { - if(ptr->arg_types) xfree(ptr->arg_types); + ffi_cif *ptr = p; + if (ptr->arg_types) xfree(ptr->arg_types); xfree(ptr); } static size_t -dlfunction_memsize(ffi_cif *ptr) +dlfunction_memsize(const void *p) { + /* const */ffi_cif *ptr = (ffi_cif *)p; size_t size = 0; - if(ptr) { + + if (ptr) { size += sizeof(*ptr); size += ffi_raw_size(ptr); } @@ -63,26 +66,27 @@ rb_dlfunction_native_init(VALUE self, VALUE args, VALUE ret_type, VALUE abi) { ffi_cif * cif; ffi_type **arg_types; + ffi_status result; + int i; TypedData_Get_Struct(self, ffi_cif, &dlfunction_data_type, cif); arg_types = xcalloc(RARRAY_LEN(args) + 1, sizeof(ffi_type *)); - int i; - for(i = 0; i < RARRAY_LEN(args); i++) { + for (i = 0; i < RARRAY_LEN(args); i++) { int type = NUM2INT(RARRAY_PTR(args)[i]); arg_types[i] = DL2FFI_TYPE(type); } arg_types[RARRAY_LEN(args)] = NULL; - ffi_status result = ffi_prep_cif( + result = ffi_prep_cif ( cif, NUM2INT(abi), RARRAY_LEN(args), DL2FFI_TYPE(NUM2INT(ret_type)), arg_types); - if(result) + if (result) rb_raise(rb_eRuntimeError, "error creating CIF %d", result); return self; @@ -93,41 +97,41 @@ dl2generic(int dl_type, VALUE src, dl_generic * dst) { int signed_p = 1; - if(dl_type < 0) { + if (dl_type < 0) { dl_type = -1 * dl_type; signed_p = 0; } - switch(dl_type) { - case DLTYPE_VOID: - break; - case DLTYPE_VOIDP: - dst->pointer = NUM2PTR(rb_Integer(src)); - break; - case DLTYPE_CHAR: - case DLTYPE_SHORT: - case DLTYPE_INT: - dst->sint = NUM2INT(src); - break; - case DLTYPE_LONG: - if(signed_p) - dst->slong = NUM2LONG(src); - else - dst->ulong = NUM2LONG(src); - break; + switch (dl_type) { + case DLTYPE_VOID: + break; + case DLTYPE_VOIDP: + dst->pointer = NUM2PTR(rb_Integer(src)); + break; + case DLTYPE_CHAR: + case DLTYPE_SHORT: + case DLTYPE_INT: + dst->sint = NUM2INT(src); + break; + case DLTYPE_LONG: + if (signed_p) + dst->slong = NUM2LONG(src); + else + dst->ulong = NUM2LONG(src); + break; #if HAVE_LONG_LONG - case DLTYPE_LONG_LONG: - dst->long_long = rb_big2ull(src); - break; + case DLTYPE_LONG_LONG: + dst->long_long = rb_big2ull(src); + break; #endif - case DLTYPE_FLOAT: - dst->ffloat = NUM2DBL(src); - break; - case DLTYPE_DOUBLE: - dst->ddouble = NUM2DBL(src); - break; - default: - rb_raise(rb_eRuntimeError, "unknown type %d", dl_type); + case DLTYPE_FLOAT: + dst->ffloat = (float)NUM2DBL(src); + break; + case DLTYPE_DOUBLE: + dst->ddouble = NUM2DBL(src); + break; + default: + rb_raise(rb_eRuntimeError, "unknown type %d", dl_type); } } @@ -137,34 +141,34 @@ unwrap_ffi(VALUE rettype, dl_generic retval) int signed_p = 1; int dl_type = NUM2INT(rettype); - if(dl_type < 0) { + if (dl_type < 0) { dl_type = -1 * dl_type; signed_p = 0; } - switch(dl_type) { - case DLTYPE_VOID: - return Qnil; - case DLTYPE_VOIDP: - return rb_dlptr_new((void *)retval.pointer, 0, NULL); - case DLTYPE_CHAR: - case DLTYPE_SHORT: - case DLTYPE_INT: - return INT2NUM(retval.sint); - case DLTYPE_LONG: - if(signed_p) return LONG2NUM(retval.slong); - return LONG2NUM(retval.ulong); + switch (dl_type) { + case DLTYPE_VOID: + return Qnil; + case DLTYPE_VOIDP: + return rb_dlptr_new((void *)retval.pointer, 0, NULL); + case DLTYPE_CHAR: + case DLTYPE_SHORT: + case DLTYPE_INT: + return INT2NUM(retval.sint); + case DLTYPE_LONG: + if (signed_p) return LONG2NUM(retval.slong); + return LONG2NUM(retval.ulong); #if HAVE_LONG_LONG - case DLTYPE_LONG_LONG: - return rb_ll2inum(retval.long_long); - break; + case DLTYPE_LONG_LONG: + return rb_ll2inum(retval.long_long); + break; #endif - case DLTYPE_FLOAT: - return rb_float_new(retval.ffloat); - case DLTYPE_DOUBLE: - return rb_float_new(retval.ddouble); - default: - rb_raise(rb_eRuntimeError, "unknown type %d", dl_type); + case DLTYPE_FLOAT: + return rb_float_new(retval.ffloat); + case DLTYPE_DOUBLE: + return rb_float_new(retval.ddouble); + default: + rb_raise(rb_eRuntimeError, "unknown type %d", dl_type); } } @@ -176,17 +180,18 @@ rb_dlfunction_call(int argc, VALUE argv[], VALUE self) dl_generic *generic_args; void **values; void * fun_ptr; + VALUE cfunc, types; + int i; TypedData_Get_Struct(self, ffi_cif, &dlfunction_data_type, cif); values = xcalloc((size_t)argc + 1, (size_t)sizeof(void *)); generic_args = xcalloc((size_t)argc, (size_t)sizeof(dl_generic)); - VALUE cfunc = rb_iv_get(self, "@cfunc"); - VALUE types = rb_iv_get(self, "@args"); + cfunc = rb_iv_get(self, "@cfunc"); + types = rb_iv_get(self, "@args"); - int i; - for(i = 0; i < argc; i++) { + for (i = 0; i < argc; i++) { VALUE dl_type = RARRAY_PTR(types)[i]; VALUE src = rb_funcall(self, rb_intern("ruby2ffi"), |