diff options
| author | Dale Johannesen <dalej@gcc.gnu.org> | 2002-10-21 21:56:40 +0000 |
|---|---|---|
| committer | Dale Johannesen <dalej@gcc.gnu.org> | 2002-10-21 21:56:40 +0000 |
| commit | de40e1df94369fb1bc02f5f89571157e39b5e0da (patch) | |
| tree | cfd41cc1232d36db2dfec902be06975693bd6ec7 | |
| parent | e3ccdd508a2befa298813b1975141572b462c84f (diff) | |
| download | gcc-de40e1df94369fb1bc02f5f89571157e39b5e0da.zip gcc-de40e1df94369fb1bc02f5f89571157e39b5e0da.tar.gz gcc-de40e1df94369fb1bc02f5f89571157e39b5e0da.tar.bz2 | |
Fix fastmath-specific crash PR 7133.
From-SVN: r58389
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/config/rs6000/rs6000.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/fastmath-1.c | 23 |
3 files changed, 40 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 81a7db7..40370bf 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2002-10-21 Dale Johannesen <dalej@apple.com> + + * config/rs6000/rs6000.c (rs6000_reverse_condition): Handle + unsafe math reversals correctly for RTL generation. + (output_cbranch): Replace rs6000_reverse_condition call + by its former definition. + 2002-10-21 Jakub Jelinek <jakub@redhat.com> * config/i386/i386.c (x86_64_sign_extended_value): Add allow_rip @@ -355,6 +362,7 @@ Sat Oct 19 10:46:52 CEST 2002 Jan Hubicka <jh@suse.cz> * doc/c-tree.texi: Update description of COND_EXPR tree nodes. +>>>>>>> 1.15743 2002-10-17 Geoffrey Keating <geoffk@apple.com> * config/rs6000/rs6000.h (HARD_REGNO_MODE_OK): Allow arbitrary modes diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index dcee67b..cf930e9 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -8125,7 +8125,7 @@ rs6000_reverse_condition (mode, code) { /* Reversal of FP compares takes care -- an ordered compare becomes an unordered compare and vice versa. */ - if (mode == CCFPmode) + if (mode == CCFPmode && !flag_unsafe_math_optimizations) return reverse_condition_maybe_unordered (code); else return reverse_condition (code); @@ -8397,7 +8397,14 @@ output_cbranch (op, label, reversed, insn) reverse_condition_maybe_unordered here always but this makes the resulting assembler clearer. */ if (really_reversed) - code = rs6000_reverse_condition (mode, code); + { + /* Reversal of FP compares takes care -- an ordered compare + becomes an unordered compare and vice versa. */ + if (mode == CCFPmode) + code = reverse_condition_maybe_unordered (code); + else + code = reverse_condition (code); + } if ((TARGET_SPE && TARGET_HARD_FLOAT) && mode == CCFPmode) { diff --git a/gcc/testsuite/gcc.dg/fastmath-1.c b/gcc/testsuite/gcc.dg/fastmath-1.c new file mode 100644 index 0000000..898c183 --- /dev/null +++ b/gcc/testsuite/gcc.dg/fastmath-1.c @@ -0,0 +1,23 @@ +/* { dg-do run } */ +/* { dg-options "-O2 -ffast-math" } */ + +int foo ( float* dists, int k) +{ +if ( ( dists [ 0 ] > 0 ) == ( dists [ 1 ] > 0 ) ) + return k; +return 0; +} +main() { + float dists[16] = { 0., 1., 1., 0., 0., -1., -1., 0., + 1., 1., 1., -1., -1., 1., -1., -1. }; + if ( foo(&dists[0], 1) + + foo(&dists[2], 2) + + foo(&dists[4], 4) + + foo(&dists[6], 8) + + foo(&dists[8], 16) + + foo(&dists[10], 32) + + foo(&dists[12], 64) + + foo(&dists[14], 128) + != 156) + abort(); +}
\ No newline at end of file |