gensupport.c (init_md_reader_args_cb): Renamed from init_md_reader_args.

	* gensupport.c (init_md_reader_args_cb): Renamed from
	init_md_reader_args.  Add third option, callback function for
	parsing program-specific options.  Add diagnosis of incorrect
	number of input files.
	(init_md_reader): Fold into init_md_reader_args_cb.
	(init_md_reader_args): Now a thin wrapper around
	init_md_reader_args_cb.
	* gensupport.h: Update prototypes.

	* genattr.c, genattrtab.c, gencodes.c, genconfig.c, genemit.c
	* genextract.c, genflags.c, genopinit.c, genoutput.c, genpeep.c
	* genrecog.c: No need to diagnose lack of an input file;
	init_md_reader_args will handle it.
	* genconditions.c: Likewise, and use init_md_reader_args.
	* genconstants.c: Likewise, and no need to call read_md_rtx.

From-SVN: r85511

1 files changed, 3 insertions, 15 deletions

diff --git a/gcc/genconstants.c b/gcc/genconstants.c
index a4daa22027a..fcebc4439ca 100644
--- a/gcc/genconstants.c
+++ b/gcc/genconstants.c
@@ -34,8 +34,6 @@ Boston, MA 02111-1307, USA.  */
 #include "errors.h"
 #include "gensupport.h"
 
-static int print_md_constant (void **, void *);
-
 /* Called via traverse_md_constants; emit a #define for
    the current constant definition.  */
 
@@ -52,22 +50,13 @@ print_md_constant (void **slot, void *info)
 int
 main (int argc, char **argv)
 {
-  int dummy1, dummy2;
-  rtx desc;
-
   progname = "genconstants";
 
-  if (argc <= 1)
-    fatal ("no input file name");
-
-  if (init_md_reader (argv[1]) != SUCCESS_EXIT_CODE)
+  if (init_md_reader_args (argc, argv) != SUCCESS_EXIT_CODE)
     return (FATAL_EXIT_CODE);
 
-  /* Scan and discard the entire file.  This has the side effect
-     of loading up the constants table that we wish to scan.  */
-  do
-    desc = read_md_rtx (&dummy1, &dummy2);
-  while (desc);
+  /* Initializing the MD reader has the side effect of loading up
+     the constants table that we wish to scan.  */
 
   puts ("/* Generated automatically by the program `genconstants'");
   puts ("   from the machine description file `md'.  */\n");
@@ -83,4 +72,3 @@ main (int argc, char **argv)
 
   return SUCCESS_EXIT_CODE;
 }
-