From 79e61f879fb061c97468fd50737d8dfcb82291a2 Mon Sep 17 00:00:00 2001 From: ghazi Date: Sat, 19 Dec 1998 07:04:42 +0000 Subject: [PATCH] * genattr.c (fatal): Qualify a char* with the `const' keyword. * genattrtab.c (fatal, attr_printf, attr_string, write_attr_set, write_unit_name, write_eligible_delay, expand_units, make_length_attrs, write_attr_case, find_attr, make_internal_attr): Likewise. * gencheck.c (tree_codes): Likewise. * gencodes.c (fatal): Likewise. * genconfig.c (fatal): Likewise. * genemit.c (fatal): Likewise. * genextract.c (fatal, walk_rtx, copystr): Likewise. * genflags.c (fatal): Likewise. * genopinit.c (fatal, optabs, gen_insn): Likewise. * genoutput.c (fatal, error, predicates): Likewise. * genpeep.c (fatal): Likewise. * genrecog.c (fatal, decision, pred_table, add_to_sequence, write_tree_1, write_tree, change_state, copystr, indents): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@24377 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 20 +++++++++++++++++ gcc/genattr.c | 8 +++---- gcc/genattrtab.c | 68 +++++++++++++++++++++++++++++--------------------------- gcc/gencheck.c | 2 +- gcc/gencodes.c | 8 +++---- gcc/genconfig.c | 8 +++---- gcc/genemit.c | 8 +++---- gcc/genextract.c | 16 ++++++------- gcc/genflags.c | 8 +++---- gcc/genopinit.c | 12 +++++----- gcc/genoutput.c | 18 +++++++-------- gcc/genpeep.c | 8 +++---- gcc/genrecog.c | 40 ++++++++++++++++----------------- 13 files changed, 123 insertions(+), 101 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7cfdd14..9ae5f62 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,23 @@ +Sat Dec 19 09:52:27 1998 Kaveh R. Ghazi + + * genattr.c (fatal): Qualify a char* with the `const' keyword. + + * genattrtab.c (fatal, attr_printf, attr_string, write_attr_set, + write_unit_name, write_eligible_delay, expand_units, + make_length_attrs, write_attr_case, find_attr, + make_internal_attr): Likewise. + * gencheck.c (tree_codes): Likewise. + * gencodes.c (fatal): Likewise. + * genconfig.c (fatal): Likewise. + * genemit.c (fatal): Likewise. + * genextract.c (fatal, walk_rtx, copystr): Likewise. + * genflags.c (fatal): Likewise. + * genopinit.c (fatal, optabs, gen_insn): Likewise. + * genoutput.c (fatal, error, predicates): Likewise. + * genpeep.c (fatal): Likewise. + * genrecog.c (fatal, decision, pred_table, add_to_sequence, + write_tree_1, write_tree, change_state, copystr, indents): Likewise. + Thu Dec 17 18:21:49 1998 Rainer Orth * configure.in (with-fast-fixincludes): Fix whitespace. diff --git a/gcc/genattr.c b/gcc/genattr.c index 4064ef0..b676be5 100644 --- a/gcc/genattr.c +++ b/gcc/genattr.c @@ -31,7 +31,7 @@ struct obstack *rtl_obstack = &obstack; #define obstack_chunk_alloc xmalloc #define obstack_chunk_free free -static void fatal PVPROTO ((char *, ...)) +static void fatal PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN; void fancy_abort PROTO((void)) ATTRIBUTE_NORETURN; @@ -221,17 +221,17 @@ xrealloc (ptr, size) } static void -fatal VPROTO ((char *format, ...)) +fatal VPROTO ((const char *format, ...)) { #ifndef ANSI_PROTOTYPES - char *format; + const char *format; #endif va_list ap; VA_START (ap, format); #ifndef ANSI_PROTOTYPES - format = va_arg (ap, char *); + format = va_arg (ap, const char *); #endif fprintf (stderr, "genattr: "); diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c index 00b48963..fc2f884 100644 --- a/gcc/genattrtab.c +++ b/gcc/genattrtab.c @@ -119,7 +119,7 @@ struct obstack *temp_obstack = &obstack2; /* Define this so we can link with print-rtl.o to get debug_rtx function. */ char **insn_name_ptr = 0; -static void fatal PVPROTO ((char *, ...)) +static void fatal PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN; void fancy_abort PROTO((void)) ATTRIBUTE_NORETURN; @@ -365,8 +365,9 @@ rtx pic_offset_table_rtx; static void attr_hash_add_rtx PROTO((int, rtx)); static void attr_hash_add_string PROTO((int, char *)); static rtx attr_rtx PVPROTO((enum rtx_code, ...)); -static char *attr_printf PVPROTO((int, char *, ...)); -static char *attr_string PROTO((char *, int)); +static char *attr_printf PVPROTO((int, const char *, ...)) + ATTRIBUTE_PRINTF_2; +static char *attr_string PROTO((const char *, int)); static rtx check_attr_test PROTO((rtx, int)); static rtx check_attr_value PROTO((rtx, struct attr_desc *)); static rtx convert_set_attr_alternative PROTO((rtx, int, int)); @@ -430,25 +431,26 @@ static int or_attr_value PROTO((rtx)); static void walk_attr_value PROTO((rtx)); static void write_attr_get PROTO((struct attr_desc *)); static rtx eliminate_known_true PROTO((rtx, rtx, int, int)); -static void write_attr_set PROTO((struct attr_desc *, int, rtx, char *, - char *, rtx, int, int)); +static void write_attr_set PROTO((struct attr_desc *, int, rtx, + const char *, const char *, rtx, + int, int)); static void write_attr_case PROTO((struct attr_desc *, struct attr_value *, - int, char *, char *, int, rtx)); -static void write_unit_name PROTO((char *, int, char *)); + int, const char *, const char *, int, rtx)); +static void write_unit_name PROTO((const char *, int, const char *)); static void write_attr_valueq PROTO((struct attr_desc *, char *)); static void write_attr_value PROTO((struct attr_desc *, rtx)); static void write_upcase PROTO((char *)); static void write_indent PROTO((int)); -static void write_eligible_delay PROTO((char *)); +static void write_eligible_delay PROTO((const char *)); static void write_function_unit_info PROTO((void)); -static void write_complex_function PROTO((struct function_unit *, char *, - char *)); +static void write_complex_function PROTO((struct function_unit *, const char *, + const char *)); static int write_expr_attr_cache PROTO((rtx, struct attr_desc *)); static void write_toplevel_expr PROTO((rtx)); static int n_comma_elts PROTO((char *)); static char *next_comma_elt PROTO((char **)); -static struct attr_desc *find_attr PROTO((char *, int)); -static void make_internal_attr PROTO((char *, rtx, int)); +static struct attr_desc *find_attr PROTO((const char *, int)); +static void make_internal_attr PROTO((const char *, rtx, int)); static struct attr_value *find_most_used PROTO((struct attr_desc *)); static rtx find_single_value PROTO((struct attr_desc *)); static rtx make_numeric_value PROTO((int)); @@ -731,11 +733,11 @@ attr_rtx VPROTO((enum rtx_code code, ...)) /*VARARGS2*/ static char * -attr_printf VPROTO((register int len, char *fmt, ...)) +attr_printf VPROTO((register int len, const char *fmt, ...)) { #ifndef ANSI_PROTOTYPES register int len; - char *fmt; + const char *fmt; #endif va_list p; register char *str; @@ -744,7 +746,7 @@ attr_printf VPROTO((register int len, char *fmt, ...)) #ifndef ANSI_PROTOTYPES len = va_arg (p, int); - fmt = va_arg (p, char *); + fmt = va_arg (p, const char *); #endif /* Print the string into a temporary location. */ @@ -775,7 +777,7 @@ attr_numeral (n) static char * attr_string (str, len) - char *str; + const char *str; int len; { register struct attr_hash *h; @@ -1815,7 +1817,7 @@ expand_units () rtx unitsmask; rtx readycost; rtx newexp; - char *str; + const char *str; int i, j, u, num, nvalues; /* Rebuild the condition for the unit to share the RTL expressions. @@ -2384,9 +2386,9 @@ substitute_address (exp, no_address_fn, address_fn) static void make_length_attrs () { - static char *new_names[] = {"*insn_default_length", - "*insn_variable_length_p", - "*insn_current_length"}; + static const char *new_names[] = {"*insn_default_length", + "*insn_variable_length_p", + "*insn_current_length"}; static rtx (*no_address_fn[]) PROTO((rtx)) = {identity_fn, zero_fn, zero_fn}; static rtx (*address_fn[]) PROTO((rtx)) = {max_fn, one_fn, identity_fn}; size_t i; @@ -4921,8 +4923,8 @@ write_attr_set (attr, indent, value, prefix, suffix, known_true, struct attr_desc *attr; int indent; rtx value; - char *prefix; - char *suffix; + const char *prefix; + const char *suffix; rtx known_true; int insn_code, insn_index; { @@ -5018,7 +5020,7 @@ write_attr_case (attr, av, write_case_lines, prefix, suffix, indent, struct attr_desc *attr; struct attr_value *av; int write_case_lines; - char *prefix, *suffix; + const char *prefix, *suffix; int indent; rtx known_true; { @@ -5174,9 +5176,9 @@ write_toplevel_expr (p) static void write_unit_name (prefix, num, suffix) - char *prefix; + const char *prefix; int num; - char *suffix; + const char *suffix; { struct function_unit *unit; @@ -5212,7 +5214,7 @@ write_attr_valueq (attr, s) else { int i; - char *sep = " /* units: "; + const char *sep = " /* units: "; for (i = 0, num = ~num; num; i++, num >>= 1) if (num & 1) { @@ -5284,7 +5286,7 @@ write_indent (indent) static void write_eligible_delay (kind) - char *kind; + const char *kind; { struct delay_desc *delay; int max_slots; @@ -5473,7 +5475,7 @@ write_function_unit_info () static void write_complex_function (unit, name, connection) struct function_unit *unit; - char *name, *connection; + const char *name, *connection; { struct attr_desc *case_attr, *attr; struct attr_value *av, *common_av; @@ -5614,7 +5616,7 @@ next_comma_elt (pstr) static struct attr_desc * find_attr (name, create) - char *name; + const char *name; int create; { struct attr_desc *attr; @@ -5652,7 +5654,7 @@ find_attr (name, create) static void make_internal_attr (name, value, special) - char *name; + const char *name; rtx value; int special; { @@ -5812,17 +5814,17 @@ copy_rtx_unchanging (orig) } static void -fatal VPROTO ((char *format, ...)) +fatal VPROTO ((const char *format, ...)) { #ifndef ANSI_PROTOTYPES - char *format; + const char *format; #endif va_list ap; VA_START (ap, format); #ifndef ANSI_PROTOTYPES - format = va_arg (ap, char *); + format = va_arg (ap, const char *); #endif fprintf (stderr, "genattrtab: "); diff --git a/gcc/gencheck.c b/gcc/gencheck.c index a10c40b..80d7c4f 100644 --- a/gcc/gencheck.c +++ b/gcc/gencheck.c @@ -23,7 +23,7 @@ Boston, MA 02111-1307, USA. */ #define DEFTREECODE(SYM, NAME, TYPE, LEN) STRINGIFY(SYM), -char *tree_codes[] = { +const char *tree_codes[] = { #include "tree.def" #include "gencheck.h" (char*)0 diff --git a/gcc/gencodes.c b/gcc/gencodes.c index 3aa7d30..11dde78 100644 --- a/gcc/gencodes.c +++ b/gcc/gencodes.c @@ -33,7 +33,7 @@ struct obstack *rtl_obstack = &obstack; #define obstack_chunk_alloc xmalloc #define obstack_chunk_free free -static void fatal PVPROTO ((char *, ...)) +static void fatal PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN; void fancy_abort PROTO((void)) ATTRIBUTE_NORETURN; @@ -79,17 +79,17 @@ xrealloc (ptr, size) } static void -fatal VPROTO ((char *format, ...)) +fatal VPROTO ((const char *format, ...)) { #ifndef ANSI_PROTOTYPES - char *format; + const char *format; #endif va_list ap; VA_START (ap, format); #ifndef ANSI_PROTOTYPES - format = va_arg (ap, char *); + format = va_arg (ap, const char *); #endif fprintf (stderr, "gencodes: "); diff --git a/gcc/genconfig.c b/gcc/genconfig.c index 086462f..6a72e26 100644 --- a/gcc/genconfig.c +++ b/gcc/genconfig.c @@ -49,7 +49,7 @@ static int max_insns_per_split = 1; static int clobbers_seen_this_insn; static int dup_operands_seen_this_insn; -static void fatal PVPROTO ((char *, ...)) +static void fatal PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN; void fancy_abort PROTO((void)) ATTRIBUTE_NORETURN; @@ -268,17 +268,17 @@ xrealloc (ptr, size) } static void -fatal VPROTO ((char *format, ...)) +fatal VPROTO ((const char *format, ...)) { #ifndef ANSI_PROTOTYPES - char *format; + const char *format; #endif va_list ap; VA_START (ap, format); #ifndef ANSI_PROTOTYPES - format = va_arg (ap, char *); + format = va_arg (ap, const char *); #endif fprintf (stderr, "genconfig: "); diff --git a/gcc/genemit.c b/gcc/genemit.c index 7e55623..81eefa96 100644 --- a/gcc/genemit.c +++ b/gcc/genemit.c @@ -30,7 +30,7 @@ struct obstack *rtl_obstack = &obstack; #define obstack_chunk_alloc xmalloc #define obstack_chunk_free free -static void fatal PVPROTO ((char *, ...)) +static void fatal PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN; void fancy_abort PROTO((void)) ATTRIBUTE_NORETURN; @@ -702,17 +702,17 @@ xrealloc (ptr, size) } static void -fatal VPROTO ((char *format, ...)) +fatal VPROTO ((const char *format, ...)) { #ifndef ANSI_PROTOTYPES - char *format; + const char *format; #endif va_list ap; VA_START (ap, format); #ifndef ANSI_PROTOTYPES - format = va_arg (ap, char *); + format = va_arg (ap, const char *); #endif fprintf (stderr, "genemit: "); diff --git a/gcc/genextract.c b/gcc/genextract.c index f17ab67..e8efcd2 100644 --- a/gcc/genextract.c +++ b/gcc/genextract.c @@ -96,11 +96,11 @@ static int dupnums[MAX_DUP_OPERANDS]; static struct code_ptr *peepholes; static void gen_insn PROTO ((rtx)); -static void walk_rtx PROTO ((rtx, char *)); +static void walk_rtx PROTO ((rtx, const char *)); static void print_path PROTO ((char *)); -static void fatal PVPROTO ((char *, ...)) +static void fatal PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN; -static char *copystr PROTO ((char *)); +static char *copystr PROTO ((const char *)); static void mybzero (); void fancy_abort PROTO ((void)) ATTRIBUTE_NORETURN; @@ -187,7 +187,7 @@ gen_insn (insn) static void walk_rtx (x, path) rtx x; - char *path; + const char *path; { register RTX_CODE code; register int i; @@ -369,17 +369,17 @@ xrealloc (ptr, size) } static void -fatal VPROTO ((char *format, ...)) +fatal VPROTO ((const char *format, ...)) { #ifndef ANSI_PROTOTYPES - char *format; + const char *format; #endif va_list ap; VA_START (ap, format); #ifndef ANSI_PROTOTYPES - format = va_arg (ap, char *); + format = va_arg (ap, const char *); #endif fprintf (stderr, "genextract: "); @@ -400,7 +400,7 @@ fancy_abort () static char * copystr (s1) - char *s1; + const char *s1; { register char *tem; diff --git a/gcc/genflags.c b/gcc/genflags.c index 5d21082..043cd30 100644 --- a/gcc/genflags.c +++ b/gcc/genflags.c @@ -33,7 +33,7 @@ struct obstack *rtl_obstack = &obstack; #define obstack_chunk_alloc xmalloc #define obstack_chunk_free free -static void fatal PVPROTO ((char *, ...)) +static void fatal PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN; void fancy_abort PROTO((void)) ATTRIBUTE_NORETURN; @@ -199,17 +199,17 @@ xrealloc (ptr, size) } static void -fatal VPROTO ((char *format, ...)) +fatal VPROTO ((const char *format, ...)) { #ifndef ANSI_PROTOTYPES - char *format; + const char *format; #endif va_list ap; VA_START (ap, format); #ifndef ANSI_PROTOTYPES - format = va_arg (ap, char *); + format = va_arg (ap, const char *); #endif fprintf (stderr, "genflags: "); diff --git a/gcc/genopinit.c b/gcc/genopinit.c index 8822401..2b11c72 100644 --- a/gcc/genopinit.c +++ b/gcc/genopinit.c @@ -30,7 +30,7 @@ struct obstack *rtl_obstack = &obstack; #define obstack_chunk_alloc xmalloc #define obstack_chunk_free free -static void fatal PVPROTO ((char *, ...)) +static void fatal PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN; void fancy_abort PROTO((void)) ATTRIBUTE_NORETURN; @@ -63,7 +63,7 @@ void fancy_abort PROTO((void)) ATTRIBUTE_NORETURN; /* The reason we use \% is to avoid sequences of the form %-capletter-% which SCCS treats as magic. This gets warnings which you should ignore. */ -char *optabs[] = +const char *optabs[] = { "extendtab[(int) %B][(int) %A][0] = CODE_FOR_%(extend%a\%b2%)", "extendtab[(int) %B][(int) %A][1] = CODE_FOR_%(zero_extend%a\%b2%)", "fixtab[(int) %A][(int) %B][0] = CODE_FOR_%(fix%F\%a%I\%b2%)", @@ -134,7 +134,7 @@ gen_insn (insn) int m1, m2, op; size_t pindex; int i; - char *np, *pp, *p, *q; + const char *np, *pp, *p, *q; /* Don't mention instructions whose names are the null string. They are in the machine description just to be recognized. */ @@ -304,17 +304,17 @@ xrealloc (ptr, size) } static void -fatal VPROTO ((char *format, ...)) +fatal VPROTO ((const char *format, ...)) { #ifndef ANSI_PROTOTYPES - char *format; + const char *format; #endif va_list ap; VA_START (ap, format); #ifndef ANSI_PROTOTYPES - format = va_arg (ap, char *); + format = va_arg (ap, const char *); #endif fprintf (stderr, "genopinit: "); diff --git a/gcc/genoutput.c b/gcc/genoutput.c index af68b61..7aa9769 100644 --- a/gcc/genoutput.c +++ b/gcc/genoutput.c @@ -107,10 +107,10 @@ struct obstack *rtl_obstack = &obstack; #define obstack_chunk_alloc xmalloc #define obstack_chunk_free free -static void fatal PVPROTO ((char *, ...)) +static void fatal PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN; void fancy_abort PROTO((void)) ATTRIBUTE_NORETURN; -static void error PVPROTO ((char *, ...)) ATTRIBUTE_PRINTF_1; +static void error PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1; static void mybcopy (); static void mybzero (); static int n_occurrences PROTO((int, char *)); @@ -415,7 +415,7 @@ static int max_opno; static int num_dups; static char *constraints[MAX_MAX_OPERANDS]; static int op_n_alternatives[MAX_MAX_OPERANDS]; -static char *predicates[MAX_MAX_OPERANDS]; +static const char *predicates[MAX_MAX_OPERANDS]; static char address_p[MAX_MAX_OPERANDS]; static enum machine_mode modes[MAX_MAX_OPERANDS]; static char strict_low[MAX_MAX_OPERANDS]; @@ -922,17 +922,17 @@ mybcopy (b1, b2, length) } static void -fatal VPROTO ((char *format, ...)) +fatal VPROTO ((const char *format, ...)) { #ifndef ANSI_PROTOTYPES - char *format; + const char *format; #endif va_list ap; VA_START (ap, format); #ifndef ANSI_PROTOTYPES - format = va_arg (ap, char *); + format = va_arg (ap, const char *); #endif fprintf (stderr, "genoutput: "); @@ -952,17 +952,17 @@ fancy_abort () } static void -error VPROTO ((char *format, ...)) +error VPROTO ((const char *format, ...)) { #ifndef ANSI_PROTOTYPES - char *format; + const char *format; #endif va_list ap; VA_START (ap, format); #ifndef ANSI_PROTOTYPES - format = va_arg (ap, char *); + format = va_arg (ap, const char *); #endif fprintf (stderr, "genoutput: "); diff --git a/gcc/genpeep.c b/gcc/genpeep.c index 25179bb..4330b48 100644 --- a/gcc/genpeep.c +++ b/gcc/genpeep.c @@ -46,7 +46,7 @@ struct link int vecelt; }; -static void fatal PVPROTO ((char *, ...)) +static void fatal PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN; void fancy_abort PROTO((void)) ATTRIBUTE_NORETURN; @@ -407,17 +407,17 @@ xrealloc (ptr, size) } static void -fatal VPROTO ((char *format, ...)) +fatal VPROTO ((const char *format, ...)) { #ifndef ANSI_PROTOTYPES - char *format; + const char *format; #endif va_list ap; VA_START (ap, format); #ifndef ANSI_PROTOTYPES - format = va_arg (ap, char *); + format = va_arg (ap, const char *); #endif fprintf (stderr, "genpeep: "); diff --git a/gcc/genrecog.c b/gcc/genrecog.c index 0e1245c..9fca92f 100644 --- a/gcc/genrecog.c +++ b/gcc/genrecog.c @@ -86,7 +86,7 @@ struct decision int elt_one_int; /* Required value for XINT (rtl, 1) */ int test_elt_zero_wide; /* Nonzero if should test XWINT (rtl, 0) */ HOST_WIDE_INT elt_zero_wide; /* Required value for XWINT (rtl, 0) */ - char *tests; /* If nonzero predicate to call */ + const char *tests; /* If nonzero predicate to call */ int pred; /* `preds' index of predicate or -1 */ char *c_test; /* Additional test to perform */ struct decision_head success; /* Nodes to test on success */ @@ -137,7 +137,7 @@ static int max_depth; static struct pred_table { - char *name; + const char *name; RTX_CODE codes[NUM_RTX_CODE]; } preds[] = {{"general_operand", {CONST_INT, CONST_DOUBLE, CONST, SYMBOL_REF, @@ -167,7 +167,7 @@ static struct pred_table static struct decision_head make_insn_sequence PROTO((rtx, enum routine_type)); static struct decision *add_to_sequence PROTO((rtx, struct decision_head *, - char *)); + const char *)); static int not_both_true PROTO((struct decision *, struct decision *, int)); static int position_merit PROTO((struct decision *, enum machine_mode, @@ -177,21 +177,21 @@ static struct decision_head merge_trees PROTO((struct decision_head, static int break_out_subroutines PROTO((struct decision_head, enum routine_type, int)); static void write_subroutine PROTO((struct decision *, enum routine_type)); -static void write_tree_1 PROTO((struct decision *, char *, +static void write_tree_1 PROTO((struct decision *, const char *, struct decision *, enum routine_type)); static void print_code PROTO((enum rtx_code)); static int same_codes PROTO((struct decision *, enum rtx_code)); static void clear_codes PROTO((struct decision *)); static int same_modes PROTO((struct decision *, enum machine_mode)); static void clear_modes PROTO((struct decision *)); -static void write_tree PROTO((struct decision *, char *, +static void write_tree PROTO((struct decision *, const char *, struct decision *, int, enum routine_type)); -static void change_state PROTO((char *, char *, int)); -static char *copystr PROTO((char *)); +static void change_state PROTO((const char *, const char *, int)); +static char *copystr PROTO((const char *)); static void mybzero PROTO((char *, unsigned)); static void mybcopy PROTO((char *, char *, unsigned)); -static void fatal PVPROTO((char *, ...)) +static void fatal PVPROTO((const char *, ...)) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN; void fancy_abort PROTO((void)) ATTRIBUTE_NORETURN; @@ -291,7 +291,7 @@ static struct decision * add_to_sequence (pattern, last, position) rtx pattern; struct decision_head *last; - char *position; + const char *position; { register RTX_CODE code; register struct decision *new @@ -1031,7 +1031,7 @@ write_subroutine (tree, type) conditions or switch statements. We only support small indentations and always indent at least two spaces. */ -static char *indents[] +static const char *indents[] = {" ", " ", " ", " ", " ", " ", " ", " ", "\t", "\t ", "\t ", "\t ", "\t ", "\t ", "\t ", "\t\t", "\t\t ", "\t\t ", "\t\t ", "\t\t ", "\t\t "}; @@ -1060,7 +1060,7 @@ static char *indents[] static void write_tree_1 (tree, prevpos, afterward, type) struct decision *tree; - char *prevpos; + const char *prevpos; struct decision *afterward; enum routine_type type; { @@ -1552,14 +1552,14 @@ clear_modes (p) static void write_tree (tree, prevpos, afterward, initial, type) struct decision *tree; - char *prevpos; + const char *prevpos; struct decision *afterward; int initial; enum routine_type type; { register struct decision *p; - char *name_prefix = (type == SPLIT ? "split" : "recog"); - char *call_suffix = (type == SPLIT ? "" : ", pnum_clobbers"); + const char *name_prefix = (type == SPLIT ? "split" : "recog"); + const char *call_suffix = (type == SPLIT ? "" : ", pnum_clobbers"); if (! initial && tree->subroutine_number > 0) { @@ -1598,8 +1598,8 @@ write_tree (tree, prevpos, afterward, initial, type) static void change_state (oldpos, newpos, indent) - char *oldpos; - char *newpos; + const char *oldpos; + const char *newpos; int indent; { int odepth = strlen (oldpos); @@ -1627,7 +1627,7 @@ change_state (oldpos, newpos, indent) static char * copystr (s1) - char *s1; + const char *s1; { register char *tem; @@ -1681,17 +1681,17 @@ xmalloc (size) } static void -fatal VPROTO ((char *format, ...)) +fatal VPROTO ((const char *format, ...)) { #ifndef ANSI_PROTOTYPES - char *format; + const char *format; #endif va_list ap; VA_START (ap, format); #ifndef ANSI_PROTOTYPES - format = va_arg (ap, char *); + format = va_arg (ap, const char *); #endif fprintf (stderr, "genrecog: "); -- 2.7.4