mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 11:50:28 +02:00
Code Activity

Cosmetic changes in `foreign.c'.

Browse source 
* libguile/foreign.c (unpack, pack): Add `const' qualifier for `type'.
  Comment.  Indent.
  (scm_i_foreign_call): Add `const' qualifier for `argv'.  Punctuate
  comments.  Clarify argument unpacking loop.
This commit is contained in:
Ludovic Courtès 2010-03-20 17:00:38 +01:00
parent a2c6904911
commit 165a8643ae
2 changed files with 45 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

74
libguile/foreign.c
View file

@ -844,45 +844,45 @@ cif_to_procedure (SCM cif, SCM func_ptr)
return ret; return ret;
} }
/* Set *LOC to the foreign representation of X with TYPE. */
static void static void
unpack (ffi_type *type, void *loc, SCM x) unpack (const ffi_type *type, void *loc, SCM x)
{ {
switch (type->type) switch (type->type)
{ {
case FFI_TYPE_FLOAT: case FFI_TYPE_FLOAT:
*(float*)loc = scm_to_double (x); *(float *) loc = scm_to_double (x);
break; break;
case FFI_TYPE_DOUBLE: case FFI_TYPE_DOUBLE:
*(double*)loc = scm_to_double (x); *(double *) loc = scm_to_double (x);
break; break;
case FFI_TYPE_UINT8: case FFI_TYPE_UINT8:
*(scm_t_uint8*)loc = scm_to_uint8 (x); *(scm_t_uint8 *) loc = scm_to_uint8 (x);
break; break;
case FFI_TYPE_SINT8: case FFI_TYPE_SINT8:
*(scm_t_int8*)loc = scm_to_int8 (x); *(scm_t_int8 *) loc = scm_to_int8 (x);
break; break;
case FFI_TYPE_UINT16: case FFI_TYPE_UINT16:
*(scm_t_uint16*)loc = scm_to_uint16 (x); *(scm_t_uint16 *) loc = scm_to_uint16 (x);
break; break;
case FFI_TYPE_SINT16: case FFI_TYPE_SINT16:
*(scm_t_int16*)loc = scm_to_int16 (x); *(scm_t_int16 *) loc = scm_to_int16 (x);
break; break;
case FFI_TYPE_UINT32: case FFI_TYPE_UINT32:
*(scm_t_uint32*)loc = scm_to_uint32 (x); *(scm_t_uint32 *) loc = scm_to_uint32 (x);
break; break;
case FFI_TYPE_SINT32: case FFI_TYPE_SINT32:
*(scm_t_int32*)loc = scm_to_int32 (x); *(scm_t_int32 *) loc = scm_to_int32 (x);
break; break;
case FFI_TYPE_UINT64: case FFI_TYPE_UINT64:
*(scm_t_uint64*)loc = scm_to_uint64 (x); *(scm_t_uint64 *) loc = scm_to_uint64 (x);
break; break;
case FFI_TYPE_SINT64: case FFI_TYPE_SINT64:
*(scm_t_int64*)loc = scm_to_int64 (x); *(scm_t_int64 *) loc = scm_to_int64 (x);
break; break;
case FFI_TYPE_STRUCT: case FFI_TYPE_STRUCT:
if (!SCM_FOREIGN_TYPED_P (x, VOID)) if (!SCM_FOREIGN_TYPED_P (x, VOID))
scm_wrong_type_arg_msg ("foreign-call", 0, x, scm_wrong_type_arg_msg ("foreign-call", 0, x, "foreign void pointer");
"foreign void pointer");
if (SCM_FOREIGN_LEN (x) && SCM_FOREIGN_LEN (x) != type->size) if (SCM_FOREIGN_LEN (x) && SCM_FOREIGN_LEN (x) != type->size)
scm_wrong_type_arg_msg ("foreign-call", 0, x, scm_wrong_type_arg_msg ("foreign-call", 0, x,
"foreign void pointer of correct length"); "foreign void pointer of correct length");
@ -890,42 +890,42 @@ unpack (ffi_type *type, void *loc, SCM x)
break; break;
case FFI_TYPE_POINTER: case FFI_TYPE_POINTER:
if (!SCM_FOREIGN_TYPED_P (x, VOID)) if (!SCM_FOREIGN_TYPED_P (x, VOID))
scm_wrong_type_arg_msg ("foreign-call", 0, x, scm_wrong_type_arg_msg ("foreign-call", 0, x, "foreign void pointer");
"foreign void pointer"); *(void **) loc = SCM_FOREIGN_POINTER (x, void);
*(void**)loc = SCM_FOREIGN_POINTER (x, void);
break; break;
default: default:
abort (); abort ();
} }
} }
/* Return a Scheme representation of the foreign value at LOC of type TYPE. */
static SCM static SCM
pack (ffi_type *type, void *loc) pack (const ffi_type * type, const void *loc)
{ {
switch (type->type) switch (type->type)
{ {
case FFI_TYPE_VOID: case FFI_TYPE_VOID:
return SCM_UNSPECIFIED; return SCM_UNSPECIFIED;
case FFI_TYPE_FLOAT: case FFI_TYPE_FLOAT:
return scm_from_double (*(float*)loc); return scm_from_double (*(float *) loc);
case FFI_TYPE_DOUBLE: case FFI_TYPE_DOUBLE:
return scm_from_double (*(double*)loc); return scm_from_double (*(double *) loc);
case FFI_TYPE_UINT8: case FFI_TYPE_UINT8:
return scm_from_uint8 (*(scm_t_uint8*)loc); return scm_from_uint8 (*(scm_t_uint8 *) loc);
case FFI_TYPE_SINT8: case FFI_TYPE_SINT8:
return scm_from_int8 (*(scm_t_int8*)loc); return scm_from_int8 (*(scm_t_int8 *) loc);
case FFI_TYPE_UINT16: case FFI_TYPE_UINT16:
return scm_from_uint16 (*(scm_t_uint16*)loc); return scm_from_uint16 (*(scm_t_uint16 *) loc);
case FFI_TYPE_SINT16: case FFI_TYPE_SINT16:
return scm_from_int16 (*(scm_t_int16*)loc); return scm_from_int16 (*(scm_t_int16 *) loc);
case FFI_TYPE_UINT32: case FFI_TYPE_UINT32:
return scm_from_uint32 (*(scm_t_uint32*)loc); return scm_from_uint32 (*(scm_t_uint32 *) loc);
case FFI_TYPE_SINT32: case FFI_TYPE_SINT32:
return scm_from_int32 (*(scm_t_int32*)loc); return scm_from_int32 (*(scm_t_int32 *) loc);
case FFI_TYPE_UINT64: case FFI_TYPE_UINT64:
return scm_from_uint64 (*(scm_t_uint64*)loc); return scm_from_uint64 (*(scm_t_uint64 *) loc);
case FFI_TYPE_SINT64: case FFI_TYPE_SINT64:
return scm_from_int64 (*(scm_t_int64*)loc); return scm_from_int64 (*(scm_t_int64 *) loc);
case FFI_TYPE_STRUCT: case FFI_TYPE_STRUCT:
{ {
void *mem = scm_gc_malloc_pointerless (type->size, "foreign"); void *mem = scm_gc_malloc_pointerless (type->size, "foreign");
@ -935,14 +935,15 @@ pack (ffi_type *type, void *loc)
} }
case FFI_TYPE_POINTER: case FFI_TYPE_POINTER:
return scm_take_foreign_pointer (SCM_FOREIGN_TYPE_VOID, return scm_take_foreign_pointer (SCM_FOREIGN_TYPE_VOID,
*(void**)loc, 0, NULL); *(void **) loc, 0, NULL);
default: default:
abort (); abort ();
} }
} }
SCM SCM
scm_i_foreign_call (SCM foreign, SCM *argv) scm_i_foreign_call (SCM foreign, const SCM *argv)
{ {
/* FOREIGN is the pair that cif_to_procedure set as the 0th element of the /* FOREIGN is the pair that cif_to_procedure set as the 0th element of the
objtable. */ objtable. */
@ -955,8 +956,8 @@ scm_i_foreign_call (SCM foreign, SCM *argv)
size_t arg_size; size_t arg_size;
scm_t_ptrdiff off; scm_t_ptrdiff off;
cif = SCM_FOREIGN_POINTER (scm_car (foreign), ffi_cif); cif = SCM_FOREIGN_POINTER (SCM_CAR (foreign), ffi_cif);
func = SCM_FOREIGN_POINTER (scm_cdr (foreign), void); func = SCM_FOREIGN_POINTER (SCM_CDR (foreign), void);
/* Argument pointers. */ /* Argument pointers. */
args = alloca (sizeof(void*) * cif->nargs); args = alloca (sizeof(void*) * cif->nargs);
@ -974,16 +975,17 @@ scm_i_foreign_call (SCM foreign, SCM *argv)
data = alloca (arg_size data = alloca (arg_size
+ ROUND_UP (cif->rtype->size, cif->rtype->alignment)); + ROUND_UP (cif->rtype->size, cif->rtype->alignment));
/* unpack argv to native values, setting argv pointers */ /* Unpack ARGV to native values, setting ARGV pointers. */
off = 0; for (i = 0, off = 0;
for (i = 0; i < cif->nargs; i++) i < cif->nargs;
off += cif->arg_types[i]->size, i++)
{ {
off = ROUND_UP (off, cif->arg_types[i]->alignment); off = ROUND_UP (off, cif->arg_types[i]->alignment);
args[i] = data + off; args[i] = data + off;
unpack (cif->arg_types[i], args[i], argv[i]); unpack (cif->arg_types[i], args[i], argv[i]);
off += cif->arg_types[i]->size;
} }
/* prep space for the return value */
/* Prepare space for the return value. */
off = ROUND_UP (off, cif->rtype->alignment); off = ROUND_UP (off, cif->rtype->alignment);
rvalue = data + off; rvalue = data + off;

2
libguile/foreign.h
View file

@ -121,7 +121,7 @@ SCM_INTERNAL void scm_i_foreign_print (SCM foreign, SCM port,
SCM_API SCM scm_make_foreign_function (SCM return_type, SCM func_ptr, SCM_API SCM scm_make_foreign_function (SCM return_type, SCM func_ptr,
SCM arg_types); SCM arg_types);
SCM_INTERNAL SCM scm_i_foreign_call (SCM foreign, SCM *argv); SCM_INTERNAL SCM scm_i_foreign_call (SCM foreign, const SCM *argv);