X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fgenoutput.c;h=bc41b7bc7f581fb5e65a9917dcdcb14ba944595d;hb=595afebdab4178820580b10fd829cad8a42914bd;hp=c3ce33db65b4e157f197596030c92b6b8fb2fbc0;hpb=b638f5c89f99cde8200a4af4de2ebf32f1c4d62c;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/genoutput.c b/gcc/genoutput.c index c3ce33db65b..bc41b7bc7f5 100644 --- a/gcc/genoutput.c +++ b/gcc/genoutput.c @@ -1,6 +1,6 @@ /* Generate code from to output assembler insns as recognized from rtl. Copyright (C) 1987, 1988, 1992, 1994, 1995, 1997, 1998, 1999, 2000, 2002, - 2003, 2004, 2005, 2007, 2008 Free Software Foundation, Inc. + 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. If not see /* This program reads the machine description for the compiler target machine and produces a file containing these things: - 1. An array of `struct insn_data', which is indexed by insn code number, + 1. An array of `struct insn_data_d', which is indexed by insn code number, which contains: a. `name' is the name for that pattern. Nameless patterns are @@ -66,6 +66,8 @@ along with GCC; see the file COPYING3. If not see MATCH_OPERAND; it is zero for operands that should not be changed during register elimination such as MATCH_OPERATORs. + g. `allows_mem', is true for operands that accept MEM rtxes. + The code number of an insn is simply its position in the machine description; code numbers are assigned sequentially to entries in the description, starting with code number 0. @@ -160,6 +162,7 @@ struct data int index_number; const char *filename; int lineno; + int n_generator_args; /* Number of arguments passed to generator */ int n_operands; /* Number of operands this insn recognizes */ int n_dups; /* Number times match_dup appears in pattern */ int n_alternatives; /* Number of alternatives in each constraint */ @@ -240,7 +243,7 @@ output_prologue (void) printf ("#include \"conditions.h\"\n"); printf ("#include \"insn-attr.h\"\n\n"); printf ("#include \"recog.h\"\n\n"); - printf ("#include \"toplev.h\"\n"); + printf ("#include \"diagnostic-core.h\"\n"); printf ("#include \"output.h\"\n"); printf ("#include \"target.h\"\n"); printf ("#include \"tm-constrs.h\"\n"); @@ -255,6 +258,8 @@ output_operand_data (void) for (d = odata; d; d = d->next) { + struct pred_data *pred; + printf (" {\n"); printf (" %s,\n", @@ -268,7 +273,12 @@ output_operand_data (void) printf (" %d,\n", d->constraint == NULL ? 1 : 0); - printf (" %d\n", d->eliminable); + printf (" %d,\n", d->eliminable); + + pred = NULL; + if (d->predicate) + pred = lookup_predicate (d->predicate); + printf (" %d\n", pred && pred->codes[MEM]); printf(" },\n"); } @@ -293,7 +303,7 @@ output_insn_data (void) } printf ("#if GCC_VERSION >= 2007\n__extension__\n#endif\n"); - printf ("\nconst struct insn_data insn_data[] = \n{\n"); + printf ("\nconst struct insn_data_d insn_data[] = \n{\n"); for (d = idata; d; d = d->next) { @@ -330,7 +340,7 @@ output_insn_data (void) switch (d->output_format) { case INSN_OUTPUT_FORMAT_NONE: - printf ("#if HAVE_DESIGNATED_INITIALIZERS\n"); + printf ("#if HAVE_DESIGNATED_UNION_INITIALIZERS\n"); printf (" { 0 },\n"); printf ("#else\n"); printf (" { 0, 0, 0 },\n"); @@ -341,7 +351,7 @@ output_insn_data (void) const char *p = d->template_code; char prev = 0; - printf ("#if HAVE_DESIGNATED_INITIALIZERS\n"); + printf ("#if HAVE_DESIGNATED_UNION_INITIALIZERS\n"); printf (" { .single =\n"); printf ("#else\n"); printf (" {\n"); @@ -362,7 +372,7 @@ output_insn_data (void) ++p; } printf ("\",\n"); - printf ("#if HAVE_DESIGNATED_INITIALIZERS\n"); + printf ("#if HAVE_DESIGNATED_UNION_INITIALIZERS\n"); printf (" },\n"); printf ("#else\n"); printf (" 0, 0 },\n"); @@ -370,14 +380,14 @@ output_insn_data (void) } break; case INSN_OUTPUT_FORMAT_MULTI: - printf ("#if HAVE_DESIGNATED_INITIALIZERS\n"); + printf ("#if HAVE_DESIGNATED_UNION_INITIALIZERS\n"); printf (" { .multi = output_%d },\n", d->code_number); printf ("#else\n"); printf (" { 0, output_%d, 0 },\n", d->code_number); printf ("#endif\n"); break; case INSN_OUTPUT_FORMAT_FUNCTION: - printf ("#if HAVE_DESIGNATED_INITIALIZERS\n"); + printf ("#if HAVE_DESIGNATED_UNION_INITIALIZERS\n"); printf (" { .function = output_%d },\n", d->code_number); printf ("#else\n"); printf (" { 0, 0, output_%d },\n", d->code_number); @@ -393,6 +403,7 @@ output_insn_data (void) printf (" 0,\n"); printf (" &operand_data[%d],\n", d->operand_number); + printf (" %d,\n", d->n_generator_args); printf (" %d,\n", d->n_operands); printf (" %d,\n", d->n_dups); printf (" %d,\n", d->n_alternatives); @@ -417,16 +428,11 @@ output_get_insn_name (void) } -/* Stores in max_opno the largest operand number present in `part', if - that is larger than the previous value of max_opno, and the rest of - the operand data into `d->operand[i]'. +/* Stores the operand data into `d->operand[i]'. THIS_ADDRESS_P is nonzero if the containing rtx was an ADDRESS. THIS_STRICT_LOW is nonzero if the containing rtx was a STRICT_LOW_PART. */ -static int max_opno; -static int num_dups; - static void scan_operands (struct data *d, rtx part, int this_address_p, int this_strict_low) @@ -442,9 +448,7 @@ scan_operands (struct data *d, rtx part, int this_address_p, { case MATCH_OPERAND: opno = XINT (part, 0); - if (opno > max_opno) - max_opno = opno; - if (max_opno >= MAX_MAX_OPERANDS) + if (opno >= MAX_MAX_OPERANDS) { error_with_line (d->lineno, "maximum number of operands exceeded"); return; @@ -465,9 +469,7 @@ scan_operands (struct data *d, rtx part, int this_address_p, case MATCH_SCRATCH: opno = XINT (part, 0); - if (opno > max_opno) - max_opno = opno; - if (max_opno >= MAX_MAX_OPERANDS) + if (opno >= MAX_MAX_OPERANDS) { error_with_line (d->lineno, "maximum number of operands exceeded"); return; @@ -489,9 +491,7 @@ scan_operands (struct data *d, rtx part, int this_address_p, case MATCH_OPERATOR: case MATCH_PARALLEL: opno = XINT (part, 0); - if (opno > max_opno) - max_opno = opno; - if (max_opno >= MAX_MAX_OPERANDS) + if (opno >= MAX_MAX_OPERANDS) { error_with_line (d->lineno, "maximum number of operands exceeded"); return; @@ -510,12 +510,6 @@ scan_operands (struct data *d, rtx part, int this_address_p, scan_operands (d, XVECEXP (part, 2, i), 0, 0); return; - case MATCH_DUP: - case MATCH_OP_DUP: - case MATCH_PAR_DUP: - ++num_dups; - break; - case ADDRESS: scan_operands (d, XEXP (part, 0), 1, 0); return; @@ -830,6 +824,7 @@ validate_optab_operands (struct data *d) static void gen_insn (rtx insn, int lineno) { + struct pattern_stats stats; struct data *d = XNEW (struct data); int i; @@ -848,15 +843,15 @@ gen_insn (rtx insn, int lineno) *idata_end = d; idata_end = &d->next; - max_opno = -1; - num_dups = 0; memset (d->operand, 0, sizeof (d->operand)); for (i = 0; i < XVECLEN (insn, 1); i++) scan_operands (d, XVECEXP (insn, 1, i), 0, 0); - d->n_operands = max_opno + 1; - d->n_dups = num_dups; + get_pattern_stats (&stats, XVEC (insn, 1)); + d->n_generator_args = stats.num_generator_args; + d->n_operands = stats.num_insn_operands; + d->n_dups = stats.num_dups; #ifndef USE_MD_CONSTRAINTS check_constraint_len (); @@ -875,6 +870,7 @@ gen_insn (rtx insn, int lineno) static void gen_peephole (rtx peep, int lineno) { + struct pattern_stats stats; struct data *d = XNEW (struct data); int i; @@ -890,8 +886,6 @@ gen_peephole (rtx peep, int lineno) *idata_end = d; idata_end = &d->next; - max_opno = -1; - num_dups = 0; memset (d->operand, 0, sizeof (d->operand)); /* Get the number of operands by scanning all the patterns of the @@ -900,7 +894,9 @@ gen_peephole (rtx peep, int lineno) for (i = 0; i < XVECLEN (peep, 0); i++) scan_operands (d, XVECEXP (peep, 0, i), 0, 0); - d->n_operands = max_opno + 1; + get_pattern_stats (&stats, XVEC (peep, 0)); + d->n_generator_args = 0; + d->n_operands = stats.num_insn_operands; d->n_dups = 0; validate_insn_alternatives (d); @@ -914,6 +910,7 @@ gen_peephole (rtx peep, int lineno) static void gen_expand (rtx insn, int lineno) { + struct pattern_stats stats; struct data *d = XNEW (struct data); int i; @@ -932,8 +929,6 @@ gen_expand (rtx insn, int lineno) *idata_end = d; idata_end = &d->next; - max_opno = -1; - num_dups = 0; memset (d->operand, 0, sizeof (d->operand)); /* Scan the operands to get the specified predicates and modes, @@ -943,8 +938,10 @@ gen_expand (rtx insn, int lineno) for (i = 0; i < XVECLEN (insn, 1); i++) scan_operands (d, XVECEXP (insn, 1, i), 0, 0); - d->n_operands = max_opno + 1; - d->n_dups = num_dups; + get_pattern_stats (&stats, XVEC (insn, 1)); + d->n_generator_args = stats.num_generator_args; + d->n_operands = stats.num_insn_operands; + d->n_dups = stats.num_dups; d->template_code = 0; d->output_format = INSN_OUTPUT_FORMAT_NONE; @@ -959,6 +956,7 @@ gen_expand (rtx insn, int lineno) static void gen_split (rtx split, int lineno) { + struct pattern_stats stats; struct data *d = XNEW (struct data); int i; @@ -974,8 +972,6 @@ gen_split (rtx split, int lineno) *idata_end = d; idata_end = &d->next; - max_opno = -1; - num_dups = 0; memset (d->operand, 0, sizeof (d->operand)); /* Get the number of operands by scanning all the patterns of the @@ -984,7 +980,9 @@ gen_split (rtx split, int lineno) for (i = 0; i < XVECLEN (split, 0); i++) scan_operands (d, XVECEXP (split, 0, i), 0, 0); - d->n_operands = max_opno + 1; + get_pattern_stats (&stats, XVEC (split, 0)); + d->n_generator_args = 0; + d->n_operands = stats.num_insn_operands; d->n_dups = 0; d->n_alternatives = 0; d->template_code = 0; @@ -1002,7 +1000,7 @@ main (int argc, char **argv) progname = "genoutput"; - if (init_md_reader_args (argc, argv) != SUCCESS_EXIT_CODE) + if (!init_rtx_reader_args (argc, argv)) return (FATAL_EXIT_CODE); output_prologue ();