+Wed Oct 13 20:35:16 1999 Richard Henderson <rth@cygnus.com>
+
+ * rtl.c (dump_and_abort): Remove.
+ (fatal_with_file_and_line): New.
+ (fatal_expected_char): New.
+ (read_rtx_lineno, read_rtx_filename): New.
+ (read_skip_spaces): Track line number.
+ (read_name): Use fatal_with_file_and_line.
+ (read_rtx): Use fatal_expected_char. Track line number.
+ * rtl.h (read_rtx_filename, read_rtx_lineno): Declare.
+
+ * print-rtl.c (print_rtx): Don't special case LABEL_REF argument
+ if it isn't a CODE_LABEL.
+
+ * genattr.c (main): Set read_rtx_filename.
+ * genattrtab.c (main): Likewise.
+ * gencodes.c (main): Likewise.
+ * genconfig.c (main): Likewise.
+ * genemit.c (main): Likewise.
+ * genextract.c (main): Likewise.
+ * genflags.c (main): Likewise.
+ * genopinit.c (main): Likewise.
+ * genoutput.c (main): Likewise.
+ * genpeep.c (main): Likewise.
+
+ * genrecog.c (decision_test.u.insn): Add `lineno'.
+ (pattern_lineno, error_count): New variables.
+ (message_with_line): New.
+ (add_to_sequence): Break out checking code to ...
+ (validate_pattern): ... here. Detect SET_DEST matching CONST_INT.
+ (merge_insn): Use message_with_line.
+ (make_insn_sequence): Use validate_pattern. Record insn lineno.
+ (main): Set read_rtx_filename, pattern_lineno. Exit early on error.
+
Wed Oct 13 22:01:35 1999 J"orn Rennecke <amylaar@cygnus.co.uk>
* expr.c (store_constructor): Clear union if constructor is empty.
perror (argv[1]);
return (FATAL_EXIT_CODE);
}
+ read_rtx_filename = argv[1];
printf ("/* Generated automatically by the program `genattr'\n\
from the machine description file `md'. */\n\n");
perror (argv[1]);
return (FATAL_EXIT_CODE);
}
+ read_rtx_filename = argv[1];
/* Set up true and false rtx's */
true_rtx = rtx_alloc (CONST_INT);
perror (argv[1]);
return (FATAL_EXIT_CODE);
}
+ read_rtx_filename = argv[1];
printf ("/* Generated automatically by the program `gencodes'\n\
from the machine description file `md'. */\n\n");
perror (argv[1]);
return (FATAL_EXIT_CODE);
}
+ read_rtx_filename = argv[1];
printf ("/* Generated automatically by the program `genconfig'\n\
from the machine description file `md'. */\n\n");
perror (argv[1]);
return (FATAL_EXIT_CODE);
}
+ read_rtx_filename = argv[1];
/* Assign sequential codes to all entries in the machine description
in parallel with the tables in insn-output.c. */
perror (argv[1]);
return (FATAL_EXIT_CODE);
}
+ read_rtx_filename = argv[1];
/* Assign sequential codes to all entries in the machine description
in parallel with the tables in insn-output.c. */
perror (argv[1]);
return (FATAL_EXIT_CODE);
}
+ read_rtx_filename = argv[1];
printf ("/* Generated automatically by the program `genflags'\n\
from the machine description file `md'. */\n\n");
perror (argv[1]);
return (FATAL_EXIT_CODE);
}
+ read_rtx_filename = argv[1];
printf ("/* Generated automatically by the program `genopinit'\n\
from the machine description file `md'. */\n\n");
perror (argv[1]);
return (FATAL_EXIT_CODE);
}
+ read_rtx_filename = argv[1];
output_prologue ();
next_code_number = 0;
perror (argv[1]);
return (FATAL_EXIT_CODE);
}
+ read_rtx_filename = argv[1];
printf ("/* Generated automatically by the program `genpeep'\n\
from the machine description file `md'. */\n\n");
struct {
int code_number; /* Insn number matched. */
+ int lineno; /* Line number of the insn. */
int num_clobbers_to_add; /* Number of CLOBBERs to be added. */
} insn;
} u;
allocate in each subroutine we make. */
static int max_depth;
+
+/* The line number of the start of the pattern currently being processed. */
+static int pattern_lineno;
+
+/* Count of errors. */
+static int error_count;
\f
/* This table contains a list of the rtl codes that can possibly match a
predicate defined in recog.c. The function `maybe_both_true' uses it to
PROTO((const char *, struct decision_head *));
static struct decision_test *new_decision_test
PROTO((enum decision_type, struct decision_test ***));
+static void validate_pattern
+ PROTO((rtx, int));
static struct decision *add_to_sequence
PROTO((rtx, struct decision_head *, const char *, enum routine_type, int));
extern void debug_decision
PROTO((struct decision *));
\f
+static void
+message_with_line VPROTO ((int lineno, const char *msg, ...))
+{
+#ifndef ANSI_PROTOTYPES
+ int lineno;
+ const char *msg;
+#endif
+ va_list ap;
+
+ VA_START (ap, msg);
+
+#ifndef ANSI_PROTOTYPES
+ lineno = va_arg (ap, int);
+ msg = va_arg (ap, const char *);
+#endif
+
+ fprintf (stderr, "%s:%d: ", read_rtx_filename, lineno);
+ vfprintf (stderr, msg, ap);
+ fputc ('\n', stderr);
+
+ va_end (ap);
+}
+\f
/* Create a new node in sequence after LAST. */
static struct decision *
return test;
}
+/* Check for various errors in patterns. */
+
+static void
+validate_pattern (pattern, set_dest)
+ rtx pattern;
+ int set_dest;
+{
+ const char *fmt;
+ RTX_CODE code;
+ int i, j, len;
+
+ code = GET_CODE (pattern);
+ switch (code)
+ {
+ case MATCH_SCRATCH:
+ case MATCH_INSN:
+ return;
+
+ case MATCH_OPERAND:
+ {
+ const char *pred_name = XSTR (pattern, 1);
+
+ if (pred_name[0] != 0)
+ {
+ /* See if we know about this predicate and save its number. If
+ we do, and it only accepts one code, note that fact. The
+ predicate `const_int_operand' only tests for a CONST_INT, so
+ if we do so we can avoid calling it at all.
+
+ Finally, if we know that the predicate does not allow
+ CONST_INT, we know that the only way the predicate can match
+ is if the modes match (here we use the kludge of relying on
+ the fact that "address_operand" accepts CONST_INT; otherwise,
+ it would have to be a special case), so we can test the mode
+ (but we need not). This fact should considerably simplify the
+ generated code. */
+
+ for (i = 0; i < (int) NUM_KNOWN_PREDS; i++)
+ if (! strcmp (preds[i].name, pred_name))
+ break;
+
+ if (i < (int) NUM_KNOWN_PREDS)
+ {
+ int j, allows_const_int;
+
+ allows_const_int = 0;
+ for (j = 0; preds[i].codes[j] != 0; j++)
+ if (preds[i].codes[j] == CONST_INT)
+ {
+ allows_const_int = 1;
+ break;
+ }
+
+ if (allows_const_int && set_dest)
+ {
+ message_with_line (pattern_lineno,
+ "warning: `%s' accepts const_int,",
+ pred_name);
+ message_with_line (pattern_lineno,
+ " and used as destination of a set");
+ }
+ }
+ else
+ {
+#ifdef PREDICATE_CODES
+ /* If the port has a list of the predicates it uses but
+ omits one, warn. */
+ message_with_line (pattern_lineno, "warning: `%s' not in PREDICATE_CODES", pred_name);
+#endif
+ }
+ }
+
+ return;
+ }
+
+ case SET:
+ /* The operands of a SET must have the same mode unless one
+ is VOIDmode. */
+ if (GET_MODE (SET_SRC (pattern)) != VOIDmode
+ && GET_MODE (SET_DEST (pattern)) != VOIDmode
+ && GET_MODE (SET_SRC (pattern)) != GET_MODE (SET_DEST (pattern))
+ /* The mode of an ADDRESS_OPERAND is the mode of the memory
+ reference, not the mode of the address. */
+ && ! (GET_CODE (SET_SRC (pattern)) == MATCH_OPERAND
+ && ! strcmp (XSTR (SET_SRC (pattern), 1), "address_operand")))
+ {
+ message_with_line (pattern_lineno,
+ "mode mismatch in set: %smode vs %smode",
+ GET_MODE_NAME (GET_MODE (SET_DEST (pattern))),
+ GET_MODE_NAME (GET_MODE (SET_SRC (pattern))));
+ error_count++;
+ }
+
+ validate_pattern (SET_DEST (pattern), 1);
+ validate_pattern (SET_SRC (pattern), 0);
+ return;
+
+ case LABEL_REF:
+ if (GET_MODE (XEXP (pattern, 0)) != VOIDmode)
+ {
+ message_with_line (pattern_lineno,
+ "operand to label_ref %smode not VOIDmode",
+ GET_MODE_NAME (GET_MODE (XEXP (pattern, 0))));
+ error_count++;
+ }
+ break;
+
+ default:
+ break;
+ }
+
+ fmt = GET_RTX_FORMAT (code);
+ len = GET_RTX_LENGTH (code);
+ for (i = 0; i < len; i++)
+ {
+ switch (fmt[i])
+ {
+ case 'e': case 'u':
+ validate_pattern (XEXP (pattern, i), 0);
+ break;
+
+ case 'E':
+ for (j = 0; j < XVECLEN (pattern, i); j++)
+ validate_pattern (XVECEXP (pattern, i, j), 0);
+ break;
+
+ case 'i': case 'w': case '0': case 's':
+ break;
+
+ default:
+ abort ();
+ }
+ }
+
+}
+
/* Create a chain of nodes to verify that an rtl expression matches
PATTERN.
}
}
else
- {
- test->u.pred.index = -1;
-#ifdef PREDICATE_CODES
- /* If the port has a list of the predicates it uses but
- omits one, warn. */
- fprintf (stderr, "Warning: `%s' not in PREDICATE_CODES\n",
- pred_name);
-#endif
- }
+ test->u.pred.index = -1;
}
/* Can't enforce a mode if we allow const_int. */
pattern = XEXP (pattern, 0);
goto restart;
- case SET:
- /* The operands of a SET must have the same mode unless one
- is VOIDmode. */
- if (GET_MODE (SET_SRC (pattern)) != VOIDmode
- && GET_MODE (SET_DEST (pattern)) != VOIDmode
- && GET_MODE (SET_SRC (pattern)) != GET_MODE (SET_DEST (pattern))
- /* The mode of an ADDRESS_OPERAND is the mode of the memory
- reference, not the mode of the address. */
- && ! (GET_CODE (SET_SRC (pattern)) == MATCH_OPERAND
- && ! strcmp (XSTR (SET_SRC (pattern), 1), "address_operand")))
- {
- print_rtl (stderr, pattern);
- fputc ('\n', stderr);
- fatal ("mode mismatch in SET");
- }
- break;
-
- case LABEL_REF:
- if (GET_MODE (XEXP (pattern, 0)) != VOIDmode)
- {
- print_rtl (stderr, pattern);
- fputc ('\n', stderr);
- fatal ("operand to LABEL_REF not VOIDmode");
- }
- break;
-
default:
break;
}
}
else
{
- fatal ("Two actions at one point in tree for insns \"%s\" (%d) and \"%s\" (%d)",
- get_insn_name (old->u.insn.code_number),
- old->u.insn.code_number,
- get_insn_name (add->u.insn.code_number),
- add->u.insn.code_number);
+ message_with_line (add->u.insn.lineno, "`%s' matches `%s'",
+ get_insn_name (add->u.insn.code_number),
+ get_insn_name (old->u.insn.code_number));
+ message_with_line (old->u.insn.lineno, "previous definition of `%s'",
+ get_insn_name (old->u.insn.code_number));
+ error_count++;
}
}
PUT_MODE (x, VOIDmode);
}
+ validate_pattern (x, 0);
+
memset(&head, 0, sizeof(head));
last = add_to_sequence (x, &head, "", type, 1);
test = new_decision_test (DT_accept_insn, &place);
test->u.insn.code_number = next_insn_code;
+ test->u.insn.lineno = pattern_lineno;
test->u.insn.num_clobbers_to_add = 0;
switch (type)
test = new_decision_test (DT_accept_insn, &place);
test->u.insn.code_number = next_insn_code;
+ test->u.insn.lineno = pattern_lineno;
test->u.insn.num_clobbers_to_add = XVECLEN (x, 0) - i;
merge_trees (&head, &clobber_head);
perror (argv[1]);
return FATAL_EXIT_CODE;
}
+ read_rtx_filename = argv[1];
next_insn_code = 0;
next_index = 0;
if (c == EOF)
break;
ungetc (c, infile);
+ pattern_lineno = read_rtx_lineno;
desc = read_rtx (infile);
if (GET_CODE (desc) == DEFINE_INSN)
next_index++;
}
+ if (error_count)
+ return FATAL_EXIT_CODE;
+
puts ("\n\n");
process_tree (&recog_tree, RECOG);
break;
case 'e':
+ do_e:
indent += 2;
if (!sawclose)
fprintf (outfile, " ");
case 'u':
if (XEXP (in_rtx, i) != NULL)
{
+ if (GET_CODE (XEXP (in_rtx, i)) != CODE_LABEL)
+ goto do_e;
+
if (flag_dump_unnumbered)
fputc ('#', outfile);
else
"REG_FRAME_RELATED_EXPR", "REG_EH_REGION",
"REG_EH_RETHROW", "REG_SAVE_NOTE" };
-static void dump_and_abort PROTO((int, int, FILE *)) ATTRIBUTE_NORETURN;
+static void fatal_with_file_and_line PVPROTO((FILE *, const char *, ...))
+ ATTRIBUTE_NORETURN;
+static void fatal_expected_char PROTO((FILE *, int, int)) ATTRIBUTE_NORETURN;
static void read_name PROTO((char *, FILE *));
static const char *trim_filename PROTO((const char *));
\f
\f
/* Subroutines of read_rtx. */
-/* Dump code after printing a message. Used when read_rtx finds
- invalid data. */
+/* The current line number for the file. */
+int read_rtx_lineno = 1;
+
+/* The filename for aborting with file and line. */
+const char *read_rtx_filename = "<unknown>";
static void
-dump_and_abort (expected_c, actual_c, infile)
- int expected_c, actual_c;
- FILE *infile;
+fatal_with_file_and_line VPROTO((FILE *infile, const char *msg, ...))
{
- int c, i;
-
- if (expected_c >= 0)
- fprintf (stderr,
- "Expected character %c. Found character %c.",
- expected_c, actual_c);
- fprintf (stderr, " At file position: %ld\n", ftell (infile));
- fprintf (stderr, "Following characters are:\n\t");
- for (i = 0; i < 200; i++)
+#ifndef ANSI_PROTOTYPES
+ FILE *infile;
+ const char *msg;
+#endif
+ va_list ap;
+ char context[64];
+ size_t i;
+ int c;
+
+ VA_START (ap, msg);
+
+#ifndef ANSI_PROTOTYPES
+ infile = va_arg (ap, FILE *);
+ msg = va_arg (ap, const char *);
+#endif
+
+ fprintf (stderr, "%s:%d: ", read_rtx_filename, read_rtx_lineno);
+ vfprintf (stderr, msg, ap);
+ putc ('\n', stderr);
+
+ /* Gather some following context. */
+ for (i = 0; i < sizeof(context)-1; ++i)
{
c = getc (infile);
- if (EOF == c) break;
- putc (c, stderr);
+ if (c == EOF)
+ break;
+ if (c == '\r' || c == '\n')
+ break;
+ context[i] = c;
}
- fprintf (stderr, "Aborting.\n");
- abort ();
+ context[i] = '\0';
+
+ fprintf (stderr, "%s:%d: following context is `%s'\n",
+ read_rtx_filename, read_rtx_lineno, context);
+
+ va_end (ap);
+ exit (1);
+}
+
+/* Dump code after printing a message. Used when read_rtx finds
+ invalid data. */
+
+static void
+fatal_expected_char (infile, expected_c, actual_c)
+ FILE *infile;
+ int expected_c, actual_c;
+{
+ fatal_with_file_and_line (infile, "expected character `%c', found `%c'",
+ expected_c, actual_c);
}
/* Read chars from INFILE until a non-whitespace char
FILE *infile;
{
register int c;
- while ((c = getc (infile)))
+ while (1)
{
- if (c == ' ' || c == '\n' || c == '\t' || c == '\f')
- ;
- else if (c == ';')
- {
- while ((c = getc (infile)) && c != '\n' && c != EOF)
- ;
- }
- else if (c == '/')
+ c = getc (infile);
+ switch (c)
{
- register int prevc;
- c = getc (infile);
- if (c != '*')
- dump_and_abort ('*', c, infile);
+ case '\n':
+ read_rtx_lineno++;
+ break;
+
+ case ' ': case '\t': case '\f': case '\r':
+ break;
+
+ case ';':
+ do
+ c = getc (infile);
+ while (c != '\n' && c != EOF);
+ read_rtx_lineno++;
+ break;
+
+ case '/':
+ {
+ register int prevc;
+ c = getc (infile);
+ if (c != '*')
+ fatal_expected_char (infile, '*', c);
- prevc = 0;
- while ((c = getc (infile)) && c != EOF)
- {
- if (prevc == '*' && c == '/')
- break;
- prevc = c;
- }
+ prevc = 0;
+ while ((c = getc (infile)) && c != EOF)
+ {
+ if (c == '\n')
+ read_rtx_lineno++;
+ else if (prevc == '*' && c == '/')
+ break;
+ prevc = c;
+ }
+ }
+ break;
+
+ default:
+ return c;
}
- else break;
}
- return c;
}
/* Read an rtx code name into the buffer STR[].
c = getc (infile);
}
if (p == str)
- {
- fprintf (stderr, "missing name or number");
- dump_and_abort (-1, -1, infile);
- }
+ fatal_with_file_and_line (infile, "missing name or number");
+ if (c == '\n')
+ read_rtx_lineno++;
*p = 0;
}
struct rtx_list
{
struct rtx_list *next;
- rtx value; /* Value of this node... */
+ rtx value; /* Value of this node. */
};
c = read_skip_spaces (infile); /* Should be open paren. */
if (c != '(')
- dump_and_abort ('(', c, infile);
+ fatal_expected_char (infile, '(', c);
read_name (tmp_char, infile);
c = read_skip_spaces (infile);
if (c != '[')
- dump_and_abort ('[', c, infile);
+ fatal_expected_char (infile, '[', c);
/* add expressions to a list, while keeping a count */
next_rtx = NULL;
c = read_skip_spaces (infile);
}
if (c != '"')
- dump_and_abort ('"', c, infile);
+ fatal_expected_char (infile, '"', c);
while (1)
{
c = getc (infile); /* Read the string */
+ if (c == '\n')
+ read_rtx_lineno++;
if (c == '\\')
{
c = getc (infile); /* Read the string */
{
c = read_skip_spaces (infile);
if (c != ')')
- dump_and_abort (')', c, infile);
+ fatal_expected_char (infile, ')', c);
}
XSTR (return_rtx, i) = stringbuf;
}
c = read_skip_spaces (infile);
if (c != ')')
- dump_and_abort (')', c, infile);
+ fatal_expected_char (infile, ')', c);
return return_rtx;
}
enum machine_mode, ...));
extern rtvec gen_rtvec PVPROTO((int, ...));
-#ifdef BUFSIZ
-extern rtx read_rtx PROTO((FILE *));
-#endif
-
extern char *oballoc PROTO((int));
extern char *permalloc PROTO((int));
extern rtx rtx_alloc PROTO((RTX_CODE));
extern void pop_obstacks PROTO ((void));
extern void push_obstacks PROTO ((struct obstack *,
struct obstack *));
-#ifdef BUFSIZ
-extern int read_skip_spaces PROTO ((FILE *));
-#endif
-
/* In cse.c */
struct cse_basic_block_data;
extern int rtx_cost PROTO ((rtx, enum rtx_code));
HOST_WIDE_INT *));
/* In calls.c */
-/* Emit library call. */
extern void emit_library_call PVPROTO ((rtx, int, enum machine_mode,
int, ...));
extern rtx emit_library_call_value PVPROTO((rtx, rtx, int,
extern void init_rtl PROTO ((void));
extern void rtx_free PROTO ((rtx));
+#ifdef BUFSIZ
+extern int read_skip_spaces PROTO ((FILE *));
+extern rtx read_rtx PROTO ((FILE *));
+#endif
+
+extern const char *read_rtx_filename;
+extern int read_rtx_lineno;
+
/* Redefine abort to report an internal error w/o coredump, and
reporting the location of the error in the source file. This logic
is duplicated in rtl.h and tree.h because every file that needs the
OSDN Git Service
