procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR libffi/45677 (Bad stack allocation for ffi function calls on x86-64)

Browse source 
PR libffi/45677
	* src/x86/ffi64.c (ffi_prep_cif_machdep): Ensure cif->bytes is
	a multiple of 8.
	* testsuite/libffi.call/many2.c: New test.

From-SVN: r164829
This commit is contained in:
Jakub Jelinek 2010-10-01 09:31:49 +02:00 • committed by Jakub Jelinek
parent 16045c71e7
commit 731fc5f040
3 changed files with 63 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libffi/ChangeLog
View file

@ -1,3 +1,10 @@
2010-10-01 Jakub Jelinek <jakub@redhat.com>
PR libffi/45677
* src/x86/ffi64.c (ffi_prep_cif_machdep): Ensure cif->bytes is
a multiple of 8.
* testsuite/libffi.call/many2.c: New test.
2010-08-20 Mark Wielaard <mjw@redhat.com>
* src/closures.c (open_temp_exec_file_mnt): Check if getmntent_r

4
libffi/src/x86/ffi64.c
View file

@ -378,7 +378,7 @@ ffi_prep_cif_machdep (ffi_cif *cif)
if (align < 8)
align = 8;
bytes = ALIGN(bytes, align);
bytes = ALIGN (bytes, align);
bytes += cif->arg_types[i]->size;
}
else
@ -390,7 +390,7 @@ ffi_prep_cif_machdep (ffi_cif *cif)
if (ssecount)
flags |= 1 << 11;
cif->flags = flags;
cif->bytes = bytes;
cif->bytes = ALIGN (bytes, 8);
return FFI_OK;
}

54
libffi/testsuite/libffi.call/many2.c Normal file
View file

@ -0,0 +1,54 @@
/* Area: ffi_call
Purpose: Check uint8_t arguments.
Limitations: none.
PR: PR45677.
Originator: Dan Witte <dwitte@gmail.com> 20100916 */
/* { dg-do run } */
#include "ffitest.h"
#define NARGS 7
typedef unsigned char u8;
__attribute__((noinline)) uint8_t
foo (uint8_t a, uint8_t b, uint8_t c, uint8_t d,
uint8_t e, uint8_t f, uint8_t g)
{
return a + b + c + d + e + f + g;
}
uint8_t
bar (uint8_t a, uint8_t b, uint8_t c, uint8_t d,
uint8_t e, uint8_t f, uint8_t g)
{
return foo (a, b, c, d, e, f, g);
}
int
main (void)
{
ffi_type *ffitypes[NARGS];
int i;
ffi_cif cif;
ffi_arg result = 0;
uint8_t args[NARGS];
void *argptrs[NARGS];
for (i = 0; i < NARGS; ++i)
ffitypes[i] = &ffi_type_uint8;
CHECK (ffi_prep_cif (&cif, FFI_DEFAULT_ABI, NARGS,
&ffi_type_uint8, ffitypes) == FFI_OK);
for (i = 0; i < NARGS; ++i)
{
args[i] = i;
argptrs[i] = &args[i];
}
ffi_call (&cif, FFI_FN (bar), &result, argptrs);
CHECK (result == 21);
return 0;
}