ag/cpython-source-deps
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move the hardfloat specific argument copying code to the helper function

Browse Source
This commit is contained in:
David Schneider
2013-03-26 14:24:04 +01:00
parent 5df6b7944a
commit 3a352b8a82
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/arm/ffi.c
View File

@@ -71,8 +71,8 @@ static size_t ffi_put_arg(ffi_type **arg_type, void **arg, char *stack)
register size_t z = (*p_arg)->size; register size_t z = (*p_arg)->size;
if (z < sizeof(int)) if (z < sizeof(int))
{ {
z = sizeof(int); z = sizeof(int);
switch ((*p_arg)->type) switch ((*p_arg)->type)
{ {
case FFI_TYPE_SINT8: case FFI_TYPE_SINT8:
*(signed int *) argp = (signed int)*(SINT8 *)(* p_argv); *(signed int *) argp = (signed int)*(SINT8 *)(* p_argv);
@@ -100,14 +100,20 @@ static size_t ffi_put_arg(ffi_type **arg_type, void **arg, char *stack)
} }
else if (z == sizeof(int)) else if (z == sizeof(int))
{ {
*(unsigned int *) argp = (unsigned int)*(UINT32 *)(* p_argv); if ((*p_arg)->type == FFI_TYPE_FLOAT)
*(float *) argp = *(float *)(* p_argv);
else
*(unsigned int *) argp = (unsigned int)*(UINT32 *)(* p_argv);
} }
else if (z == sizeof(double) && (*p_arg)->type == FFI_TYPE_DOUBLE)
{
*(double *) argp = *(double *)(* p_argv);
}
else else
{ {
memcpy(argp, *p_argv, z); memcpy(argp, *p_argv, z);
} }
return z; return z;
} }
/* ffi_prep_args is called by the assembly routine once stack space /* ffi_prep_args is called by the assembly routine once stack space
has been allocated for the function's arguments has been allocated for the function's arguments
@@ -136,19 +142,13 @@ int ffi_prep_args(char *stack, extended_cif *ecif, float *vfp_space)
(i != 0); (i != 0);
i--, p_arg++) i--, p_arg++)
{ {
size_t z;
/* Allocated in VFP registers. */ /* Allocated in VFP registers. */
if (ecif->cif->abi == FFI_VFP if (ecif->cif->abi == FFI_VFP
&& vi < ecif->cif->vfp_nargs && vfp_type_p (*p_arg)) && vi < ecif->cif->vfp_nargs && vfp_type_p (*p_arg))
{ {
float* vfp_slot = vfp_space + ecif->cif->vfp_args[vi++]; char *vfp_slot = (char *)(vfp_space + ecif->cif->vfp_args[vi++]);
if ((*p_arg)->type == FFI_TYPE_FLOAT) ffi_put_arg(p_arg, p_argv, vfp_slot);
*((float*)vfp_slot) = *((float*)*p_argv);
else if ((*p_arg)->type == FFI_TYPE_DOUBLE)
*((double*)vfp_slot) = *((double*)*p_argv);
else
memcpy(vfp_slot, *p_argv, (*p_arg)->size);
p_argv++; p_argv++;
continue; continue;
} }