This second patch makes genoutput.c use the new get_pattern_stats function,
and adds the extra field to insn_data.
Bootstrapped & regression-tested on x86_64-linux-gnu. OK to install?
Richard
gcc/
* recog.h (insn_data_d): Add n_generator_args.
* genoutput.c (data): Likewise.
(output_insn_data): Print it.
(max_opno, num_dups): Delete.
(scan_operands): Just fill in "d->operand[...]".
(gen_insn, gen_peephole, gen_expand, gen_split): Use get_pattern_stats.
Index: gcc/recog.h
===================================================================
--- gcc/recog.h 2011-03-31 17:09:32.000000000 +0100
+++ gcc/recog.h 2011-03-31 17:10:38.000000000 +0100
@@ -302,6 +302,7 @@ struct insn_data_d
const insn_gen_fn genfun;
const struct insn_operand_data *const operand;
+ const char n_generator_args;
const char n_operands;
const char n_dups;
const char n_alternatives;
Index: gcc/genoutput.c
===================================================================
--- gcc/genoutput.c 2011-03-31 17:09:32.000000000 +0100
+++ gcc/genoutput.c 2011-03-31 17:11:47.000000000 +0100
@@ -162,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 */
@@ -402,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);
@@ -426,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)
@@ -451,9 +448,7 @@ scan_operands (struct data *d, rtx part,
{
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;
@@ -474,9 +469,7 @@ scan_operands (struct data *d, rtx part,
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;
@@ -498,9 +491,7 @@ scan_operands (struct data *d, rtx part,
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;
@@ -519,12 +510,6 @@ scan_operands (struct data *d, rtx part,
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;
@@ -839,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;
@@ -857,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 ();
@@ -884,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;
@@ -899,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
@@ -909,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);
@@ -923,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;
@@ -941,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,
@@ -952,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;
@@ -968,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;
@@ -983,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
@@ -993,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;
