From eebac1c4bfbd4e752ee02727a3bccdd4d969ab7c Mon Sep 17 00:00:00 2001 From: Bo Thorsen Date: Tue, 28 May 2002 09:22:08 +0000 Subject: [PATCH] ffi.c (ffi_prep_incoming_args_SYSV): Remove avn here too. 2002-05-28 Bo Thorsen * src/x86/ffi.c (ffi_prep_incoming_args_SYSV): Remove avn here too. From-SVN: r53954 --- libffi/ChangeLog | 5 +++++ libffi/src/x86/ffi.c | 26 ++++++++------------------ 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/libffi/ChangeLog b/libffi/ChangeLog index a18c688c7055..ae3c0d6a8bea 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,8 @@ +2002-05-28 Bo Thorsen + + * src/x86/ffi.c (ffi_prep_incoming_args_SYSV): Remove avn + here too. + 2002-05-27 Roger Sayle * src/x86/ffi.c (ffi_prep_args): Remove reference to avn. diff --git a/libffi/src/x86/ffi.c b/libffi/src/x86/ffi.c index ee676339c2e5..acc6529bb14e 100644 --- a/libffi/src/x86/ffi.c +++ b/libffi/src/x86/ffi.c @@ -267,7 +267,6 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue, { register unsigned int i; register int tmp; - register unsigned int avn; register void **p_argv; register char *argp; register ffi_type **p_arg; @@ -280,35 +279,26 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue, argp += 4; } - avn = cif->nargs; p_argv = avalue; - for (i = cif->nargs, p_arg = cif->arg_types; - (i != 0) && (avn != 0); - i--, p_arg++) + for (i = cif->nargs, p_arg = cif->arg_types; i != 0; i--, p_arg++) { size_t z; /* Align if necessary */ - if (((*p_arg)->alignment - 1) & (unsigned) argp) { + if (((*p_arg)->alignment - 1) & (unsigned) argp) argp = (char *) ALIGN(argp, (*p_arg)->alignment); - } - if (avn != 0) - { - avn--; - z = (*p_arg)->size; + z = (*p_arg)->size; - /* because we're little endian, this is - what it turns into. */ + /* because we're little endian, this is what it turns into. */ - *p_argv = (void*) argp; + *p_argv = (void*) argp; - p_argv++; - argp += z; - } + p_argv++; + argp += z; } - + return; } -- 2.47.2