X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fgenemit.c;h=9df559b5705c370b538b774cc98c3461c0304d05;hb=05ec1d8b03fe2b0ad3be9aa8ae1c72fa827119a2;hp=e9773082f9eb11599ae874704d38e2ce19333caf;hpb=343695df238d8e043fe83c8b0cce11b73f2e2cba;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/genemit.c b/gcc/genemit.c index e9773082f9e..9df559b5705 100644 --- a/gcc/genemit.c +++ b/gcc/genemit.c @@ -1,12 +1,12 @@ /* Generate code from machine description to emit insns as rtl. Copyright (C) 1987, 1988, 1991, 1994, 1995, 1997, 1998, 1999, 2000, 2001, - 2003, 2004, 2005 Free Software Foundation, Inc. + 2003, 2004, 2005, 2007, 2008, 2009, 2010 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 +. */ #include "bconfig.h" @@ -258,6 +257,7 @@ gen_exp (rtx x, enum rtx_code subroutine_type, char *used) return; case CONST_DOUBLE: + case CONST_FIXED: /* These shouldn't be written in MD files. Instead, the appropriate routines in varasm.c should be called. */ gcc_unreachable (); @@ -341,7 +341,7 @@ gen_insn (rtx insn, int lineno) if (i != XVECLEN (insn, 1) - 1) { struct clobber_pat *p; - struct clobber_ent *link = xmalloc (sizeof (struct clobber_ent)); + struct clobber_ent *link = XNEW (struct clobber_ent); int j; link->code_number = insn_code_number; @@ -357,17 +357,17 @@ gen_insn (rtx insn, int lineno) for (j = i + 1; j < XVECLEN (insn, 1); j++) { - rtx old = XEXP (XVECEXP (p->pattern, 1, j), 0); - rtx new = XEXP (XVECEXP (insn, 1, j), 0); + rtx old_rtx = XEXP (XVECEXP (p->pattern, 1, j), 0); + rtx new_rtx = XEXP (XVECEXP (insn, 1, j), 0); - /* OLD and NEW are the same if both are to be a SCRATCH + /* OLD and NEW_INSN are the same if both are to be a SCRATCH of the same mode, or if both are registers of the same mode and number. */ - if (! (GET_MODE (old) == GET_MODE (new) - && ((GET_CODE (old) == MATCH_SCRATCH - && GET_CODE (new) == MATCH_SCRATCH) - || (REG_P (old) && REG_P (new) - && REGNO (old) == REGNO (new))))) + if (! (GET_MODE (old_rtx) == GET_MODE (new_rtx) + && ((GET_CODE (old_rtx) == MATCH_SCRATCH + && GET_CODE (new_rtx) == MATCH_SCRATCH) + || (REG_P (old_rtx) && REG_P (new_rtx) + && REGNO (old_rtx) == REGNO (new_rtx))))) break; } @@ -377,7 +377,7 @@ gen_insn (rtx insn, int lineno) if (p == 0) { - p = xmalloc (sizeof (struct clobber_pat)); + p = XNEW (struct clobber_pat); p->insns = 0; p->pattern = insn; @@ -428,15 +428,18 @@ gen_insn (rtx insn, int lineno) } else { + char *used = XCNEWVEC (char, operands); + printf (" return gen_rtx_PARALLEL (VOIDmode, gen_rtvec (%d", XVECLEN (insn, 1)); for (i = 0; i < XVECLEN (insn, 1); i++) { printf (",\n\t\t"); - gen_exp (XVECEXP (insn, 1, i), DEFINE_INSN, NULL); + gen_exp (XVECEXP (insn, 1, i), DEFINE_INSN, used); } printf ("));\n}\n\n"); + XDELETEVEC (used); } } @@ -447,6 +450,7 @@ gen_expand (rtx expand) { int operands; int i; + char *used; if (strlen (XSTR (expand, 0)) == 0) fatal ("define_expand lacks a name"); @@ -516,12 +520,13 @@ gen_expand (rtx expand) (unless we aren't going to use them at all). */ if (XVEC (expand, 1) != 0) { - for (i = 0; i < operands; i++) - printf (" operand%d = operands[%d];\n", i, i); - for (; i <= max_dup_opno; i++) - printf (" operand%d = operands[%d];\n", i, i); - for (; i <= max_scratch_opno; i++) - printf (" operand%d = operands[%d];\n", i, i); + for (i = 0; + i < MAX (operands, MAX (max_scratch_opno, max_dup_opno) + 1); + i++) + { + printf (" operand%d = operands[%d];\n", i, i); + printf (" (void) operand%d;\n", i); + } } printf (" }\n"); } @@ -530,6 +535,9 @@ gen_expand (rtx expand) Use emit_insn to add them to the sequence being accumulated. But don't do this if the user's code has set `no_more' nonzero. */ + used = XCNEWVEC (char, + MAX (operands, MAX (max_scratch_opno, max_dup_opno) + 1)); + for (i = 0; i < XVECLEN (expand, 1); i++) { rtx next = XVECEXP (expand, 1, i); @@ -560,13 +568,15 @@ gen_expand (rtx expand) printf (" emit ("); else printf (" emit_insn ("); - gen_exp (next, DEFINE_EXPAND, NULL); + gen_exp (next, DEFINE_EXPAND, used); printf (");\n"); if (GET_CODE (next) == SET && GET_CODE (SET_DEST (next)) == PC && GET_CODE (SET_SRC (next)) == LABEL_REF) printf (" emit_barrier ();"); } + XDELETEVEC (used); + /* Call `get_insns' to extract the list of all the insns emitted within this gen_... function. */ @@ -599,7 +609,7 @@ gen_split (rtx split) max_operand_vec (split, 2); operands = MAX (max_opno, MAX (max_dup_opno, max_scratch_opno)) + 1; unused = (operands == 0 ? " ATTRIBUTE_UNUSED" : ""); - used = xcalloc (1, operands); + used = XCNEWVEC (char, operands); /* Output the prototype, function name and argument declarations. */ if (GET_CODE (split) == DEFINE_PEEPHOLE2) @@ -612,7 +622,7 @@ gen_split (rtx split) else { printf ("extern rtx gen_split_%d (rtx, rtx *);\n", insn_code_number); - printf ("rtx\ngen_split_%d (rtx curr_insn ATTRIBUTE_UNUSED, rtx *operands%s)\n", + printf ("rtx\ngen_split_%d (rtx curr_insn ATTRIBUTE_UNUSED, rtx *operands%s)\n", insn_code_number, unused); } printf ("{\n"); @@ -638,7 +648,10 @@ gen_split (rtx split) /* Output code to copy the arguments back out of `operands' */ for (i = 0; i < operands; i++) - printf (" operand%d = operands[%d];\n", i, i); + { + printf (" operand%d = operands[%d];\n", i, i); + printf (" (void) operand%d;\n", i); + } /* Output code to construct the rtl for the instruction bodies. Use emit_insn to add them to the sequence being accumulated. @@ -773,9 +786,7 @@ output_peephole2_scratches (rtx split) { int i; int insn_nr = 0; - - printf (" HARD_REG_SET _regs_allocated;\n"); - printf (" CLEAR_HARD_REG_SET (_regs_allocated);\n"); + bool first = true; for (i = 0; i < XVECLEN (split, 0); i++) { @@ -794,6 +805,13 @@ output_peephole2_scratches (rtx split) else if (GET_CODE (XVECEXP (split, 0, j)) != MATCH_SCRATCH) cur_insn_nr++; + if (first) + { + printf (" HARD_REG_SET _regs_allocated;\n"); + printf (" CLEAR_HARD_REG_SET (_regs_allocated);\n"); + first = false; + } + printf (" if ((operands[%d] = peep2_find_free_register (%d, %d, \"%s\", %smode, &_regs_allocated)) == NULL_RTX)\n\ return NULL;\n", XINT (elt, 0), @@ -835,7 +853,7 @@ from the machine description file `md'. */\n\n"); printf ("#include \"function.h\"\n"); printf ("#include \"expr.h\"\n"); printf ("#include \"optabs.h\"\n"); - printf ("#include \"real.h\"\n"); + printf ("#include \"dfp.h\"\n"); printf ("#include \"flags.h\"\n"); printf ("#include \"output.h\"\n"); printf ("#include \"insn-config.h\"\n"); @@ -844,8 +862,11 @@ from the machine description file `md'. */\n\n"); printf ("#include \"resource.h\"\n"); printf ("#include \"reload.h\"\n"); printf ("#include \"toplev.h\"\n"); - printf ("#include \"ggc.h\"\n\n"); - printf ("#include \"basic-block.h\"\n\n"); + printf ("#include \"regs.h\"\n"); + printf ("#include \"tm-constrs.h\"\n"); + printf ("#include \"ggc.h\"\n"); + printf ("#include \"basic-block.h\"\n"); + printf ("#include \"integrate.h\"\n\n"); printf ("#define FAIL return (end_sequence (), _val)\n"); printf ("#define DONE return (_val = get_insns (), end_sequence (), _val)\n\n");