diff options
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/config/mips/mips.c | 32 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/mips/mips.exp | 12 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.target/mips/pr33256.c | 11 |
5 files changed, 66 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 84c3359c8b3..d95fa4715b7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2007-09-06 Richard Sandiford <richard@codesourcery.com> + + PR target/33256 + * config/mips/mips.c (mips_classify_symbolic_expression): New function. + (mips_classify_address): Use it instead of mips_symbolic_constant_p. + (print_operand_reloc): Likewise. + 2007-09-06 Janis Johnson <janis187@us.ibm.com> Revert: diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index ae412dea641..82986cae398 100644 --- a/gcc/config/mips/mips.c +++ b/gcc/config/mips/mips.c @@ -1553,6 +1553,21 @@ mips_classify_symbol (const_rtx x, enum mips_symbol_context context) return SYMBOL_ABSOLUTE; } +/* Classify symbolic expression X, given that it appears in context + CONTEXT. */ + +static enum mips_symbol_type +mips_classify_symbolic_expression (rtx x, enum mips_symbol_context context) +{ + rtx offset; + + split_const (x, &x, &offset); + if (UNSPEC_ADDRESS_P (x)) + return UNSPEC_ADDRESS_TYPE (x); + + return mips_classify_symbol (x, context); +} + /* Return true if OFFSET is within the range [0, ALIGN), where ALIGN is the alignment (in bytes) of SYMBOL_REF X. */ @@ -1747,9 +1762,18 @@ mips_classify_address (struct mips_address_info *info, rtx x, info->type = ADDRESS_LO_SUM; info->reg = XEXP (x, 0); info->offset = XEXP (x, 1); + /* We have to trust the creator of the LO_SUM to do something vaguely + sane. Target-independent code that creates a LO_SUM should also + create and verify the matching HIGH. Target-independent code that + adds an offset to a LO_SUM must prove that the offset will not + induce a carry. Failure to do either of these things would be + a bug, and we are not required to check for it here. The MIPS + backend itself should only create LO_SUMs for valid symbolic + constants, with the high part being either a HIGH or a copy + of _gp. */ + info->symbol_type + = mips_classify_symbolic_expression (info->offset, SYMBOL_CONTEXT_MEM); return (mips_valid_base_register_p (info->reg, mode, strict) - && mips_symbolic_constant_p (info->offset, SYMBOL_CONTEXT_MEM, - &info->symbol_type) && mips_symbol_insns (info->symbol_type, mode) > 0 && mips_lo_relocs[info->symbol_type] != 0); @@ -6290,8 +6314,8 @@ print_operand_reloc (FILE *file, rtx op, enum mips_symbol_context context, enum mips_symbol_type symbol_type; const char *p; - if (!mips_symbolic_constant_p (op, context, &symbol_type) - || relocs[symbol_type] == 0) + symbol_type = mips_classify_symbolic_expression (op, context); + if (relocs[symbol_type] == 0) fatal_insn ("PRINT_OPERAND, invalid operand for relocation", op); fputs (relocs[symbol_type], file); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 64d00d36a81..8b73d0b631b 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2007-09-06 David Daney <ddaney@avtrex.com> + Richard Sandiford <richard@codesourcery.com> + + PR target/33256 + * gcc.target/mips/mips.exp (setup_mips_tests): Set mips_forced_le. + (dg-mips-options): Skip -EB and -meb tests when $mips_forced_le. + * gcc.target/mips/pr33256.c: New test. + 2007-09-06 Tom Tromey <tromey@redhat.com> * lib/g++.exp (g++_target_compile): Use -fno-show-column. diff --git a/gcc/testsuite/gcc.target/mips/mips.exp b/gcc/testsuite/gcc.target/mips/mips.exp index 6a11b2d6e66..e498430b947 100644 --- a/gcc/testsuite/gcc.target/mips/mips.exp +++ b/gcc/testsuite/gcc.target/mips/mips.exp @@ -37,6 +37,7 @@ load_lib gcc-dg.exp # $mips_forced_isa: true if the command line uses -march=* or -mips* # $mips_forced_abi: true if the command line uses -mabi=* or -mgp* # $mips_forced_float: true if the command line uses -mhard/soft-float +# $mips_forced_le true if the command line uses -EL or -mel proc setup_mips_tests {} { global mips_isa global mips_arch @@ -47,6 +48,7 @@ proc setup_mips_tests {} { global mips_forced_isa global mips_forced_abi global mips_forced_float + global mips_forced_le global compiler_flags global tool @@ -81,6 +83,7 @@ proc setup_mips_tests {} { set mips_forced_isa [regexp -- {(-mips|-march)} $compiler_flags] set mips_forced_abi [regexp -- {(-mgp|-mfp|-mabi)} $compiler_flags] set mips_forced_float [regexp -- {-m(hard|soft)-float} $compiler_flags] + set mips_forced_le [regexp -- {-(EL|mel)[[:>:]]} $compiler_flags] } # Return true if command-line option FLAG forces 32-bit code. @@ -117,6 +120,10 @@ proc is_gp32_flag {flag} { # -mhard-float # Select the given floating-point mode. Skip the test if the # multilib flags force a different selection. +# +# -EB +# Select big-endian code. Skip the test if the multilib flags +# force a little-endian target. proc dg-mips-options {args} { upvar dg-extra-tool-flags extra_tool_flags upvar dg-do-what do_what @@ -130,6 +137,7 @@ proc dg-mips-options {args} { global mips_forced_isa global mips_forced_abi global mips_forced_float + global mips_forced_le set flags [lindex $args 1] set matches 1 @@ -175,6 +183,10 @@ proc dg-mips-options {args} { if {$mips_float != $float && $mips_forced_float} { set matches 0 } + } elseif {[regexp -- {^-(EB|meb)$} $flag]} { + if {$mips_forced_le} { + set matches 0 + } } } if {$matches} { diff --git a/gcc/testsuite/gcc.target/mips/pr33256.c b/gcc/testsuite/gcc.target/mips/pr33256.c new file mode 100644 index 00000000000..d5db110fba5 --- /dev/null +++ b/gcc/testsuite/gcc.target/mips/pr33256.c @@ -0,0 +1,11 @@ +/* GCC used to report an ICE for this test because we generated a LO_SUM + for an illegitimate constant. */ +/* { dg-mips-options "-mabi=64 -mips3 -msym32 -O2 -EB -mno-abicalls" } */ +extern unsigned long a[]; +int b (int); + +int +c (void) +{ + return b (a[0]); +} |