From 9c90a97e936f00e67938ba115719fe7dda5c545e Mon Sep 17 00:00:00 2001 From: Ulrich Weigand Date: Wed, 9 Mar 2005 22:05:15 +0000 Subject: [PATCH] s390.c (s390_secondary_output_reload_class): Adapt check for non-offsettable memory references to cope with outstanding... * config/s390/s390.c (s390_secondary_output_reload_class): Adapt check for non-offsettable memory references to cope with outstanding reload replacements. * config/s390/s390.md ("reload_outti"): Call find_replacement to avoid losing outstanding address reloads. ("reload_outdi", "reload_outdf"): Likewise. testsuite/ChangeLog: * gcc.dg/20050309-1.c: New test. From-SVN: r96214 --- gcc/ChangeLog | 9 ++++++++ gcc/config/s390/s390.c | 8 +++++-- gcc/config/s390/s390.md | 6 ++--- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/gcc.dg/20050309-1.c | 37 +++++++++++++++++++++++++++++++ 5 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/20050309-1.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dddd9abdd83..421d5c04403 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2005-03-09 Ulrich Weigand + + * config/s390/s390.c (s390_secondary_output_reload_class): Adapt check + for non-offsettable memory references to cope with outstanding reload + replacements. + * config/s390/s390.md ("reload_outti"): Call find_replacement to + avoid losing outstanding address reloads. + ("reload_outdi", "reload_outdf"): Likewise. + 2005-03-09 Kaveh R. Ghazi * builtins.c (fold_builtin_cbrt, fold_builtin_pow): Rearrange diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index a5896e878d2..3358f28909b 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -2553,12 +2553,16 @@ enum reg_class s390_secondary_output_reload_class (enum reg_class class, enum machine_mode mode, rtx out) { + struct s390_address addr; + if ((TARGET_64BIT ? mode == TImode : (mode == DImode || mode == DFmode)) && reg_classes_intersect_p (GENERAL_REGS, class) && GET_CODE (out) == MEM - && !offsettable_memref_p (out) - && !s_operand (out, VOIDmode)) + && s390_decompose_address (XEXP (out, 0), &addr) + && addr.base && addr.indx + && addr.disp && GET_CODE (addr.disp) == CONST_INT + && !DISP_IN_RANGE (INTVAL (addr.disp) + GET_MODE_SIZE (mode) - 1)) return ADDR_REGS; if (reg_classes_intersect_p (CC_REGS, class)) diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md index a0b9a3143a0..5bb9d4c24aa 100644 --- a/gcc/config/s390/s390.md +++ b/gcc/config/s390/s390.md @@ -833,7 +833,7 @@ "TARGET_64BIT" { gcc_assert (MEM_P (operands[0])); - s390_load_address (operands[2], XEXP (operands[0], 0)); + s390_load_address (operands[2], find_replacement (&XEXP (operands[0], 0))); operands[0] = replace_equiv_address (operands[0], operands[2]); emit_move_insn (operands[0], operands[1]); DONE; @@ -992,7 +992,7 @@ "!TARGET_64BIT" { gcc_assert (MEM_P (operands[0])); - s390_load_address (operands[2], XEXP (operands[0], 0)); + s390_load_address (operands[2], find_replacement (&XEXP (operands[0], 0))); operands[0] = replace_equiv_address (operands[0], operands[2]); emit_move_insn (operands[0], operands[1]); DONE; @@ -1451,7 +1451,7 @@ "!TARGET_64BIT" { gcc_assert (MEM_P (operands[0])); - s390_load_address (operands[2], XEXP (operands[0], 0)); + s390_load_address (operands[2], find_replacement (&XEXP (operands[0], 0))); operands[0] = replace_equiv_address (operands[0], operands[2]); emit_move_insn (operands[0], operands[1]); DONE; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9d40f911286..2f2a43171e8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2005-03-09 Ulrich Weigand + + * gcc.dg/20050309-1.c: New test. + 2005-03-09 Kaveh R. Ghazi * gcc.dg/builtins-10.c: Reactivate disabled test. diff --git a/gcc/testsuite/gcc.dg/20050309-1.c b/gcc/testsuite/gcc.dg/20050309-1.c new file mode 100644 index 00000000000..413930f86f8 --- /dev/null +++ b/gcc/testsuite/gcc.dg/20050309-1.c @@ -0,0 +1,37 @@ +/* This caused an ICE on s390 due to incorrect secondary + output reloads. */ + +/* { dg-do compile } */ +/* { dg-options "-O2 -fprofile-generate" } */ + +char * +test(char *ret, int *counter, void *schema, + const char* name, const char *namespace, + void *node, int topLevel) +{ + char buf[30]; + int val; + + if (counter == 0) return 0; + if (schema == 0) return 0; + if (name == 0) return 0; + + __builtin_memset (ret, 0, 100); + lookup (schema, name, -1); + val = hash (schema, name, namespace, name, ret); + if (val == 0) return ret; + + if (topLevel != 0) + { + error (1, 0, 0, node, "%s", name); + return 0; + } + + __snprintf_chk (buf, 29, 1, 30, "#eCont %d", ++*counter); + val = hash (schema, name, buf, namespace, ret); + if (val == 0) return ret; + + error (1, 0, 0, node, "%s", name); + return 0; +} + -- 2.30.2