X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Frtl.c;h=edf393f29d2e661d8f6f96a2a1dbc28c2bac6944;hb=30063220317954deb4ba0c0fcf05dffe96069437;hp=08b463b428ba997f2173a9d0070bbd8b5a9fa390;hpb=67ce556b47830dd825524e8370969b814c355216;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/rtl.c b/gcc/rtl.c index 08b463b428b..edf393f29d2 100644 --- a/gcc/rtl.c +++ b/gcc/rtl.c @@ -1,12 +1,12 @@ /* RTL utility routines. Copyright (C) 1987, 1988, 1991, 1994, 1997, 1998, 1999, 2000, 2001, 2002, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. This file is part of GCC. GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2, or (at your option) any later +Software Foundation; either version 3, or (at your option) any later version. GCC is distributed in the hope that it will be useful, but WITHOUT ANY @@ -15,9 +15,8 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to the Free -Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301, USA. */ +along with GCC; see the file COPYING3. If not see +. */ /* This file is compiled twice: once for the generator programs once for the compiler. */ @@ -109,9 +108,9 @@ const enum rtx_class rtx_class[NUM_RTX_CODE] = { /* Indexed by rtx code, gives the size of the rtx in bytes. */ -const unsigned char rtx_size[NUM_RTX_CODE] = { +const unsigned char rtx_code_size[NUM_RTX_CODE] = { #define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS) \ - ((ENUM) == CONST_INT || (ENUM) == CONST_DOUBLE \ + ((ENUM) == CONST_INT || (ENUM) == CONST_DOUBLE || (ENUM) == CONST_FIXED\ ? RTX_HDR_SIZE + (sizeof FORMAT - 1) * sizeof (HOST_WIDE_INT) \ : RTX_HDR_SIZE + (sizeof FORMAT - 1) * sizeof (rtunion)), @@ -119,15 +118,10 @@ const unsigned char rtx_size[NUM_RTX_CODE] = { #undef DEF_RTL_EXPR }; -/* Make sure all NOTE_INSN_* values are negative. */ -extern char NOTE_INSN_MAX_isnt_negative_adjust_NOTE_INSN_BIAS -[NOTE_INSN_MAX < 0 ? 1 : -1]; - /* Names for kinds of NOTEs and REG_NOTEs. */ -const char * const note_insn_name[NOTE_INSN_MAX - NOTE_INSN_BIAS] = +const char * const note_insn_name[NOTE_INSN_MAX] = { - "", #define DEF_INSN_NOTE(NAME) #NAME, #include "insn-notes.def" #undef DEF_INSN_NOTE @@ -170,6 +164,16 @@ rtvec_alloc (int n) return rt; } +/* Return the number of bytes occupied by rtx value X. */ + +unsigned int +rtx_size (const_rtx x) +{ + if (GET_CODE (x) == SYMBOL_REF && SYMBOL_REF_HAS_BLOCK_INFO_P (x)) + return RTX_HDR_SIZE + sizeof (struct block_symbol); + return RTX_CODE_SIZE (GET_CODE (x)); +} + /* Allocate an rtx of code CODE. The CODE is stored in the rtx; all the rest is initialized to zero. */ @@ -178,7 +182,7 @@ rtx_alloc_stat (RTX_CODE code MEM_STAT_DECL) { rtx rt; - rt = (rtx) ggc_alloc_zone_pass_stat (RTX_SIZE (code), &rtl_zone); + rt = (rtx) ggc_alloc_zone_pass_stat (RTX_CODE_SIZE (code), &rtl_zone); /* We want to clear everything up to the FLD array. Normally, this is one int, but we don't want to assume that and it isn't very @@ -189,13 +193,28 @@ rtx_alloc_stat (RTX_CODE code MEM_STAT_DECL) #ifdef GATHER_STATISTICS rtx_alloc_counts[code]++; - rtx_alloc_sizes[code] += RTX_SIZE (code); + rtx_alloc_sizes[code] += RTX_CODE_SIZE (code); #endif return rt; } +/* Return true if ORIG is a sharable CONST. */ + +bool +shared_const_p (const_rtx orig) +{ + gcc_assert (GET_CODE (orig) == CONST); + + /* CONST can be shared if it contains a SYMBOL_REF. If it contains + a LABEL_REF, it isn't sharable. */ + return (GET_CODE (XEXP (orig, 0)) == PLUS + && GET_CODE (XEXP (XEXP (orig, 0), 0)) == SYMBOL_REF + && GET_CODE (XEXP (XEXP (orig, 0), 1)) == CONST_INT); +} + + /* Create a new copy of an rtx. Recursively copies the operands of the rtx, except for those few rtx codes that are sharable. */ @@ -215,6 +234,7 @@ copy_rtx (rtx orig) case REG: case CONST_INT: case CONST_DOUBLE: + case CONST_FIXED: case CONST_VECTOR: case SYMBOL_REF: case CODE_LABEL: @@ -229,11 +249,7 @@ copy_rtx (rtx orig) break; case CONST: - /* CONST can be shared if it contains a SYMBOL_REF. If it contains - a LABEL_REF, it isn't sharable. */ - if (GET_CODE (XEXP (orig, 0)) == PLUS - && GET_CODE (XEXP (XEXP (orig, 0), 0)) == SYMBOL_REF - && GET_CODE (XEXP (XEXP (orig, 0), 1)) == CONST_INT) + if (shared_const_p (orig)) return orig; break; @@ -246,13 +262,11 @@ copy_rtx (rtx orig) break; } - copy = rtx_alloc (code); - - /* Copy the various flags, and other information. We assume that - all fields need copying, and then clear the fields that should + /* Copy the various flags, fields, and other information. We assume + that all fields need copying, and then clear the fields that should not be copied. That is the sensible default behavior, and forces us to explicitly document why we are *not* copying a flag. */ - memcpy (copy, orig, RTX_HDR_SIZE); + copy = shallow_copy_rtx (orig); /* We do not copy the USED flag, which is used as a mark bit during walks over the RTL. */ @@ -267,55 +281,49 @@ copy_rtx (rtx orig) format_ptr = GET_RTX_FORMAT (GET_CODE (copy)); for (i = 0; i < GET_RTX_LENGTH (GET_CODE (copy)); i++) - { - copy->u.fld[i] = orig->u.fld[i]; - switch (*format_ptr++) - { - case 'e': - if (XEXP (orig, i) != NULL) - XEXP (copy, i) = copy_rtx (XEXP (orig, i)); - break; - - case 'E': - case 'V': - if (XVEC (orig, i) != NULL) - { - XVEC (copy, i) = rtvec_alloc (XVECLEN (orig, i)); - for (j = 0; j < XVECLEN (copy, i); j++) - XVECEXP (copy, i, j) = copy_rtx (XVECEXP (orig, i, j)); - } - break; - - case 't': - case 'w': - case 'i': - case 's': - case 'S': - case 'T': - case 'u': - case 'B': - case '0': - /* These are left unchanged. */ - break; - - default: - gcc_unreachable (); - } - } + switch (*format_ptr++) + { + case 'e': + if (XEXP (orig, i) != NULL) + XEXP (copy, i) = copy_rtx (XEXP (orig, i)); + break; + + case 'E': + case 'V': + if (XVEC (orig, i) != NULL) + { + XVEC (copy, i) = rtvec_alloc (XVECLEN (orig, i)); + for (j = 0; j < XVECLEN (copy, i); j++) + XVECEXP (copy, i, j) = copy_rtx (XVECEXP (orig, i, j)); + } + break; + + case 't': + case 'w': + case 'i': + case 's': + case 'S': + case 'T': + case 'u': + case 'B': + case '0': + /* These are left unchanged. */ + break; + + default: + gcc_unreachable (); + } return copy; } /* Create a new copy of an rtx. Only copy just one level. */ rtx -shallow_copy_rtx_stat (rtx orig MEM_STAT_DECL) +shallow_copy_rtx_stat (const_rtx orig MEM_STAT_DECL) { - rtx copy; - - copy = (rtx) ggc_alloc_zone_pass_stat (RTX_SIZE (GET_CODE (orig)), - &rtl_zone); - memcpy (copy, orig, RTX_SIZE (GET_CODE (orig))); - return copy; + const unsigned int size = rtx_size (orig); + rtx const copy = (rtx) ggc_alloc_zone_pass_stat (size, &rtl_zone); + return memcpy (copy, orig, size); } /* Nonzero when we are generating CONCATs. */ @@ -329,7 +337,7 @@ int currently_expanding_to_rtl; This is the Lisp function EQUAL for rtx arguments. */ int -rtx_equal_p (rtx x, rtx y) +rtx_equal_p (const_rtx x, const_rtx y) { int i; int j; @@ -367,6 +375,7 @@ rtx_equal_p (rtx x, rtx y) case SCRATCH: case CONST_DOUBLE: case CONST_INT: + case CONST_FIXED: return 0; default: @@ -435,7 +444,8 @@ rtx_equal_p (rtx x, rtx y) return 1; } -void dump_rtx_statistics (void) +void +dump_rtx_statistics (void) { #ifdef GATHER_STATISTICS int i; @@ -467,7 +477,7 @@ void dump_rtx_statistics (void) #if defined ENABLE_RTL_CHECKING && (GCC_VERSION >= 2007) void -rtl_check_failed_bounds (rtx r, int n, const char *file, int line, +rtl_check_failed_bounds (const_rtx r, int n, const char *file, int line, const char *func) { internal_error @@ -477,7 +487,7 @@ rtl_check_failed_bounds (rtx r, int n, const char *file, int line, } void -rtl_check_failed_type1 (rtx r, int n, int c1, const char *file, int line, +rtl_check_failed_type1 (const_rtx r, int n, int c1, const char *file, int line, const char *func) { internal_error @@ -487,7 +497,7 @@ rtl_check_failed_type1 (rtx r, int n, int c1, const char *file, int line, } void -rtl_check_failed_type2 (rtx r, int n, int c1, int c2, const char *file, +rtl_check_failed_type2 (const_rtx r, int n, int c1, int c2, const char *file, int line, const char *func) { internal_error @@ -497,7 +507,7 @@ rtl_check_failed_type2 (rtx r, int n, int c1, int c2, const char *file, } void -rtl_check_failed_code1 (rtx r, enum rtx_code code, const char *file, +rtl_check_failed_code1 (const_rtx r, enum rtx_code code, const char *file, int line, const char *func) { internal_error ("RTL check: expected code '%s', have '%s' in %s, at %s:%d", @@ -506,7 +516,7 @@ rtl_check_failed_code1 (rtx r, enum rtx_code code, const char *file, } void -rtl_check_failed_code2 (rtx r, enum rtx_code code1, enum rtx_code code2, +rtl_check_failed_code2 (const_rtx r, enum rtx_code code1, enum rtx_code code2, const char *file, int line, const char *func) { internal_error @@ -515,9 +525,35 @@ rtl_check_failed_code2 (rtx r, enum rtx_code code1, enum rtx_code code2, func, trim_filename (file), line); } +void +rtl_check_failed_code_mode (const_rtx r, enum rtx_code code, enum machine_mode mode, + bool not_mode, const char *file, int line, + const char *func) +{ + internal_error ((not_mode + ? ("RTL check: expected code '%s' and not mode '%s', " + "have code '%s' and mode '%s' in %s, at %s:%d") + : ("RTL check: expected code '%s' and mode '%s', " + "have code '%s' and mode '%s' in %s, at %s:%d")), + GET_RTX_NAME (code), GET_MODE_NAME (mode), + GET_RTX_NAME (GET_CODE (r)), GET_MODE_NAME (GET_MODE (r)), + func, trim_filename (file), line); +} + +/* Report that line LINE of FILE tried to access the block symbol fields + of a non-block symbol. FUNC is the function that contains the line. */ + +void +rtl_check_failed_block_symbol (const char *file, int line, const char *func) +{ + internal_error + ("RTL check: attempt to treat non-block symbol as a block symbol " + "in %s, at %s:%d", func, trim_filename (file), line); +} + /* XXX Maybe print the vector? */ void -rtvec_check_failed_bounds (rtvec r, int n, const char *file, int line, +rtvec_check_failed_bounds (const_rtvec r, int n, const char *file, int line, const char *func) { internal_error @@ -528,7 +564,7 @@ rtvec_check_failed_bounds (rtvec r, int n, const char *file, int line, #if defined ENABLE_RTL_FLAG_CHECKING void -rtl_check_failed_flag (const char *name, rtx r, const char *file, +rtl_check_failed_flag (const char *name, const_rtx r, const char *file, int line, const char *func) { internal_error