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

arm: Deref ffi_put_arg arguments

Browse Source
This commit is contained in:
Richard Henderson
2014-10-17 01:02:52 -04:00
parent 57b24fb3f5
commit 0d39b4bb69
1 changed files with 38 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/arm/ffi.c
View File

@@ -56,58 +56,46 @@ ffi_align (ffi_type *ty, void *p)
} }
static size_t static size_t
ffi_put_arg (ffi_type **arg_type, void **arg, char *stack) ffi_put_arg (ffi_type *ty, void *src, void *dst)
{ {
register char *argp = stack; size_t z = ty->size;
register ffi_type **p_arg = arg_type;
register void **p_argv = arg;
register size_t z = (*p_arg)->size;
if (z < sizeof (int)) switch (ty->type)
{ {
z = sizeof (int); case FFI_TYPE_SINT8:
switch ((*p_arg)->type) *(UINT32 *)dst = *(SINT8 *)src;
{ break;
case FFI_TYPE_SINT8: case FFI_TYPE_UINT8:
*(signed int *) argp = (signed int) *(SINT8 *) (*p_argv); *(UINT32 *)dst = *(UINT8 *)src;
break; break;
case FFI_TYPE_SINT16:
*(UINT32 *)dst = *(SINT16 *)src;
break;
case FFI_TYPE_UINT16:
*(UINT32 *)dst = *(UINT16 *)src;
break;
case FFI_TYPE_UINT8: case FFI_TYPE_INT:
*(unsigned int *) argp = (unsigned int) *(UINT8 *) (*p_argv); case FFI_TYPE_SINT32:
break; case FFI_TYPE_UINT32:
case FFI_TYPE_POINTER:
case FFI_TYPE_FLOAT:
*(UINT32 *)dst = *(UINT32 *)src;
break;
case FFI_TYPE_SINT16: case FFI_TYPE_SINT64:
*(signed int *) argp = (signed int) *(SINT16 *) (*p_argv); case FFI_TYPE_UINT64:
break; case FFI_TYPE_DOUBLE:
*(UINT64 *)dst = *(UINT64 *)src;
break;
case FFI_TYPE_UINT16: case FFI_TYPE_STRUCT:
*(unsigned int *) argp = (unsigned int) *(UINT16 *) (*p_argv); default:
break; memcpy (dst, src, z);
break;
case FFI_TYPE_STRUCT:
memcpy (argp, *p_argv, (*p_arg)->size);
break;
default:
FFI_ASSERT (0);
}
} }
else if (z == sizeof (int))
{ return ALIGN (z, 4);
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
{
memcpy (argp, *p_argv, 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
@@ -138,7 +126,7 @@ ffi_prep_args_SYSV (char *stack, extended_cif *ecif, float *vfp_space)
(i != 0); i--, p_arg++, p_argv++) (i != 0); i--, p_arg++, p_argv++)
{ {
argp = ffi_align (*p_arg, argp); argp = ffi_align (*p_arg, argp);
argp += ffi_put_arg (p_arg, p_argv, argp); argp += ffi_put_arg (*p_arg, *p_argv, argp);
} }
return 0; return 0;
@@ -182,7 +170,7 @@ ffi_prep_args_VFP (char *stack, extended_cif * ecif, float *vfp_space)
if (vi < ecif->cif->vfp_nargs && is_vfp_type) if (vi < ecif->cif->vfp_nargs && is_vfp_type)
{ {
char *vfp_slot = (char *) (vfp_space + ecif->cif->vfp_args[vi++]); char *vfp_slot = (char *) (vfp_space + ecif->cif->vfp_args[vi++]);
ffi_put_arg (p_arg, p_argv, vfp_slot); ffi_put_arg (*p_arg, *p_argv, vfp_slot);
continue; continue;
} }
/* Try allocating in core registers. */ /* Try allocating in core registers. */
@@ -195,7 +183,7 @@ ffi_prep_args_VFP (char *stack, extended_cif * ecif, float *vfp_space)
area to place the argument. */ area to place the argument. */
if (tregp + size <= eo_regp) if (tregp + size <= eo_regp)
{ {
regp = tregp + ffi_put_arg (p_arg, p_argv, tregp); regp = tregp + ffi_put_arg (*p_arg, *p_argv, tregp);
done_with_regs = (regp == argp); done_with_regs = (regp == argp);
// ensure we did not write into the stack area // ensure we did not write into the stack area
FFI_ASSERT (regp <= argp); FFI_ASSERT (regp <= argp);
@@ -208,7 +196,7 @@ ffi_prep_args_VFP (char *stack, extended_cif * ecif, float *vfp_space)
{ {
stack_used = 1; stack_used = 1;
done_with_regs = 1; done_with_regs = 1;
argp = tregp + ffi_put_arg (p_arg, p_argv, tregp); argp = tregp + ffi_put_arg (*p_arg, *p_argv, tregp);
FFI_ASSERT (eo_regp < argp); FFI_ASSERT (eo_regp < argp);
continue; continue;
} }
@@ -216,7 +204,7 @@ ffi_prep_args_VFP (char *stack, extended_cif * ecif, float *vfp_space)
/* Base case, arguments are passed on the stack */ /* Base case, arguments are passed on the stack */
stack_used = 1; stack_used = 1;
argp = ffi_align (*p_arg, argp); argp = ffi_align (*p_arg, argp);
argp += ffi_put_arg (p_arg, p_argv, argp); argp += ffi_put_arg (*p_arg, *p_argv, argp);
} }
/* Indicate the VFP registers used. */ /* Indicate the VFP registers used. */
return ecif->cif->vfp_used; return ecif->cif->vfp_used;