From 316d0b19813c17613fe2dd80f8bba4fd2001eca3 Mon Sep 17 00:00:00 2001 From: Eric Botcazou Date: Thu, 27 Nov 2003 06:20:11 +0100 Subject: [PATCH] re PR middle-end/8028 (__builtin_apply() passes wrong arguments) PR middle-end/8028 PR middle-end/9890 PR middle-end/11151 PR middle-end/12210 PR middle-end/12503 PR middle-end/12692 * builtins.c (expand_builtin_apply): Use virtual_outgoing_args_rtx as the base address to copy the memory arguments to. From-SVN: r73976 --- gcc/ChangeLog | 11 ++++++++ gcc/builtins.c | 16 ++++++----- gcc/testsuite/ChangeLog | 4 +++ gcc/testsuite/gcc.dg/builtin-apply2.c | 39 +++++++++++++++++++++++++++ 4 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/builtin-apply2.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7c9c3846746..f68c34b8c57 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,14 @@ +2003-11-27 Eric Botcazou + + PR middle-end/8028 + PR middle-end/9890 + PR middle-end/11151 + PR middle-end/12210 + PR middle-end/12503 + PR middle-end/12692 + * builtins.c (expand_builtin_apply): Use virtual_outgoing_args_rtx + as the base address to copy the memory arguments to. + 2003-11-26 Danny Smith * config/i386/cygming.h (ASM_OUTPUT_DEF_FROM_DECLS): Declare diff --git a/gcc/builtins.c b/gcc/builtins.c index 7ff87899925..a48c5af9a54 100644 --- a/gcc/builtins.c +++ b/gcc/builtins.c @@ -1219,12 +1219,16 @@ expand_builtin_apply (rtx function, rtx arguments, rtx argsize) #endif emit_stack_save (SAVE_BLOCK, &old_stack_level, NULL_RTX); - /* Push a block of memory onto the stack to store the memory arguments. - Save the address in a register, and copy the memory arguments. ??? I - haven't figured out how the calling convention macros effect this, - but it's likely that the source and/or destination addresses in - the block copy will need updating in machine specific ways. */ - dest = allocate_dynamic_stack_space (argsize, 0, BITS_PER_UNIT); + /* Allocate a block of memory onto the stack and copy the memory + arguments to the outgoing arguments address. */ + allocate_dynamic_stack_space (argsize, 0, BITS_PER_UNIT); + dest = virtual_outgoing_args_rtx; +#ifndef STACK_GROWS_DOWNWARD + if (GET_CODE (argsize) == CONST_INT) + dest = plus_constant (dest, -INTVAL (argsize)); + else + dest = gen_rtx_PLUS (Pmode, dest, negate_rtx (Pmode, argsize)); +#endif dest = gen_rtx_MEM (BLKmode, dest); set_mem_align (dest, PARM_BOUNDARY); src = gen_rtx_MEM (BLKmode, incoming_args); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4b8fe13c88f..20faca0c1f5 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2003-11-27 Eric Botcazou + + * gcc.dg/builtin-apply2.c: New test. + 2003-11-26 Eric Botcazou * gcc.c-torture/compile/20031023-4.c: Don't XFAIL on SPARC64. diff --git a/gcc/testsuite/gcc.dg/builtin-apply2.c b/gcc/testsuite/gcc.dg/builtin-apply2.c new file mode 100644 index 00000000000..56b27a1dd17 --- /dev/null +++ b/gcc/testsuite/gcc.dg/builtin-apply2.c @@ -0,0 +1,39 @@ +/* PR target/12503 */ +/* Origin: */ + +/* Verify that __builtin_apply behaves correctly on targets + with pre-pushed arguments (e.g. SPARC). */ + +/* { dg-do run } */ + + +#define INTEGER_ARG 5 + +typedef __SIZE_TYPE__ size_t; + +extern void abort(void); + +void foo(char *name, double d, double e, double f, int g) +{ + if (g != INTEGER_ARG) + abort(); +} + +void bar(char *name, ...) +{ + size_t size; + void *arguments; + + size = sizeof(char *) + 3 * sizeof(double) + sizeof(int); + + arguments = __builtin_apply_args(); + + __builtin_apply(foo, arguments, size); +} + +int main(void) +{ + bar("eeee", 5.444567, 8.90765, 4.567789, INTEGER_ARG); + + return 0; +} -- 2.30.2