From bb933490c3e9c3347c1566662688c6cafa6768e5 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Thu, 10 Jun 2010 20:21:59 +0000 Subject: Makefile.in (build/read-md.o): Depend on errors.h. gcc/ * Makefile.in (build/read-md.o): Depend on errors.h. * read-md.h (error_with_line): Declare. * read-md.c: Include errors.h. (message_with_line_1): New function, extracted from... (message_with_line): ...here. (error_with_line): New function. * genattrtab.c: If a call to message_with_line is followed by "have_error = 1;", replace both statements with a call to error_with_line. * genoutput.c: Likewise. * genpreds.c: Likewise. * genrecog.c: If a call to message_with_line is followed by "error_count++;", replace both statements with a call to error_with_line. (errorcount): Delete. (main): Don't check it. * gensupport.c: If a call to message_with_line is followed by "errors = 1;", replace both statements with a call to error_with_line. (errors): Delete. (process_define_cond_exec): Check have_error instead of errors. (init_md_reader_args_cb): Likewise. Don't set errors. From-SVN: r160573 --- gcc/genoutput.c | 101 ++++++++++++++++++++------------------------------------ 1 file changed, 35 insertions(+), 66 deletions(-) (limited to 'gcc/genoutput.c') diff --git a/gcc/genoutput.c b/gcc/genoutput.c index a3ecae40dc3..c3ce33db65b 100644 --- a/gcc/genoutput.c +++ b/gcc/genoutput.c @@ -446,17 +446,11 @@ scan_operands (struct data *d, rtx part, int this_address_p, max_opno = opno; if (max_opno >= MAX_MAX_OPERANDS) { - message_with_line (d->lineno, - "maximum number of operands exceeded"); - have_error = 1; + error_with_line (d->lineno, "maximum number of operands exceeded"); return; } if (d->operand[opno].seen) - { - message_with_line (d->lineno, - "repeated operand number %d\n", opno); - have_error = 1; - } + error_with_line (d->lineno, "repeated operand number %d\n", opno); d->operand[opno].seen = 1; d->operand[opno].mode = GET_MODE (part); @@ -475,17 +469,11 @@ scan_operands (struct data *d, rtx part, int this_address_p, max_opno = opno; if (max_opno >= MAX_MAX_OPERANDS) { - message_with_line (d->lineno, - "maximum number of operands exceeded"); - have_error = 1; + error_with_line (d->lineno, "maximum number of operands exceeded"); return; } if (d->operand[opno].seen) - { - message_with_line (d->lineno, - "repeated operand number %d\n", opno); - have_error = 1; - } + error_with_line (d->lineno, "repeated operand number %d\n", opno); d->operand[opno].seen = 1; d->operand[opno].mode = GET_MODE (part); @@ -505,17 +493,11 @@ scan_operands (struct data *d, rtx part, int this_address_p, max_opno = opno; if (max_opno >= MAX_MAX_OPERANDS) { - message_with_line (d->lineno, - "maximum number of operands exceeded"); - have_error = 1; + error_with_line (d->lineno, "maximum number of operands exceeded"); return; } if (d->operand[opno].seen) - { - message_with_line (d->lineno, - "repeated operand number %d\n", opno); - have_error = 1; - } + error_with_line (d->lineno, "repeated operand number %d\n", opno); d->operand[opno].seen = 1; d->operand[opno].mode = GET_MODE (part); @@ -717,11 +699,8 @@ process_template (struct data *d, const char *template_code) message_with_line (d->lineno, "'@' is redundant for output template with single alternative"); if (i != d->n_alternatives) - { - message_with_line (d->lineno, - "wrong number of alternatives in the output template"); - have_error = 1; - } + error_with_line (d->lineno, + "wrong number of alternatives in the output template"); printf ("};\n"); } @@ -770,11 +749,11 @@ validate_insn_alternatives (struct data *d) if (len < 1 || (len > 1 && strchr (",#*+=&%!0123456789", c))) { - message_with_line (d->lineno, - "invalid length %d for char '%c' in alternative %d of operand %d", - len, c, which_alternative, start); + error_with_line (d->lineno, + "invalid length %d for char '%c' in" + " alternative %d of operand %d", + len, c, which_alternative, start); len = 1; - have_error = 1; } #endif @@ -787,30 +766,28 @@ validate_insn_alternatives (struct data *d) for (i = 1; i < len; i++) if (p[i] == '\0') { - message_with_line (d->lineno, - "NUL in alternative %d of operand %d", - which_alternative, start); + error_with_line (d->lineno, + "NUL in alternative %d of operand %d", + which_alternative, start); alternative_count_unsure = 1; break; } else if (strchr (",#*", p[i])) { - message_with_line (d->lineno, - "'%c' in alternative %d of operand %d", - p[i], which_alternative, start); + error_with_line (d->lineno, + "'%c' in alternative %d of operand %d", + p[i], which_alternative, start); alternative_count_unsure = 1; } } - if (alternative_count_unsure) - have_error = 1; - else if (n == 0) - n = d->operand[start].n_alternatives; - else if (n != d->operand[start].n_alternatives) + if (!alternative_count_unsure) { - message_with_line (d->lineno, + if (n == 0) + n = d->operand[start].n_alternatives; + else if (n != d->operand[start].n_alternatives) + error_with_line (d->lineno, "wrong number of alternatives in operand %d", start); - have_error = 1; } } @@ -827,10 +804,7 @@ validate_insn_operands (struct data *d) for (i = 0; i < d->n_operands; ++i) if (d->operand[i].seen == 0) - { - message_with_line (d->lineno, "missing operand %d", i); - have_error = 1; - } + error_with_line (d->lineno, "missing operand %d", i); } static void @@ -1148,13 +1122,12 @@ note_constraint (rtx exp, int lineno) if (strchr (indep_constraints, name[0]) && name[0] != 'm') { if (name[1] == '\0') - message_with_line (lineno, "constraint letter '%s' cannot be " - "redefined by the machine description", name); + error_with_line (lineno, "constraint letter '%s' cannot be " + "redefined by the machine description", name); else - message_with_line (lineno, "constraint name '%s' cannot be defined by " - "the machine description, as it begins with '%c'", - name, name[0]); - have_error = 1; + error_with_line (lineno, "constraint name '%s' cannot be defined by " + "the machine description, as it begins with '%c'", + name, name[0]); return; } @@ -1171,25 +1144,22 @@ note_constraint (rtx exp, int lineno) if (!strcmp ((*iter)->name, name)) { - message_with_line (lineno, "redefinition of constraint '%s'", name); + error_with_line (lineno, "redefinition of constraint '%s'", name); message_with_line ((*iter)->lineno, "previous definition is here"); - have_error = 1; return; } else if (!strncmp ((*iter)->name, name, (*iter)->namelen)) { - message_with_line (lineno, "defining constraint '%s' here", name); + error_with_line (lineno, "defining constraint '%s' here", name); message_with_line ((*iter)->lineno, "renders constraint '%s' " "(defined here) a prefix", (*iter)->name); - have_error = 1; return; } else if (!strncmp ((*iter)->name, name, namelen)) { - message_with_line (lineno, "constraint '%s' is a prefix", name); + error_with_line (lineno, "constraint '%s' is a prefix", name); message_with_line ((*iter)->lineno, "of constraint '%s' " "(defined here)", (*iter)->name); - have_error = 1; return; } } @@ -1217,11 +1187,10 @@ mdep_constraint_len (const char *s, int lineno, int opno) if (!strncmp (s, p->name, p->namelen)) return p->namelen; - message_with_line (lineno, - "error: undefined machine-specific constraint " - "at this point: \"%s\"", s); + error_with_line (lineno, + "error: undefined machine-specific constraint " + "at this point: \"%s\"", s); message_with_line (lineno, "note: in operand %d", opno); - have_error = 1; return 1; /* safe */ } -- cgit v1.2.1