From 1a97be37b9acd218052a467f7b1a26d3be1154f9 Mon Sep 17 00:00:00 2001 From: aj Date: Sun, 1 Jun 2003 15:59:10 +0000 Subject: * genrecog.c: Use ISO C90 prototypes. (nodes_identical): Correct declaration to match prototype. (maybe_both_true): Likewise. (merge_trees): Likewise. * genpeep.c (gen_peephole): Remove #if 0 code. Use ISO C90 prototypes. * genattrtab.c (copy_rtx_unchanging): Remove #if 0'ed code. Remove #if 0'ed function simplify_by_alternatives. (optimize_attrs): Remove #if 0'ed code. Remove ^L. Use ISO C90 prototypes. (make_canonical): Remove #if 0'ed code. (convert_const_symbol_ref): Remove #if 0'ed function. * gen-protos.c (main): Check for argument. * rtl.h: Use ISO C90 prototypes for functions from lists.c. * params.h: Use ISO C90 prototypes. * params.c: Likewise. * intl.c: Likewise. * intl.h: Likewise. * lists.c: Likewise. * errors.c: Likewise. * errors.h: Likewise. * gencodes.c: Likewise. * genpreds.c: Likewise. * genattr.c: Likewise. * gen-protos.c: Likewise. * genflags.c: Likewise * genconditions.c: Likewise. * genautomata.c: Likewise. * gencheck.c: Likewise. * genconfig.c: Likewise. * genconstants.c: Likewise. * genemit.c: Likewise. * genextract.c: Likewise. * gengenrtl.c: Likewise. * gengtype.c: Likewise. * gengtype.h: Likewise. * genopinit.c: Likewise. * genoutput.c: Likewise. * gensupport.c: Likewise. * gensupport.h: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67296 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/genattr.c | 125 ++++++++++++++++++++++++++-------------------------------- 1 file changed, 55 insertions(+), 70 deletions(-) (limited to 'gcc/genattr.c') diff --git a/gcc/genattr.c b/gcc/genattr.c index 9f512a7ce9f..9914384da38 100644 --- a/gcc/genattr.c +++ b/gcc/genattr.c @@ -1,5 +1,6 @@ /* Generate attribute information (insn-attr.h) from machine description. - Copyright (C) 1991, 1994, 1996, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1991, 1994, 1996, 1998, 1999, 2000, 2003 + Free Software Foundation, Inc. Contributed by Richard Kenner (kenner@vlsi1.ultra.nyu.edu) This file is part of GCC. @@ -51,52 +52,46 @@ struct function_unit struct range issue_delay; /* Range of issue delay values. */ }; -static void extend_range PARAMS ((struct range *, int, int)); -static void init_range PARAMS ((struct range *)); -static void write_upcase PARAMS ((const char *)); -static void gen_attr PARAMS ((rtx)); -static void write_units PARAMS ((int, struct range *, struct range *, - struct range *, struct range *, - struct range *)); +static void extend_range (struct range *, int, int); +static void init_range (struct range *); +static void write_upcase (const char *); +static void gen_attr (rtx); +static void write_units (int, struct range *, struct range *, + struct range *, struct range *, + struct range *); static void -extend_range (range, min, max) - struct range *range; - int min; - int max; +extend_range (struct range *range, int min, int max) { if (range->min > min) range->min = min; if (range->max < max) range->max = max; } static void -init_range (range) - struct range *range; +init_range (struct range *range) { range->min = 100000; range->max = -1; } static void -write_upcase (str) - const char *str; +write_upcase (const char *str) { for (; *str; str++) putchar (TOUPPER(*str)); } static void -gen_attr (attr) - rtx attr; +gen_attr (rtx attr) { const char *p, *tag; - int is_const = GET_CODE (XEXP (attr, 2)) == CONST; + int is_const = GET_CODE (XEXP (attr, 2)) == CONST; printf ("#define HAVE_ATTR_%s\n", XSTR (attr, 0)); /* If numeric attribute, don't need to write an enum. */ p = XSTR (attr, 1); if (*p == '\0') - printf ("extern int get_attr_%s PARAMS ((%s));\n", XSTR (attr, 0), + printf ("extern int get_attr_%s (%s);\n", XSTR (attr, 0), (is_const ? "void" : "rtx")); else { @@ -113,7 +108,7 @@ gen_attr (attr) } fputs ("};\n", stdout); - printf ("extern enum attr_%s get_attr_%s PARAMS ((%s));\n\n", + printf ("extern enum attr_%s get_attr_%s (%s);\n\n", XSTR (attr, 0), XSTR (attr, 0), (is_const ? "void" : "rtx")); } @@ -122,29 +117,24 @@ gen_attr (attr) if (! strcmp (XSTR (attr, 0), "length")) { puts ("\ -extern void shorten_branches PARAMS ((rtx));\n\ -extern int insn_default_length PARAMS ((rtx));\n\ -extern int insn_variable_length_p PARAMS ((rtx));\n\ -extern int insn_current_length PARAMS ((rtx));\n\n\ +extern void shorten_branches (rtx);\n\ +extern int insn_default_length (rtx);\n\ +extern int insn_variable_length_p (rtx);\n\ +extern int insn_current_length (rtx);\n\n\ #include \"insn-addr.h\"\n"); } } static void -write_units (num_units, multiplicity, simultaneity, - ready_cost, issue_delay, blockage) - int num_units; - struct range *multiplicity; - struct range *simultaneity; - struct range *ready_cost; - struct range *issue_delay; - struct range *blockage; +write_units (int num_units, struct range *multiplicity, struct range *simultaneity, + struct range *ready_cost, struct range *issue_delay, + struct range *blockage) { int i, q_size; printf ("#define INSN_SCHEDULING\n\n"); - printf ("extern int result_ready_cost PARAMS ((rtx));\n"); - printf ("extern int function_units_used PARAMS ((rtx));\n\n"); + printf ("extern int result_ready_cost (rtx);\n"); + printf ("extern int function_units_used (rtx);\n\n"); printf ("extern const struct function_unit_desc\n"); printf ("{\n"); printf (" const char *const name;\n"); @@ -153,11 +143,11 @@ write_units (num_units, multiplicity, simultaneity, printf (" const int simultaneity;\n"); printf (" const int default_cost;\n"); printf (" const int max_issue_delay;\n"); - printf (" int (*const ready_cost_function) PARAMS ((rtx));\n"); - printf (" int (*const conflict_cost_function) PARAMS ((rtx, rtx));\n"); + printf (" int (*const ready_cost_function) (rtx);\n"); + printf (" int (*const conflict_cost_function) (rtx, rtx);\n"); printf (" const int max_blockage;\n"); - printf (" unsigned int (*const blockage_range_function) PARAMS ((rtx));\n"); - printf (" int (*const blockage_function) PARAMS ((rtx, rtx));\n"); + printf (" unsigned int (*const blockage_range_function) (rtx);\n"); + printf (" int (*const blockage_function) (rtx, rtx);\n"); printf ("} function_units[];\n\n"); printf ("#define FUNCTION_UNITS_SIZE %d\n", num_units); printf ("#define MIN_MULTIPLICITY %d\n", multiplicity->min); @@ -182,12 +172,8 @@ write_units (num_units, multiplicity, simultaneity, printf ("#define INSN_QUEUE_SIZE %d\n", q_size); } -extern int main PARAMS ((int, char **)); - int -main (argc, argv) - int argc; - char **argv; +main (int argc, char **argv) { rtx desc; int have_delay = 0; @@ -224,7 +210,7 @@ main (argc, argv) puts ("#define HAVE_ATTR_alternative"); puts ("#define get_attr_alternative(insn) which_alternative"); - + /* Read the machine description. */ while (1) @@ -243,9 +229,9 @@ main (argc, argv) if (! have_delay) { printf ("#define DELAY_SLOTS\n"); - printf ("extern int num_delay_slots PARAMS ((rtx));\n"); - printf ("extern int eligible_for_delay PARAMS ((rtx, int, rtx, int));\n\n"); - printf ("extern int const_num_delay_slots PARAMS ((rtx));\n\n"); + printf ("extern int num_delay_slots (rtx);\n"); + printf ("extern int eligible_for_delay (rtx, int, rtx, int);\n\n"); + printf ("extern int const_num_delay_slots (rtx);\n\n"); have_delay = 1; } @@ -254,14 +240,14 @@ main (argc, argv) if (XVECEXP (desc, 1, i + 1) && ! have_annul_true) { printf ("#define ANNUL_IFTRUE_SLOTS\n"); - printf ("extern int eligible_for_annul_true PARAMS ((rtx, int, rtx, int));\n"); + printf ("extern int eligible_for_annul_true (rtx, int, rtx, int);\n"); have_annul_true = 1; } if (XVECEXP (desc, 1, i + 2) && ! have_annul_false) { printf ("#define ANNUL_IFFALSE_SLOTS\n"); - printf ("extern int eligible_for_annul_false PARAMS ((rtx, int, rtx, int));\n"); + printf ("extern int eligible_for_annul_false (rtx, int, rtx, int);\n"); have_annul_false = 1; } } @@ -379,19 +365,19 @@ main (argc, argv) printf (" same processor cycle. */\n"); printf ("#define MAX_DFA_ISSUE_RATE max_dfa_issue_rate\n\n"); printf ("/* Insn latency time defined in define_insn_reservation. */\n"); - printf ("extern int insn_default_latency PARAMS ((rtx));\n\n"); + printf ("extern int insn_default_latency (rtx);\n\n"); printf ("/* Return nonzero if there is a bypass for given insn\n"); printf (" which is a data producer. */\n"); - printf ("extern int bypass_p PARAMS ((rtx));\n\n"); + printf ("extern int bypass_p (rtx);\n\n"); printf ("/* Insn latency time on data consumed by the 2nd insn.\n"); printf (" Use the function if bypass_p returns nonzero for\n"); printf (" the 1st insn. */\n"); - printf ("extern int insn_latency PARAMS ((rtx, rtx));\n\n"); + printf ("extern int insn_latency (rtx, rtx);\n\n"); printf ("\n#if AUTOMATON_ALTS\n"); printf ("/* The following function returns number of alternative\n"); printf (" reservations of given insn. It may be used for better\n"); printf (" insns scheduling heuristics. */\n"); - printf ("extern int insn_alts PARAMS ((rtx));\n\n"); + printf ("extern int insn_alts (rtx);\n\n"); printf ("#endif\n\n"); printf ("/* Maximal possible number of insns waiting results being\n"); printf (" produced by insns whose execution is not finished. */\n"); @@ -399,10 +385,10 @@ main (argc, argv) printf ("/* Pointer to data describing current state of DFA. */\n"); printf ("typedef void *state_t;\n\n"); printf ("/* Size of the data in bytes. */\n"); - printf ("extern int state_size PARAMS ((void));\n\n"); + printf ("extern int state_size (void);\n\n"); printf ("/* Initiate given DFA state, i.e. Set up the state\n"); printf (" as all functional units were not reserved. */\n"); - printf ("extern void state_reset PARAMS ((state_t));\n"); + printf ("extern void state_reset (state_t);\n"); printf ("/* The following function returns negative value if given\n"); printf (" insn can be issued in processor state described by given\n"); printf (" DFA state. In this case, the DFA state is changed to\n"); @@ -412,7 +398,7 @@ main (argc, argv) printf (" for superscalar or VLIW processors. If the second\n"); printf (" parameter is NULL the function changes given DFA state\n"); printf (" as new processor cycle started. */\n"); - printf ("extern int state_transition PARAMS ((state_t, rtx));\n"); + printf ("extern int state_transition (state_t, rtx);\n"); printf ("\n#if AUTOMATON_STATE_ALTS\n"); printf ("/* The following function returns number of possible\n"); printf (" alternative reservations of given insn in given\n"); @@ -420,12 +406,12 @@ main (argc, argv) printf (" heuristics. By default the function is defined if\n"); printf (" macro AUTOMATON_STATE_ALTS is defined because its\n"); printf (" implementation may require much memory. */\n"); - printf ("extern int state_alts PARAMS ((state_t, rtx));\n"); + printf ("extern int state_alts (state_t, rtx);\n"); printf ("#endif\n\n"); - printf ("extern int min_issue_delay PARAMS ((state_t, rtx));\n"); + printf ("extern int min_issue_delay (state_t, rtx);\n"); printf ("/* The following function returns nonzero if no one insn\n"); printf (" can be issued in current DFA state. */\n"); - printf ("extern int state_dead_lock_p PARAMS ((state_t));\n"); + printf ("extern int state_dead_lock_p (state_t);\n"); printf ("/* The function returns minimal delay of issue of the 2nd\n"); printf (" insn after issuing the 1st insn in given DFA state.\n"); printf (" The 1st insn should be issued in given state (i.e.\n"); @@ -433,30 +419,30 @@ main (argc, argv) printf (" the insn and the state). Data dependencies between\n"); printf (" the insns are ignored by the function. */\n"); printf - ("extern int min_insn_conflict_delay PARAMS ((state_t, rtx, rtx));\n"); + ("extern int min_insn_conflict_delay (state_t, rtx, rtx);\n"); printf ("/* The following function outputs reservations for given\n"); printf (" insn as they are described in the corresponding\n"); printf (" define_insn_reservation. */\n"); - printf ("extern void print_reservation PARAMS ((FILE *, rtx));\n"); + printf ("extern void print_reservation (FILE *, rtx);\n"); printf ("\n#if CPU_UNITS_QUERY\n"); printf ("/* The following function returns code of functional unit\n"); printf (" with given name (see define_cpu_unit). */\n"); - printf ("extern int get_cpu_unit_code PARAMS ((const char *));\n"); + printf ("extern int get_cpu_unit_code (const char *);\n"); printf ("/* The following function returns nonzero if functional\n"); printf (" unit with given code is currently reserved in given\n"); printf (" DFA state. */\n"); - printf ("extern int cpu_unit_reservation_p PARAMS ((state_t, int));\n"); + printf ("extern int cpu_unit_reservation_p (state_t, int);\n"); printf ("#endif\n\n"); printf ("/* Clean insn code cache. It should be called if there\n"); printf (" is a chance that condition value in a\n"); printf (" define_insn_reservation will be changed after\n"); printf (" last call of dfa_start. */\n"); - printf ("extern void dfa_clean_insn_cache PARAMS ((void));\n\n"); + printf ("extern void dfa_clean_insn_cache (void);\n\n"); printf ("/* Initiate and finish work with DFA. They should be\n"); printf (" called as the first and the last interface\n"); printf (" functions. */\n"); - printf ("extern void dfa_start PARAMS ((void));\n"); - printf ("extern void dfa_finish PARAMS ((void));\n"); + printf ("extern void dfa_start (void);\n"); + printf ("extern void dfa_finish (void);\n"); } else { @@ -465,7 +451,7 @@ main (argc, argv) printf ("typedef void *state_t;\n\n"); } - /* Output flag masks for use by reorg. + /* Output flag masks for use by reorg. Flags are used to hold branch direction and prediction information for use by eligible_for_... */ @@ -486,8 +472,7 @@ main (argc, argv) /* Define this so we can link with print-rtl.o to get debug_rtx function. */ const char * -get_insn_name (code) - int code ATTRIBUTE_UNUSED; +get_insn_name (int code ATTRIBUTE_UNUSED) { return NULL; } -- cgit v1.2.1