From 4280a3e362da8fbf6236b723f544ea598a00c9be Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Fri, 8 Dec 2006 19:20:25 +0100 Subject: [PATCH] re PR target/30120 (silent miscompilation of argument passing) PR target/30120 * reg-stack.c (convert_regs_entry): Mark current argument passing registers as live. * config/i386/i386.h (X87_REGPARM_MAX): Set to 0 to disable passing of float arguments in x87 registers. testsuite/ChangeLog: * gcc.target/i386/x87regparm-1.c: XFAIL. * gcc.target/i386/x87regparm-2.c: XFAIL. * gcc.target/i386/x87regparm-3.c: XFAIL. * gcc.target/i386/x87regparm-4.c: XFAIL. From-SVN: r119663 --- gcc/ChangeLog | 9 +++++++++ gcc/config/i386/i386.h | 4 +++- gcc/reg-stack.c | 3 ++- gcc/testsuite/ChangeLog | 7 +++++++ gcc/testsuite/gcc.target/i386/x87regparm-1.c | 2 +- gcc/testsuite/gcc.target/i386/x87regparm-2.c | 2 +- gcc/testsuite/gcc.target/i386/x87regparm-3.c | 2 +- gcc/testsuite/gcc.target/i386/x87regparm-4.c | 2 +- 8 files changed, 25 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index bb90505..287d0de 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2006-12-08 Uros Bizjak + + PR target/30120 + * reg-stack.c (convert_regs_entry): Mark current argument passing + registers as live. + + * config/i386/i386.h (X87_REGPARM_MAX): Set to 0 to disable passing + of float arguments in x87 registers. + 2006-12-08 John David Anglin * pa.h (LEGITIMATE_CONSTANT_P): Simplify. diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index dc15a2b..e05bf66 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -1778,7 +1778,9 @@ do { \ #define REGPARM_MAX (TARGET_64BIT ? 6 : 3) -#define X87_REGPARM_MAX 3 +/* ??? Currently disabled, as reg-stack.c does not know how to + rearrange input registers if some arguments are left unused. */ +#define X87_REGPARM_MAX 0 #define SSE_REGPARM_MAX (TARGET_64BIT ? 8 : (TARGET_SSE ? 3 : 0)) diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c index 57924ce..327cee5 100644 --- a/gcc/reg-stack.c +++ b/gcc/reg-stack.c @@ -2595,7 +2595,8 @@ convert_regs_entry (void) int reg, top = -1; for (reg = LAST_STACK_REG; reg >= FIRST_STACK_REG; --reg) - if (TEST_HARD_REG_BIT (bi->stack_in.reg_set, reg)) + if (TEST_HARD_REG_BIT (bi->stack_in.reg_set, reg) + || TEST_HARD_REG_BIT (incoming_regs, reg)) { rtx init; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index fe8632a..a054286 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2006-12-08 Uros Bizjak + + * gcc.target/i386/x87regparm-1.c: XFAIL. + * gcc.target/i386/x87regparm-2.c: XFAIL. + * gcc.target/i386/x87regparm-3.c: XFAIL. + * gcc.target/i386/x87regparm-4.c: XFAIL. + 2006-12-08 Manuel Lopez-Ibanez * lib/target-supports.exp diff --git a/gcc/testsuite/gcc.target/i386/x87regparm-1.c b/gcc/testsuite/gcc.target/i386/x87regparm-1.c index fa93401..a1e6660 100644 --- a/gcc/testsuite/gcc.target/i386/x87regparm-1.c +++ b/gcc/testsuite/gcc.target/i386/x87regparm-1.c @@ -19,4 +19,4 @@ void test() /* Check that no memory is used to pass arguments. */ -/* { dg-final { scan-assembler-not "\\(%esp\\)" } } */ +/* { dg-final { scan-assembler-not "\\(%esp\\)" { xfail *-*-* } } } */ diff --git a/gcc/testsuite/gcc.target/i386/x87regparm-2.c b/gcc/testsuite/gcc.target/i386/x87regparm-2.c index b28dbc1..47508f8 100644 --- a/gcc/testsuite/gcc.target/i386/x87regparm-2.c +++ b/gcc/testsuite/gcc.target/i386/x87regparm-2.c @@ -19,4 +19,4 @@ void test() /* Check that no memory is used to pass arguments. */ -/* { dg-final { scan-assembler-not "\\(%esp\\)" } } */ +/* { dg-final { scan-assembler-not "\\(%esp\\)" { xfail *-*-* } } } */ diff --git a/gcc/testsuite/gcc.target/i386/x87regparm-3.c b/gcc/testsuite/gcc.target/i386/x87regparm-3.c index b90ff85..8e3ff70 100644 --- a/gcc/testsuite/gcc.target/i386/x87regparm-3.c +++ b/gcc/testsuite/gcc.target/i386/x87regparm-3.c @@ -19,4 +19,4 @@ void test() /* Check that float and double arguments are passed through memory. */ -/* { dg-final { scan-assembler-times "\\(%esp\\)" 4 } } */ +/* { dg-final { scan-assembler-times "\\(%esp\\)" 4 { xfail *-*-* } } } */ diff --git a/gcc/testsuite/gcc.target/i386/x87regparm-4.c b/gcc/testsuite/gcc.target/i386/x87regparm-4.c index 78a6cdd..95fe2a5 100644 --- a/gcc/testsuite/gcc.target/i386/x87regparm-4.c +++ b/gcc/testsuite/gcc.target/i386/x87regparm-4.c @@ -19,4 +19,4 @@ void test() /* Check that no memory is used to pass arguments. */ -/* { dg-final { scan-assembler-not "\\(%esp\\)" } } */ +/* { dg-final { scan-assembler-not "\\(%esp\\)" { xfail *-*-* } } } */ -- 2.7.4