From 6f7d635c0efc87ff17945764258d9055ac7c8de3 Mon Sep 17 00:00:00 2001
From: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
Date: Fri, 20 Aug 1999 23:05:25 +0000
Subject: rtl.h (rtx_format): Constify a char*.

	* rtl.h (rtx_format): Constify a char*.

	* rtl.c (rtx_format): Likewise.
	(copy_rtx, copy_most_rtx, read_rtx): Likewise.
	(init_rtl): Use accessor macro, not `rtx_format'.

	* alias.c (rtx_equal_for_memref_p, find_symbolic_term): Constify a
	char*.

	* caller-save.c (mark_referenced_regs): Likewise.

	* combine.c (subst, make_compound_operation, known_cond,
	gen_rtx_combine, update_table_tick, get_last_value_validate,
	use_crosses_set_p, mark_used_regs_combine, move_deaths): Likewise.

	* cse.c (rtx_cost, mention_regs, canon_hash, exp_equiv_p,
	refers_to_p, canon_reg, fold_rtx, cse_process_notes,
	count_reg_usage): Likewise.

	* emit-rtl.c (gen_rtx, copy_rtx_if_shared, reset_used_flags):
	Likewise.

	* final.c (leaf_renumber_regs_insn): Likewise.

	* flow.c (mark_used_regs, find_use_as_address, dump_flow_info,
	dump_edge_info, count_reg_references): Likewise.

	* function.c (fixup_var_refs_1, walk_fixup_memory_subreg,
	fixup_stack_1, purge_addressof_1, instantiate_virtual_regs_1):
	Likewise.

	* gcse.c (oprs_unchanged_p, hash_expr_1, expr_equiv_p,
	oprs_not_set_p, expr_killed_p, compute_transp, find_used_regs,
	add_label_notes): Likewise.

	* genattrtab.c (attr_rtx, attr_copy_rtx, encode_units_mask,
	clear_struct_flag, count_sub_rtxs, count_alternatives,
	compares_alternatives_p, contained_in_p, walk_attr_value,
	write_expr_attr_cache): Likewise.

	* genconfig.c (walk_insn_part): Likewise.

	* genemit.c (max_operand_1, gen_exp): Likewise.

	* genextract.c (walk_rtx): Likewise.

	* genflags.c (num_operands): Likewise.

	* genoutput.c (scan_operands): Likewise.

	* genpeep.c (match_rtx): Likewise.

	* genrecog.c (add_to_sequence): Likewise.

	* haifa-sched.c (may_trap_exp, sched_analyze_2, attach_deaths):
	Likewise.

	* integrate.c (save_constants, copy_for_inline,
	copy_rtx_and_substitute, subst_constants, restore_constants):
	Likewise.

	* jump.c  (mark_jump_label, invert_exp, redirect_exp,
	rtx_renumbered_equal_p, rtx_equal_for_thread_p): Likewise.

	* local-alloc.c (contains_replace_regs, memref_referenced_p):
	Likewise.

	* loop.c (record_excess_regs, rtx_equal_for_loop_p,
	add_label_notes, replace_call_address, count_nonfixed_reads,
	invariant_p, find_single_use_in_loop, find_mem_givs,
	find_life_end, maybe_eliminate_biv_1, update_reg_last_use):
	Likewise.

	* print-rtl.c (reg_names, print_rtx): Likewise.

	* recog.c (validate_replace_rtx_1, find_single_use_1): Likewise.

	* reg-stack.c (stack_regs_mentioned_p, record_label_references,
	record_reg_life_pat, swap_rtx_condition, goto_block_pat,
	print_blocks): Likewise.

	* regclass.c (fix_register, record_address_regs,
	reg_scan_mark_refs): Likewise.

	* regmove.c (stable_but_for_p): Likewise.

	* reload.c (loc_mentioned_in_p, operands_match_p,
	find_reloads_toplevsubst_reg_equivs, find_reloads_address_1,
	copy_replacements, refers_to_regno_for_reload_p,
	refers_to_mem_for_reload_p, find_inc_amount, regno_clobbered_p,
	reload_when_needed_name, reg_class_names, debug_reload_to_stream):
	Likewise.

	* reload1.c (eliminate_regs, scan_paradoxical_subregs,
	delete_address_reloads_1, count_occurrences,
	reload_cse_mem_conflict_p, reload_combine_note_use,
	add_auto_inc_notes): Likewise.

	* resource.c (mark_referenced_resources, mark_set_resources):
	Likewise.

	* rtlanal.c (rtx_unstable_p, rtx_varies_p, rtx_addr_varies_p,
	reg_mentioned_p, regs_set_between_p, modified_between_p,
	modified_in_p, refers_to_regno_p, reg_overlap_mentioned_p,
	rtx_equal_p, volatile_insn_p, volatile_refs_p, side_effects_p,
	may_trap_p, inequality_comparisons_p, replace_rtx, replace_regs,
	jmp_uses_reg_or_mem, for_each_rtx, regno_use_in): Likewise.

	* sched.c (sched_analyze_2, attach_deaths): Likewise.

	* stupid.c (stupid_mark_refs): Likewise.

	* unroll.c (remap_split_bivs): Likewise.

	* varasm.c (mark_constants): Likewise.

	* a29k/a29k.c (uses_local_reg_p): Likewise.

	* alpha/alpha.c (summarize_insn): Likewise.

	* arm/arm.c (symbol_mentioned_p, label_mentioned_p,
	eliminate_lr2ip): Likewise.

	* arm/thumb.c (symbol_mentioned_p, label_mentioned_p): Likewise.

	* i386/i386.c (symbolic_reference_mentioned_p, copy_all_rtx,
	reg_mentioned_in_mem): Likewise.

	* ns32k/ns32k.c (global_symbolic_reference_mentioned_p,
	symbolic_reference_mentioned_p): Likewise.

	* romp/romp.c (unsigned_comparisons_p, hash_rtx): Likewise.

	* sh/sh.c (regs_used, mark_use): Likewise.

	* vax/vax.c (vax_rtx_cost): Likewise.

From-SVN: r28784
---
 gcc/ChangeLog            | 139 +++++++++++++++++++++++++++++++++++++++++++++++
 gcc/alias.c              |   4 +-
 gcc/caller-save.c        |   2 +-
 gcc/combine.c            |  18 +++---
 gcc/config/a29k/a29k.c   |   2 +-
 gcc/config/alpha/alpha.c |   2 +-
 gcc/config/arm/arm.c     |   6 +-
 gcc/config/arm/thumb.c   |   4 +-
 gcc/config/i386/i386.c   |   6 +-
 gcc/config/ns32k/ns32k.c |   4 +-
 gcc/config/romp/romp.c   |   4 +-
 gcc/config/sh/sh.c       |   4 +-
 gcc/config/vax/vax.c     |   2 +-
 gcc/cse.c                |  18 +++---
 gcc/emit-rtl.c           |   6 +-
 gcc/final.c              |   2 +-
 gcc/flow.c               |  10 ++--
 gcc/function.c           |  10 ++--
 gcc/gcse.c               |  16 +++---
 gcc/genattrtab.c         |  20 +++----
 gcc/genconfig.c          |   2 +-
 gcc/genemit.c            |   4 +-
 gcc/genextract.c         |   2 +-
 gcc/genflags.c           |   2 +-
 gcc/genoutput.c          |   2 +-
 gcc/genpeep.c            |   2 +-
 gcc/genrecog.c           |   2 +-
 gcc/haifa-sched.c        |   6 +-
 gcc/integrate.c          |  10 ++--
 gcc/jump.c               |  10 ++--
 gcc/local-alloc.c        |   4 +-
 gcc/loop.c               |  22 ++++----
 gcc/print-rtl.c          |   6 +-
 gcc/recog.c              |   4 +-
 gcc/reg-stack.c          |  12 ++--
 gcc/regclass.c           |   6 +-
 gcc/regmove.c            |   2 +-
 gcc/reload.c             |  24 ++++----
 gcc/reload1.c            |  14 ++---
 gcc/resource.c           |   4 +-
 gcc/rtl.c                |  10 ++--
 gcc/rtl.h                |   2 +-
 gcc/rtlanal.c            |  40 +++++++-------
 gcc/sched.c              |   4 +-
 gcc/stupid.c             |   2 +-
 gcc/unroll.c             |   2 +-
 gcc/varasm.c             |   2 +-
 47 files changed, 310 insertions(+), 171 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 53b6b52..50fe87c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,142 @@
+Fri Aug 20 18:53:43 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* rtl.h (rtx_format): Constify a char*.
+
+	* rtl.c (rtx_format): Likewise.
+	(copy_rtx, copy_most_rtx, read_rtx): Likewise.
+	(init_rtl): Use accessor macro, not `rtx_format'.
+
+	* alias.c (rtx_equal_for_memref_p, find_symbolic_term): Constify a
+	char*.
+
+	* caller-save.c (mark_referenced_regs): Likewise.
+
+	* combine.c (subst, make_compound_operation, known_cond,
+	gen_rtx_combine, update_table_tick, get_last_value_validate,
+	use_crosses_set_p, mark_used_regs_combine, move_deaths): Likewise.
+
+	* cse.c (rtx_cost, mention_regs, canon_hash, exp_equiv_p,
+	refers_to_p, canon_reg, fold_rtx, cse_process_notes,
+	count_reg_usage): Likewise.
+
+	* emit-rtl.c (gen_rtx, copy_rtx_if_shared, reset_used_flags):
+	Likewise.
+
+	* final.c (leaf_renumber_regs_insn): Likewise.
+
+	* flow.c (mark_used_regs, find_use_as_address, dump_flow_info,
+	dump_edge_info, count_reg_references): Likewise.
+
+	* function.c (fixup_var_refs_1, walk_fixup_memory_subreg,
+	fixup_stack_1, purge_addressof_1, instantiate_virtual_regs_1):
+	Likewise.
+
+	* gcse.c (oprs_unchanged_p, hash_expr_1, expr_equiv_p,
+	oprs_not_set_p, expr_killed_p, compute_transp, find_used_regs,
+	add_label_notes): Likewise.
+
+	* genattrtab.c (attr_rtx, attr_copy_rtx, encode_units_mask,
+	clear_struct_flag, count_sub_rtxs, count_alternatives,
+	compares_alternatives_p, contained_in_p, walk_attr_value,
+	write_expr_attr_cache): Likewise.
+
+	* genconfig.c (walk_insn_part): Likewise.
+
+	* genemit.c (max_operand_1, gen_exp): Likewise.
+
+	* genextract.c (walk_rtx): Likewise.
+
+	* genflags.c (num_operands): Likewise.
+
+	* genoutput.c (scan_operands): Likewise.
+
+	* genpeep.c (match_rtx): Likewise.
+
+	* genrecog.c (add_to_sequence): Likewise.
+
+	* haifa-sched.c (may_trap_exp, sched_analyze_2, attach_deaths):
+	Likewise.
+
+	* integrate.c (save_constants, copy_for_inline,
+	copy_rtx_and_substitute, subst_constants, restore_constants):
+	Likewise.
+
+	* jump.c  (mark_jump_label, invert_exp, redirect_exp,
+	rtx_renumbered_equal_p, rtx_equal_for_thread_p): Likewise.
+
+	* local-alloc.c (contains_replace_regs, memref_referenced_p):
+	Likewise.
+
+	* loop.c (record_excess_regs, rtx_equal_for_loop_p,
+	add_label_notes, replace_call_address, count_nonfixed_reads,
+	invariant_p, find_single_use_in_loop, find_mem_givs,
+	find_life_end, maybe_eliminate_biv_1, update_reg_last_use):
+	Likewise.
+
+	* print-rtl.c (reg_names, print_rtx): Likewise.
+
+	* recog.c (validate_replace_rtx_1, find_single_use_1): Likewise.
+
+	* reg-stack.c (stack_regs_mentioned_p, record_label_references,
+	record_reg_life_pat, swap_rtx_condition, goto_block_pat,
+	print_blocks): Likewise.
+
+	* regclass.c (fix_register, record_address_regs,
+	reg_scan_mark_refs): Likewise.
+
+	* regmove.c (stable_but_for_p): Likewise.
+
+	* reload.c (loc_mentioned_in_p, operands_match_p,
+	find_reloads_toplevsubst_reg_equivs, find_reloads_address_1,
+	copy_replacements, refers_to_regno_for_reload_p,
+	refers_to_mem_for_reload_p, find_inc_amount, regno_clobbered_p,
+	reload_when_needed_name, reg_class_names, debug_reload_to_stream):
+	Likewise.
+
+	* reload1.c (eliminate_regs, scan_paradoxical_subregs,
+	delete_address_reloads_1, count_occurrences,
+	reload_cse_mem_conflict_p, reload_combine_note_use,
+	add_auto_inc_notes): Likewise.
+
+	* resource.c (mark_referenced_resources, mark_set_resources):
+	Likewise.
+
+	* rtlanal.c (rtx_unstable_p, rtx_varies_p, rtx_addr_varies_p,
+	reg_mentioned_p, regs_set_between_p, modified_between_p,
+	modified_in_p, refers_to_regno_p, reg_overlap_mentioned_p,
+	rtx_equal_p, volatile_insn_p, volatile_refs_p, side_effects_p,
+	may_trap_p, inequality_comparisons_p, replace_rtx, replace_regs,
+	jmp_uses_reg_or_mem, for_each_rtx, regno_use_in): Likewise.
+
+	* sched.c (sched_analyze_2, attach_deaths): Likewise.
+
+	* stupid.c (stupid_mark_refs): Likewise.
+
+	* unroll.c (remap_split_bivs): Likewise.
+
+	* varasm.c (mark_constants): Likewise.
+
+	* a29k/a29k.c (uses_local_reg_p): Likewise.
+
+	* alpha/alpha.c (summarize_insn): Likewise.
+
+	* arm/arm.c (symbol_mentioned_p, label_mentioned_p,
+	eliminate_lr2ip): Likewise.
+
+	* arm/thumb.c (symbol_mentioned_p, label_mentioned_p): Likewise.
+
+	* i386/i386.c (symbolic_reference_mentioned_p, copy_all_rtx,
+	reg_mentioned_in_mem): Likewise.
+
+	* ns32k/ns32k.c (global_symbolic_reference_mentioned_p,
+	symbolic_reference_mentioned_p): Likewise.
+
+	* romp/romp.c (unsigned_comparisons_p, hash_rtx): Likewise.
+
+	* sh/sh.c (regs_used, mark_use): Likewise.
+
+	* vax/vax.c (vax_rtx_cost): Likewise.
+
 Fri Aug 20 18:38:43 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* machmode.h (mode_name): Constify a char*.
diff --git a/gcc/alias.c b/gcc/alias.c
index 5f4d427..9de034a 100644
--- a/gcc/alias.c
+++ b/gcc/alias.c
@@ -593,7 +593,7 @@ rtx_equal_for_memref_p (x, y)
   register int i;
   register int j;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == 0 && y == 0)
     return 1;
@@ -696,7 +696,7 @@ find_symbolic_term (x)
 {
   register int i;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   code = GET_CODE (x);
   if (code == SYMBOL_REF || code == LABEL_REF)
diff --git a/gcc/caller-save.c b/gcc/caller-save.c
index 4edabfa..761dd92 100644
--- a/gcc/caller-save.c
+++ b/gcc/caller-save.c
@@ -495,7 +495,7 @@ mark_referenced_regs (x)
      rtx x;
 {
   enum rtx_code code = GET_CODE (x);
-  char *fmt;
+  const char *fmt;
   int i, j;
 
   if (code == SET)
diff --git a/gcc/combine.c b/gcc/combine.c
index b749b33..6c7f0d2 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -3007,7 +3007,7 @@ subst (x, from, to, in_dest, unique_copy)
 {
   register enum rtx_code code = GET_CODE (x);
   enum machine_mode op0_mode = VOIDmode;
-  register char *fmt;
+  register const char *fmt;
   register int len, i;
   rtx new;
 
@@ -5924,7 +5924,7 @@ make_compound_operation (x, in_code)
   int i;
   rtx new = 0;
   rtx tem;
-  char *fmt;
+  const char *fmt;
 
   /* Select the code to be used in recursive calls.  Once we are inside an
      address, we stay there.  If we have a comparison, set to COMPARE,
@@ -6951,7 +6951,7 @@ known_cond (x, cond, reg, val)
 {
   enum rtx_code code = GET_CODE (x);
   rtx temp;
-  char *fmt;
+  const char *fmt;
   int i, j;
 
   if (side_effects_p (x))
@@ -9276,7 +9276,7 @@ gen_rtx_combine VPROTO((enum rtx_code code, enum machine_mode mode, ...))
   int n_args;
   rtx args[3];
   int j;
-  char *fmt;
+  const char *fmt;
   rtx rt;
   struct undo *undo;
 
@@ -10499,7 +10499,7 @@ update_table_tick (x)
      rtx x;
 {
   register enum rtx_code code = GET_CODE (x);
-  register char *fmt = GET_RTX_FORMAT (code);
+  register const char *fmt = GET_RTX_FORMAT (code);
   register int i;
 
   if (code == REG)
@@ -10723,7 +10723,7 @@ get_last_value_validate (loc, insn, tick, replace)
      int replace;
 {
   rtx x = *loc;
-  char *fmt = GET_RTX_FORMAT (GET_CODE (x));
+  const char *fmt = GET_RTX_FORMAT (GET_CODE (x));
   int len = GET_RTX_LENGTH (GET_CODE (x));
   int i;
 
@@ -10881,7 +10881,7 @@ use_crosses_set_p (x, from_cuid)
      register rtx x;
      int from_cuid;
 {
-  register char *fmt;
+  register const char *fmt;
   register int i;
   register enum rtx_code code = GET_CODE (x);
 
@@ -11104,7 +11104,7 @@ mark_used_regs_combine (x)
   /* Recursively scan the operands of this expression.  */
 
   {
-    register char *fmt = GET_RTX_FORMAT (code);
+    register const char *fmt = GET_RTX_FORMAT (code);
 
     for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
       {
@@ -11160,7 +11160,7 @@ move_deaths (x, maybe_kill_insn, from_cuid, to_insn, pnotes)
      rtx to_insn;
      rtx *pnotes;
 {
-  register char *fmt;
+  register const char *fmt;
   register int len, i;
   register enum rtx_code code = GET_CODE (x);
 
diff --git a/gcc/config/a29k/a29k.c b/gcc/config/a29k/a29k.c
index 31b1117..ce41b34 100644
--- a/gcc/config/a29k/a29k.c
+++ b/gcc/config/a29k/a29k.c
@@ -896,7 +896,7 @@ int
 uses_local_reg_p (x)
      rtx x;
 {
-  char *fmt;
+  const char *fmt;
   int i, j;
 
   switch (GET_CODE (x))
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 3402713..ca097f6 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -4246,7 +4246,7 @@ summarize_insn (x, sum, set)
      struct shadow_summary *sum;
      int set;
 {
-  char *format_ptr;
+  const char *format_ptr;
   int i, j;
 
   if (x == 0)
diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index 9087c5c..c2d9768 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -2425,7 +2425,7 @@ int
 symbol_mentioned_p (x)
      rtx x;
 {
-  register char * fmt;
+  register const char * fmt;
   register int i;
 
   if (GET_CODE (x) == SYMBOL_REF)
@@ -2454,7 +2454,7 @@ int
 label_mentioned_p (x)
      rtx x;
 {
-  register char * fmt;
+  register const char * fmt;
   register int i;
 
   if (GET_CODE (x) == LABEL_REF)
@@ -4512,7 +4512,7 @@ eliminate_lr2ip (x)
   rtx x0 = * x;
   int code = GET_CODE (x0);
   register int i, j;
-  register char * fmt;
+  register const char * fmt;
   
   switch (code)
     {
diff --git a/gcc/config/arm/thumb.c b/gcc/config/arm/thumb.c
index 62c4e6a..3dea3e9 100644
--- a/gcc/config/arm/thumb.c
+++ b/gcc/config/arm/thumb.c
@@ -121,7 +121,7 @@ int
 symbol_mentioned_p (x)
      rtx x;
 {
-  register char * fmt;
+  register const char * fmt;
   register int i;
 
   if (GET_CODE (x) == SYMBOL_REF)
@@ -150,7 +150,7 @@ int
 label_mentioned_p (x)
      rtx x;
 {
-  register char * fmt;
+  register const char * fmt;
   register int i;
 
   if (GET_CODE (x) == LABEL_REF)
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 3efedb6..ef1ba47 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -1454,7 +1454,7 @@ int
 symbolic_reference_mentioned_p (op)
      rtx op;
 {
-  register char *fmt;
+  register const char *fmt;
   register int i;
 
   if (GET_CODE (op) == SYMBOL_REF || GET_CODE (op) == LABEL_REF)
@@ -4513,7 +4513,7 @@ copy_all_rtx (orig)
   register rtx copy;
   register int i, j;
   register RTX_CODE code;
-  register char *format_ptr;
+  register const char *format_ptr;
 
   code = GET_CODE (orig);
 
@@ -5074,7 +5074,7 @@ int
 reg_mentioned_in_mem (reg, rtl)
      rtx reg, rtl;
 {
-  register char *fmt;
+  register const char *fmt;
   register int i, j;
   register enum rtx_code code;
 
diff --git a/gcc/config/ns32k/ns32k.c b/gcc/config/ns32k/ns32k.c
index af89e59..a0011f1 100644
--- a/gcc/config/ns32k/ns32k.c
+++ b/gcc/config/ns32k/ns32k.c
@@ -571,7 +571,7 @@ global_symbolic_reference_mentioned_p (op, f)
      rtx op;
      int f;
 {
-  register char *fmt;
+  register const char *fmt;
   register int i;
 
   if (GET_CODE (op) == SYMBOL_REF)
@@ -610,7 +610,7 @@ int
 symbolic_reference_mentioned_p (op)
      rtx op;
 {
-  register char *fmt;
+  register const char *fmt;
   register int i;
 
   if (GET_CODE (op) == SYMBOL_REF || GET_CODE (op) == LABEL_REF)
diff --git a/gcc/config/romp/romp.c b/gcc/config/romp/romp.c
index 0b1a2a3..a29d954 100644
--- a/gcc/config/romp/romp.c
+++ b/gcc/config/romp/romp.c
@@ -75,7 +75,7 @@ static int
 unsigned_comparisons_p (x)
      rtx x;
 {
-  register char *fmt;
+  register const char *fmt;
   register int len, i;
   register enum rtx_code code = GET_CODE (x);
 
@@ -1438,7 +1438,7 @@ hash_rtx (x)
   register unsigned int hash = (((int) GET_CODE (x) << 10)
 				+ ((int) GET_MODE (x) << 20));
   register int i;
-  register char *fmt = GET_RTX_FORMAT (GET_CODE (x));
+  register const char *fmt = GET_RTX_FORMAT (GET_CODE (x));
 
   for (i = 0; i < GET_RTX_LENGTH (GET_CODE (x)); i++)
     if (fmt[i] == 'e')
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index dd3db96..d9d39c1 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -2385,7 +2385,7 @@ regs_used (x, is_dest)
      rtx x; int is_dest;
 {
   enum rtx_code code;
-  char *fmt;
+  const char *fmt;
   int i, used = 0;
 
   if (! x)
@@ -4731,7 +4731,7 @@ mark_use (x, reg_set_block)
       break;
     default:
       {
-	char *fmt = GET_RTX_FORMAT (code);
+	const char *fmt = GET_RTX_FORMAT (code);
 	int i, j;
 	for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
 	  {
diff --git a/gcc/config/vax/vax.c b/gcc/config/vax/vax.c
index 4035d6a..4a9f06d 100644
--- a/gcc/config/vax/vax.c
+++ b/gcc/config/vax/vax.c
@@ -403,7 +403,7 @@ vax_rtx_cost (x)
   enum machine_mode mode = GET_MODE (x);
   register int c;
   int i = 0;				/* may be modified in switch */
-  char *fmt = GET_RTX_FORMAT (code);	/* may be modified in switch */
+  const char *fmt = GET_RTX_FORMAT (code); /* may be modified in switch */
 
   switch (code)
     {
diff --git a/gcc/cse.c b/gcc/cse.c
index 8fe9040..b6b8035 100644
--- a/gcc/cse.c
+++ b/gcc/cse.c
@@ -755,7 +755,7 @@ rtx_cost (x, outer_code)
 {
   register int i, j;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
   register int total;
 
   if (x == 0)
@@ -1059,7 +1059,7 @@ mention_regs (x)
 {
   register enum rtx_code code;
   register int i, j;
-  register char *fmt;
+  register const char *fmt;
   register int changed = 0;
 
   if (x == 0)
@@ -2099,7 +2099,7 @@ canon_hash (x, mode)
   register int i, j;
   register unsigned hash = 0;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   /* repeat is used to turn tail-recursion into iteration.  */
  repeat:
@@ -2309,7 +2309,7 @@ exp_equiv_p (x, y, validate, equal_values)
 {
   register int i, j;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   /* Note: it is incorrect to assume an expression is equivalent to itself
      if VALIDATE is nonzero.  */
@@ -2465,7 +2465,7 @@ refers_to_p (x, y)
 {
   register int i;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
  repeat:
   if (x == y)
@@ -2725,7 +2725,7 @@ canon_reg (x, insn)
 {
   register int i;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == 0)
     return x;
@@ -5000,7 +5000,7 @@ fold_rtx (x, insn)
 {
   register enum rtx_code code;
   register enum machine_mode mode;
-  register char *fmt;
+  register const char *fmt;
   register int i;
   rtx new = 0;
   int copied = 0;
@@ -8053,7 +8053,7 @@ cse_process_notes (x, object)
      rtx object;
 {
   enum rtx_code code = GET_CODE (x);
-  char *fmt = GET_RTX_FORMAT (code);
+  const char *fmt = GET_RTX_FORMAT (code);
   int i;
 
   switch (code)
@@ -9019,7 +9019,7 @@ count_reg_usage (x, counts, dest, incr)
      int incr;
 {
   enum rtx_code code;
-  char *fmt;
+  const char *fmt;
   int i, j;
 
   if (x == 0)
diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
index b3c63b5..cee784d 100644
--- a/gcc/emit-rtl.c
+++ b/gcc/emit-rtl.c
@@ -321,7 +321,7 @@ gen_rtx VPROTO((enum rtx_code code, enum machine_mode mode, ...))
 #endif
   va_list p;
   register int i;		/* Array indices...			*/
-  register char *fmt;		/* Current rtx's format...		*/
+  register const char *fmt;	/* Current rtx's format...		*/
   register rtx rt_val;		/* RTX to return to caller...		*/
 
   VA_START (p, mode);
@@ -1638,7 +1638,7 @@ copy_rtx_if_shared (orig)
   register rtx x = orig;
   register int i;
   register enum rtx_code code;
-  register char *format_ptr;
+  register const char *format_ptr;
   int copied = 0;
 
   if (x == 0)
@@ -1762,7 +1762,7 @@ reset_used_flags (x)
 {
   register int i, j;
   register enum rtx_code code;
-  register char *format_ptr;
+  register const char *format_ptr;
 
   if (x == 0)
     return;
diff --git a/gcc/final.c b/gcc/final.c
index a6dc137..6b0966a 100644
--- a/gcc/final.c
+++ b/gcc/final.c
@@ -4103,7 +4103,7 @@ leaf_renumber_regs_insn (in_rtx)
      register rtx in_rtx;
 {
   register int i, j;
-  register char *format_ptr;
+  register const char *format_ptr;
 
   if (in_rtx == 0)
     return;
diff --git a/gcc/flow.c b/gcc/flow.c
index 3d13baf..6b2be37 100644
--- a/gcc/flow.c
+++ b/gcc/flow.c
@@ -4012,7 +4012,7 @@ mark_used_regs (needed, live, x, final, insn)
   /* Recursively scan the operands of this expression.  */
 
   {
-    register char *fmt = GET_RTX_FORMAT (code);
+    register const char *fmt = GET_RTX_FORMAT (code);
     register int i;
     
     for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
@@ -4170,7 +4170,7 @@ find_use_as_address (x, reg, plusconst)
      HOST_WIDE_INT plusconst;
 {
   enum rtx_code code = GET_CODE (x);
-  char *fmt = GET_RTX_FORMAT (code);
+  const char *fmt = GET_RTX_FORMAT (code);
   register int i;
   register rtx value = 0;
   register rtx tem;
@@ -4230,7 +4230,7 @@ dump_flow_info (file)
      FILE *file;
 {
   register int i;
-  static char *reg_class_names[] = REG_CLASS_NAMES;
+  static const char * const reg_class_names[] = REG_CLASS_NAMES;
 
   fprintf (file, "%d registers.\n", max_regno);
   for (i = FIRST_PSEUDO_REGISTER; i < max_regno; i++)
@@ -4333,7 +4333,7 @@ dump_edge_info (file, e, do_succ)
 
   if (e->flags)
     {
-      static char * bitnames[] = {
+      static const char * const bitnames[] = {
 	"fallthru", "crit", "ab", "abcall", "eh", "fake"
       };
       int comma = 0;
@@ -4885,7 +4885,7 @@ count_reg_references (x)
   /* Recursively scan the operands of this expression.  */
 
   {
-    register char *fmt = GET_RTX_FORMAT (code);
+    register const char *fmt = GET_RTX_FORMAT (code);
     register int i;
     
     for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
diff --git a/gcc/function.c b/gcc/function.c
index e321cc5..6c5792a 100644
--- a/gcc/function.c
+++ b/gcc/function.c
@@ -1698,7 +1698,7 @@ fixup_var_refs_1 (var, promoted_mode, loc, insn, replacements)
   register int i;
   register rtx x = *loc;
   RTX_CODE code = GET_CODE (x);
-  register char *fmt;
+  register const char *fmt;
   register rtx tem, tem1;
   struct fixup_replacement *replacement;
 
@@ -2310,7 +2310,7 @@ walk_fixup_memory_subreg (x, insn, uncritical)
      int uncritical;
 {
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
   register int i;
 
   if (x == 0)
@@ -2352,7 +2352,7 @@ fixup_stack_1 (x, insn)
 {
   register int i;
   register RTX_CODE code = GET_CODE (x);
-  register char *fmt;
+  register const char *fmt;
 
   if (code == MEM)
     {
@@ -2708,7 +2708,7 @@ purge_addressof_1 (loc, insn, force, store, ht)
   rtx x;
   RTX_CODE code;
   int i, j;
-  char *fmt;
+  const char *fmt;
 
   /* Re-start here to avoid recursion in common cases.  */
  restart:
@@ -3333,7 +3333,7 @@ instantiate_virtual_regs_1 (loc, object, extra_insns)
   rtx temp;
   rtx seq;
   int i, j;
-  char *fmt;
+  const char *fmt;
 
   /* Re-start here to avoid recursion in common cases.  */
  restart:
diff --git a/gcc/gcse.c b/gcc/gcse.c
index 53b8114..6a248bc 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -1180,7 +1180,7 @@ oprs_unchanged_p (x, insn, avail_p)
 {
   int i;
   enum rtx_code code;
-  char *fmt;
+  const char *fmt;
 
   /* repeat is used to turn tail-recursion into iteration.  */
  repeat:
@@ -1323,7 +1323,7 @@ hash_expr_1 (x, mode, do_not_record_p)
   int i, j;
   unsigned hash = 0;
   enum rtx_code code;
-  char *fmt;
+  const char *fmt;
 
   /* repeat is used to turn tail-recursion into iteration.  */
  repeat:
@@ -1491,7 +1491,7 @@ expr_equiv_p (x, y)
 {
   register int i, j;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == y)
     return 1;
@@ -2325,7 +2325,7 @@ oprs_not_set_p (x, insn)
 {
   int i;
   enum rtx_code code;
-  char *fmt;
+  const char *fmt;
 
   /* repeat is used to turn tail-recursion into iteration.  */
 repeat:
@@ -2709,7 +2709,7 @@ expr_killed_p (x, bb)
 {
   int i;
   enum rtx_code code;
-  char *fmt;
+  const char *fmt;
 
   /* repeat is used to turn tail-recursion into iteration.  */
  repeat:
@@ -3374,7 +3374,7 @@ compute_transp (x, indx, bmap, set_p)
 {
   int bb,i;
   enum rtx_code code;
-  char *fmt;
+  const char *fmt;
 
   /* repeat is used to turn tail-recursion into iteration.  */
  repeat:
@@ -3560,7 +3560,7 @@ find_used_regs (x)
 {
   int i;
   enum rtx_code code;
-  char *fmt;
+  const char *fmt;
 
   /* repeat is used to turn tail-recursion into iteration.  */
  repeat:
@@ -4617,7 +4617,7 @@ add_label_notes (x, insn)
 {
   enum rtx_code code = GET_CODE (x);
   int i, j;
-  char *fmt;
+  const char *fmt;
 
   if (code == LABEL_REF && !LABEL_REF_NONLOCAL_P (x))
     {
diff --git a/gcc/genattrtab.c b/gcc/genattrtab.c
index fcb50c1..ef050af 100644
--- a/gcc/genattrtab.c
+++ b/gcc/genattrtab.c
@@ -543,7 +543,7 @@ attr_rtx VPROTO((enum rtx_code code, ...))
 #endif
   va_list p;
   register int i;		/* Array indices...			*/
-  register char *fmt;		/* Current rtx's format...		*/
+  register const char *fmt;		/* Current rtx's format...		*/
   register rtx rt_val;		/* RTX to return to caller...		*/
   int hashcode;
   register struct attr_hash *h;
@@ -830,7 +830,7 @@ attr_copy_rtx (orig)
   register rtx copy;
   register int i, j;
   register RTX_CODE code;
-  register char *format_ptr;
+  register const char *format_ptr;
 
   /* No need to copy a permanent object.  */
   if (RTX_INTEGRATED_P (orig))
@@ -2238,7 +2238,7 @@ encode_units_mask (x)
   register int i;
   register int j;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   code = GET_CODE (x);
 
@@ -4024,7 +4024,7 @@ clear_struct_flag (x)
   register int i;
   register int j;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   MEM_IN_STRUCT_P (x) = 0;
   if (RTX_UNCHANGING_P (x))
@@ -4082,7 +4082,7 @@ count_sub_rtxs (x, max)
   register int i;
   register int j;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
   int total = 0;
 
   code = GET_CODE (x);
@@ -4191,7 +4191,7 @@ count_alternatives (exp)
      rtx exp;
 {
   int i, j, n;
-  char *fmt;
+  const char *fmt;
   
   if (GET_CODE (exp) == MATCH_OPERAND)
     return n_comma_elts (XSTR (exp, 2));
@@ -4229,7 +4229,7 @@ compares_alternatives_p (exp)
      rtx exp;
 {
   int i, j;
-  char *fmt;
+  const char *fmt;
 
   if (GET_CODE (exp) == EQ_ATTR && XSTR (exp, 0) == alternative_name)
     return 1;
@@ -4262,7 +4262,7 @@ contained_in_p (inner, exp)
      rtx exp;
 {
   int i, j;
-  char *fmt;
+  const char *fmt;
 
   if (rtx_equal_p (inner, exp))
     return 1;
@@ -4790,7 +4790,7 @@ walk_attr_value (exp)
      rtx exp;
 {
   register int i, j;
-  register char *fmt;
+  register const char *fmt;
   RTX_CODE code;
 
   if (exp == NULL)
@@ -5139,7 +5139,7 @@ write_expr_attr_cache (p, attr)
      rtx p;
      struct attr_desc *attr;
 {
-  char *fmt;
+  const char *fmt;
   int i, ie, j, je;
 
   if (GET_CODE (p) == EQ_ATTR)
diff --git a/gcc/genconfig.c b/gcc/genconfig.c
index 9f79e58..d5e6f9b 100644
--- a/gcc/genconfig.c
+++ b/gcc/genconfig.c
@@ -73,7 +73,7 @@ walk_insn_part (part, recog_p, non_pc_set_src)
 {
   register int i, j;
   register RTX_CODE code;
-  register char *format_ptr;
+  register const char *format_ptr;
 
   if (part == 0)
     return;
diff --git a/gcc/genemit.c b/gcc/genemit.c
index bd98485..17f1d5d 100644
--- a/gcc/genemit.c
+++ b/gcc/genemit.c
@@ -81,7 +81,7 @@ max_operand_1 (x)
   register RTX_CODE code;
   register int i;
   register int len;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == 0)
     return;
@@ -154,7 +154,7 @@ gen_exp (x)
   register RTX_CODE code;
   register int i;
   register int len;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == 0)
     {
diff --git a/gcc/genextract.c b/gcc/genextract.c
index 24d3d51..1890958 100644
--- a/gcc/genextract.c
+++ b/gcc/genextract.c
@@ -190,7 +190,7 @@ walk_rtx (x, path)
   register RTX_CODE code;
   register int i;
   register int len;
-  register char *fmt;
+  register const char *fmt;
   int depth = strlen (path);
   char *newpath;
 
diff --git a/gcc/genflags.c b/gcc/genflags.c
index 636aafe..5f1dc34 100644
--- a/gcc/genflags.c
+++ b/gcc/genflags.c
@@ -61,7 +61,7 @@ num_operands (x)
   int count = 0;
   int i, j;
   enum rtx_code code = GET_CODE (x);
-  char *format_ptr = GET_RTX_FORMAT (code);
+  const char *format_ptr = GET_RTX_FORMAT (code);
 
   if (code == MATCH_OPERAND)
     return 1;
diff --git a/gcc/genoutput.c b/gcc/genoutput.c
index 8326383..d369f31 100644
--- a/gcc/genoutput.c
+++ b/gcc/genoutput.c
@@ -451,7 +451,7 @@ scan_operands (part, this_address_p, this_strict_low)
      int this_strict_low;
 {
   register int i, j;
-  register char *format_ptr;
+  register const char *format_ptr;
   int opno;
 
   if (part == 0)
diff --git a/gcc/genpeep.c b/gcc/genpeep.c
index 2ef2bd8..ff0cc5c 100644
--- a/gcc/genpeep.c
+++ b/gcc/genpeep.c
@@ -159,7 +159,7 @@ match_rtx (x, path, fail_label)
   register RTX_CODE code;
   register int i;
   register int len;
-  register char *fmt;
+  register const char *fmt;
   struct link link;
 
   if (x == 0)
diff --git a/gcc/genrecog.c b/gcc/genrecog.c
index 1a3c60d..ebe5d30 100644
--- a/gcc/genrecog.c
+++ b/gcc/genrecog.c
@@ -332,7 +332,7 @@ add_to_sequence (pattern, last, position)
     = (struct decision *) xmalloc (sizeof (struct decision));
   struct decision *this;
   char *newpos;
-  register char *fmt;
+  register const char *fmt;
   register size_t i;
   int depth = strlen (position);
   int len;
diff --git a/gcc/haifa-sched.c b/gcc/haifa-sched.c
index 1c60c72..3a5a64a 100644
--- a/gcc/haifa-sched.c
+++ b/gcc/haifa-sched.c
@@ -2582,7 +2582,7 @@ may_trap_exp (x, is_store)
     }
   else
     {
-      char *fmt;
+      const char *fmt;
       int i, insn_class = TRAP_FREE;
 
       /* neither store nor load, check if it may cause a trap */
@@ -3487,7 +3487,7 @@ sched_analyze_2 (x, insn)
   register int i;
   register int j;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == 0)
     return;
@@ -4563,7 +4563,7 @@ attach_deaths (x, insn, set_p)
   register int i;
   register int j;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == 0)
     return;
diff --git a/gcc/integrate.c b/gcc/integrate.c
index 70f69fe..594858a 100644
--- a/gcc/integrate.c
+++ b/gcc/integrate.c
@@ -954,7 +954,7 @@ save_constants (px)
 
   else
     {
-      char *fmt = GET_RTX_FORMAT (GET_CODE (x));
+      const char *fmt = GET_RTX_FORMAT (GET_CODE (x));
       int len = GET_RTX_LENGTH (GET_CODE (x));
 
       for (i = len-1; i >= 0; i--)
@@ -1017,7 +1017,7 @@ copy_for_inline (orig)
   register rtx new;
   register int i;
   register enum rtx_code code;
-  register char *format_ptr;
+  register const char *format_ptr;
 
   if (x == 0)
     return x;
@@ -2274,7 +2274,7 @@ copy_rtx_and_substitute (orig, map)
   register int i, j;
   register RTX_CODE code;
   register enum machine_mode mode;
-  register char *format_ptr;
+  register const char *format_ptr;
   int regno;
 
   if (orig == 0)
@@ -2819,7 +2819,7 @@ subst_constants (loc, insn, map)
   rtx x = *loc;
   register int i;
   register enum rtx_code code;
-  register char *format_ptr;
+  register const char *format_ptr;
   int num_changes = num_validated_changes ();
   rtx new = 0;
   enum machine_mode op0_mode = MAX_MACHINE_MODE;
@@ -3129,7 +3129,7 @@ restore_constants (px)
 {
   rtx x = *px;
   int i, j;
-  char *fmt;
+  const char *fmt;
 
   if (x == 0)
     return;
diff --git a/gcc/jump.c b/gcc/jump.c
index 35a70ca..d6f987b 100644
--- a/gcc/jump.c
+++ b/gcc/jump.c
@@ -3693,7 +3693,7 @@ mark_jump_label (x, insn, cross_jump)
 {
   register RTX_CODE code = GET_CODE (x);
   register int i;
-  register char *fmt;
+  register const char *fmt;
 
   switch (code)
     {
@@ -4345,7 +4345,7 @@ invert_exp (x, insn)
 {
   register RTX_CODE code;
   register int i;
-  register char *fmt;
+  register const char *fmt;
 
   code = GET_CODE (x);
 
@@ -4495,7 +4495,7 @@ redirect_exp (loc, olabel, nlabel, insn)
   register rtx x = *loc;
   register RTX_CODE code = GET_CODE (x);
   register int i;
-  register char *fmt;
+  register const char *fmt;
 
   if (code == LABEL_REF)
     {
@@ -4630,7 +4630,7 @@ rtx_renumbered_equal_p (x, y)
 {
   register int i;
   register RTX_CODE code = GET_CODE (x);
-  register char *fmt;
+  register const char *fmt;
       
   if (x == y)
     return 1;
@@ -5096,7 +5096,7 @@ rtx_equal_for_thread_p (x, y, yinsn)
   register int i;
   register int j;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   code = GET_CODE (x);
   /* Rtx's of different codes cannot be equal.  */
diff --git a/gcc/local-alloc.c b/gcc/local-alloc.c
index 9dccdaa..89e3f49 100644
--- a/gcc/local-alloc.c
+++ b/gcc/local-alloc.c
@@ -508,7 +508,7 @@ contains_replace_regs (x, reg_equiv_replace)
      char *reg_equiv_replace;
 {
   int i, j;
-  char *fmt;
+  const char *fmt;
   enum rtx_code code = GET_CODE (x);
 
   switch (code)
@@ -558,7 +558,7 @@ memref_referenced_p (memref, x)
      rtx memref;
 {
   int i, j;
-  char *fmt;
+  const char *fmt;
   enum rtx_code code = GET_CODE (x);
 
   switch (code)
diff --git a/gcc/loop.c b/gcc/loop.c
index 9c2ed73..db4664c 100644
--- a/gcc/loop.c
+++ b/gcc/loop.c
@@ -1189,7 +1189,7 @@ record_excess_regs (in_this, not_in_this, output)
      rtx *output;
 {
   enum rtx_code code;
-  char *fmt;
+  const char *fmt;
   int i;
 
   code = GET_CODE (in_this);
@@ -1588,7 +1588,7 @@ rtx_equal_for_loop_p (x, y, movables)
   register int j;
   register struct movable *m;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == y)
     return 1;
@@ -1701,7 +1701,7 @@ add_label_notes (x, insns)
 {
   enum rtx_code code = GET_CODE (x);
   int i, j;
-  char *fmt;
+  const char *fmt;
   rtx insn;
 
   if (code == LABEL_REF && !LABEL_REF_NONLOCAL_P (x))
@@ -2246,7 +2246,7 @@ replace_call_address (x, reg, addr)
 {
   register enum rtx_code code;
   register int i;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == 0)
     return;
@@ -2309,7 +2309,7 @@ count_nonfixed_reads (x)
 {
   register enum rtx_code code;
   register int i;
-  register char *fmt;
+  register const char *fmt;
   int value;
 
   if (x == 0)
@@ -3163,7 +3163,7 @@ invariant_p (x)
 {
   register int i;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
   int conditional = 0;
   rtx mem_list_entry;
 
@@ -3408,7 +3408,7 @@ find_single_use_in_loop (insn, x, usage)
      varray_type usage;
 {
   enum rtx_code code = GET_CODE (x);
-  char *fmt = GET_RTX_FORMAT (code);
+  const char *fmt = GET_RTX_FORMAT (code);
   int i, j;
 
   if (code == REG)
@@ -5207,7 +5207,7 @@ find_mem_givs (x, insn, not_every_iteration, loop_start, loop_end)
 {
   register int i, j;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == 0)
     return;
@@ -7102,7 +7102,7 @@ find_life_end (x, stats, insn, biv)
      struct recombine_givs_stats *stats;
 {
   enum rtx_code code;
-  char *fmt;
+  const char *fmt;
   int i, j;
   int retval;
 
@@ -8351,7 +8351,7 @@ maybe_eliminate_biv_1 (x, insn, bl, eliminate_p, where)
   rtx new;
 #endif
   int arg_operand;
-  char *fmt;
+  const char *fmt;
   int i, j;
 
   switch (code)
@@ -8744,7 +8744,7 @@ update_reg_last_use (x, insn)
   else
     {
       register int i, j;
-      register char *fmt = GET_RTX_FORMAT (GET_CODE (x));
+      register const char *fmt = GET_RTX_FORMAT (GET_CODE (x));
       for (i = GET_RTX_LENGTH (GET_CODE (x)) - 1; i >= 0; i--)
 	{
 	  if (fmt[i] == 'e')
diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c
index a6349f3..0d23a51 100644
--- a/gcc/print-rtl.c
+++ b/gcc/print-rtl.c
@@ -38,9 +38,9 @@ Boston, MA 02111-1307, USA.  */
 /* Array containing all of the register names */
 
 #ifdef DEBUG_REGISTER_NAMES
-static char *reg_names[] = DEBUG_REGISTER_NAMES;
+static const char * const reg_names[] = DEBUG_REGISTER_NAMES;
 #else
-static char *reg_names[] = REGISTER_NAMES;
+static const char * const reg_names[] = REGISTER_NAMES;
 #endif
 
 static FILE *outfile;
@@ -73,7 +73,7 @@ print_rtx (in_rtx)
 {
   register int i = 0;
   register int j;
-  register char *format_ptr;
+  register const char *format_ptr;
   register int is_insn;
 
   if (sawclose)
diff --git a/gcc/recog.c b/gcc/recog.c
index 6904852..9e06fb5 100644
--- a/gcc/recog.c
+++ b/gcc/recog.c
@@ -441,7 +441,7 @@ validate_replace_rtx_1 (loc, from, to, object)
      rtx from, to, object;
 {
   register int i, j;
-  register char *fmt;
+  register const char *fmt;
   register rtx x = *loc;
   enum rtx_code code = GET_CODE (x);
 
@@ -744,7 +744,7 @@ find_single_use_1 (dest, loc)
   rtx *result = 0;
   rtx *this_result;
   int i;
-  char *fmt;
+  const char *fmt;
 
   switch (code)
     {
diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c
index 766d7dc..4da5a7a 100644
--- a/gcc/reg-stack.c
+++ b/gcc/reg-stack.c
@@ -409,7 +409,7 @@ int
 stack_regs_mentioned_p (pat)
      rtx pat;
 {
-  register char *fmt;
+  register const char *fmt;
   register int i;
 
   if (STACK_REG_P (pat))
@@ -595,7 +595,7 @@ record_label_references (insn, pat)
 {
   register enum rtx_code code = GET_CODE (pat);
   register int i;
-  register char *fmt;
+  register const char *fmt;
 
   if (code == LABEL_REF)
     {
@@ -910,7 +910,7 @@ record_reg_life_pat (pat, src, dest, douse)
      HARD_REG_SET *src, *dest;
      int douse;
 {
-  register char *fmt;
+  register const char *fmt;
   register int i;
 
   if (STACK_REG_P (pat)
@@ -1736,7 +1736,7 @@ static void
 swap_rtx_condition (pat)
      rtx pat;
 {
-  register char *fmt;
+  register const char *fmt;
   register int i;
 
   if (GET_RTX_CLASS (GET_CODE (pat)) == '<')
@@ -2719,7 +2719,7 @@ goto_block_pat (insn, regstack, pat)
      default:
      {
       int i, j;
-      char *fmt = GET_RTX_FORMAT (GET_CODE (pat));
+      const char *fmt = GET_RTX_FORMAT (GET_CODE (pat));
 
       for (i = GET_RTX_LENGTH (GET_CODE (pat)) - 1; i >= 0; i--)
 	{
@@ -2929,7 +2929,7 @@ print_blocks (file, insn, pat)
 {
   register RTX_CODE code = GET_CODE (pat);
   register int i;
-  register char *fmt;
+  register const char *fmt;
 
   if (code == LABEL_REF)
     {
diff --git a/gcc/regclass.c b/gcc/regclass.c
index fc3de1c..6aa1857 100644
--- a/gcc/regclass.c
+++ b/gcc/regclass.c
@@ -587,7 +587,7 @@ fix_register (name, fixed, call_used)
 	   )
 	  && (fixed == 0 || call_used == 0))
 	{
-	  static char* what_option[2][2] = {
+	  static const char * const what_option[2][2] = {
 	    { "call-saved", "call-used" },
 	    { "no-such-option", "fixed" }};
 	  
@@ -1777,7 +1777,7 @@ record_address_regs (x, class, scale)
 
     default:
       {
-	register char *fmt = GET_RTX_FORMAT (code);
+	register const char *fmt = GET_RTX_FORMAT (code);
 	register int i;
 	for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
 	  if (fmt[i] == 'e')
@@ -2160,7 +2160,7 @@ reg_scan_mark_refs (x, insn, note_flag, min_regno)
 
     default:
       {
-	register char *fmt = GET_RTX_FORMAT (code);
+	register const char *fmt = GET_RTX_FORMAT (code);
 	register int i;
 	for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
 	  {
diff --git a/gcc/regmove.c b/gcc/regmove.c
index 8742c22..bff689e 100644
--- a/gcc/regmove.c
+++ b/gcc/regmove.c
@@ -2102,7 +2102,7 @@ stable_but_for_p (x, src, dst)
     case '<': case '1': case 'c': case '2': case 'b': case '3':
       {
 	int i;
-	char *fmt = GET_RTX_FORMAT (code);
+	const char *fmt = GET_RTX_FORMAT (code);
 	for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
 	  if (fmt[i] == 'e' && ! stable_but_for_p (XEXP (x, i), src, dst))
 	      return 0;
diff --git a/gcc/reload.c b/gcc/reload.c
index 3fecafd..6655a18 100644
--- a/gcc/reload.c
+++ b/gcc/reload.c
@@ -1626,7 +1626,7 @@ loc_mentioned_in_p (loc, in)
      rtx *loc, in;
 {
   enum rtx_code code = GET_CODE (in);
-  char *fmt = GET_RTX_FORMAT (code);
+  const char *fmt = GET_RTX_FORMAT (code);
   int i, j;
 
   for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
@@ -2075,7 +2075,7 @@ operands_match_p (x, y)
 {
   register int i;
   register RTX_CODE code = GET_CODE (x);
-  register char *fmt;
+  register const char *fmt;
   int success_2;
       
   if (x == y)
@@ -4381,7 +4381,7 @@ find_reloads_toplev (x, opnum, type, ind_levels, is_set_dest, insn)
 {
   register RTX_CODE code = GET_CODE (x);
 
-  register char *fmt = GET_RTX_FORMAT (code);
+  register const char *fmt = GET_RTX_FORMAT (code);
   register int i;
   int copied;
 
@@ -4961,7 +4961,7 @@ subst_reg_equivs (ad, insn)
 {
   register RTX_CODE code = GET_CODE (ad);
   register int i;
-  register char *fmt;
+  register const char *fmt;
 
   switch (code)
     {
@@ -5554,7 +5554,7 @@ find_reloads_address_1 (mode, x, context, loc, opnum, type, ind_levels, insn)
     }
 
   {
-    register char *fmt = GET_RTX_FORMAT (code);
+    register const char *fmt = GET_RTX_FORMAT (code);
     register int i;
 
     for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
@@ -5777,7 +5777,7 @@ copy_replacements (x, y)
 {
   int i, j;
   enum rtx_code code = GET_CODE (x);
-  char *fmt = GET_RTX_FORMAT (code);
+  const char *fmt = GET_RTX_FORMAT (code);
   struct replacement *r;
 
   /* We can't support X being a SUBREG because we might then need to know its
@@ -5897,7 +5897,7 @@ refers_to_regno_for_reload_p (regno, endregno, x, loc)
 {
   register int i;
   register RTX_CODE code;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == 0)
     return 0;
@@ -6070,7 +6070,7 @@ int
 refers_to_mem_for_reload_p (x)
      rtx x;
 {
-  char *fmt;
+  const char *fmt;
   int i;
 
   if (GET_CODE (x) == MEM)
@@ -6573,7 +6573,7 @@ find_inc_amount (x, inced)
      rtx x, inced;
 {
   register enum rtx_code code = GET_CODE (x);
-  register char *fmt;
+  register const char *fmt;
   register int i;
 
   if (code == MEM)
@@ -6638,7 +6638,7 @@ regno_clobbered_p (regno, insn)
   return 0;
 }
 
-static char *reload_when_needed_name[] =
+static const char *reload_when_needed_name[] =
 {
   "RELOAD_FOR_INPUT", 
   "RELOAD_FOR_OUTPUT", 
@@ -6653,7 +6653,7 @@ static char *reload_when_needed_name[] =
   "RELOAD_FOR_OTHER_ADDRESS"
 };
 
-static char *reg_class_names[] = REG_CLASS_NAMES;
+static const char * const reg_class_names[] = REG_CLASS_NAMES;
 
 /* These functions are used to print the variables set by 'find_reloads' */
 
@@ -6662,7 +6662,7 @@ debug_reload_to_stream (f)
      FILE *f;
 {
   int r;
-  char *prefix;
+  const char *prefix;
 
   if (! f)
     f = stderr;
diff --git a/gcc/reload1.c b/gcc/reload1.c
index edaa13f..26e4309 100644
--- a/gcc/reload1.c
+++ b/gcc/reload1.c
@@ -2706,7 +2706,7 @@ eliminate_regs (x, mem_mode, insn)
   int regno;
   rtx new;
   int i, j;
-  char *fmt;
+  const char *fmt;
   int copied = 0;
 
   if (! current_function_decl)
@@ -3987,7 +3987,7 @@ scan_paradoxical_subregs (x)
      register rtx x;
 {
   register int i;
-  register char *fmt;
+  register const char *fmt;
   register enum rtx_code code = GET_CODE (x);
 
   switch (code)
@@ -8134,7 +8134,7 @@ delete_address_reloads_1 (dead_insn, x, current_insn)
 
   if (code != REG)
     {
-      char *fmt= GET_RTX_FORMAT (code);
+      const char *fmt= GET_RTX_FORMAT (code);
       for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
 	{
 	  if (fmt[i] == 'e')
@@ -8393,7 +8393,7 @@ count_occurrences (x, find)
 {
   register int i, j;
   register enum rtx_code code;
-  register char *format_ptr;
+  register const char *format_ptr;
   int count;
 
   if (x == find)
@@ -8568,7 +8568,7 @@ reload_cse_mem_conflict_p (mem_base, val)
      rtx val;
 {
   enum rtx_code code;
-  char *fmt;
+  const char *fmt;
   int i;
 
   code = GET_CODE (val);
@@ -9859,7 +9859,7 @@ reload_combine_note_use (xp, insn)
 {
   rtx x = *xp;
   enum rtx_code code = x->code;
-  char *fmt;
+  const char *fmt;
   int i, j;
   rtx offset = const0_rtx; /* For the REG case below.  */
 
@@ -10234,7 +10234,7 @@ add_auto_inc_notes (insn, x)
      rtx x;
 {
   enum rtx_code code = GET_CODE (x);
-  char *fmt;
+  const char *fmt;
   int i, j;
 
   if (code == MEM && auto_inc_p (XEXP (x, 0)))
diff --git a/gcc/resource.c b/gcc/resource.c
index 8bbcff0..f49777e 100644
--- a/gcc/resource.c
+++ b/gcc/resource.c
@@ -184,7 +184,7 @@ mark_referenced_resources (x, res, include_delayed_effects)
 {
   register enum rtx_code code = GET_CODE (x);
   register int i, j;
-  register char *format_ptr;
+  register const char *format_ptr;
 
   /* Handle leaf items for which we set resource flags.  Also, special-case
      CALL, SET and CLOBBER operators.  */
@@ -591,7 +591,7 @@ mark_set_resources (x, res, in_dest, include_delayed_effects)
 {
   register enum rtx_code code;
   register int i, j;
-  register char *format_ptr;
+  register const char *format_ptr;
 
  restart:
 
diff --git a/gcc/rtl.c b/gcc/rtl.c
index ae92153..49f6035 100644
--- a/gcc/rtl.c
+++ b/gcc/rtl.c
@@ -134,7 +134,7 @@ enum machine_mode class_narrowest_mode[(int) MAX_MODE_CLASS];
    rtx's of that code.  The sequence is a C string in which
    each character describes one operand.  */
 
-char *rtx_format[] = {
+const char *rtx_format[] = {
   /* "*" undefined.
          can cause a warning message
      "0" field is unused (or used in a phase-dependent manner)
@@ -282,7 +282,7 @@ copy_rtx (orig)
   register rtx copy;
   register int i, j;
   register RTX_CODE code;
-  register char *format_ptr;
+  register const char *format_ptr;
 
   code = GET_CODE (orig);
 
@@ -410,7 +410,7 @@ copy_most_rtx (orig, may_share)
   register rtx copy;
   register int i, j;
   register RTX_CODE code;
-  register char *format_ptr;
+  register const char *format_ptr;
 
   if (orig == may_share)
     return orig;
@@ -665,7 +665,7 @@ read_rtx (infile)
 {
   register int i, j, list_counter;
   RTX_CODE tmp_code;
-  register char *format_ptr;
+  register const char *format_ptr;
   /* tmp_char is a buffer used for reading decimal integers
      and names of rtx types and machine modes.
      Therefore, 256 must be enough.  */
@@ -910,7 +910,7 @@ init_rtl ()
   int i;
 
   for (i = 0; i < NUM_RTX_CODE; i++)
-    rtx_length[i] = strlen (rtx_format[i]);
+    rtx_length[i] = strlen (GET_RTX_FORMAT(i));
 
   /* Make CONST_DOUBLE bigger, if real values are bigger than
      it normally expects to have room for.
diff --git a/gcc/rtl.h b/gcc/rtl.h
index c4a7cbe..a5cb387 100644
--- a/gcc/rtl.h
+++ b/gcc/rtl.h
@@ -54,7 +54,7 @@ extern int rtx_length[];
 extern const char * const rtx_name[];
 #define GET_RTX_NAME(CODE)		(rtx_name[(int) (CODE)])
 
-extern char *rtx_format[];
+extern const char *rtx_format[];
 #define GET_RTX_FORMAT(CODE)		(rtx_format[(int) (CODE)])
 
 extern char rtx_class[];
diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c
index a7d335b..8403afe 100644
--- a/gcc/rtlanal.c
+++ b/gcc/rtlanal.c
@@ -48,7 +48,7 @@ rtx_unstable_p (x)
 {
   register RTX_CODE code = GET_CODE (x);
   register int i;
-  register char *fmt;
+  register const char *fmt;
 
   if (code == MEM)
     return ! RTX_UNCHANGING_P (x);
@@ -84,7 +84,7 @@ rtx_varies_p (x)
 {
   register RTX_CODE code = GET_CODE (x);
   register int i;
-  register char *fmt;
+  register const char *fmt;
 
   switch (code)
     {
@@ -177,7 +177,7 @@ rtx_addr_varies_p (x)
 {
   register enum rtx_code code;
   register int i;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == 0)
     return 0;
@@ -252,7 +252,7 @@ int
 reg_mentioned_p (reg, in)
      register rtx reg, in;
 {
-  register char *fmt;
+  register const char *fmt;
   register int i;
   register enum rtx_code code;
 
@@ -528,7 +528,7 @@ regs_set_between_p (x, start, end)
      rtx start, end;
 {
   enum rtx_code code = GET_CODE (x);
-  char *fmt;
+  const char *fmt;
   int i, j;
 
   switch (code)
@@ -574,7 +574,7 @@ modified_between_p (x, start, end)
      rtx start, end;
 {
   enum rtx_code code = GET_CODE (x);
-  char *fmt;
+  const char *fmt;
   int i, j;
 
   switch (code)
@@ -629,7 +629,7 @@ modified_in_p (x, insn)
      rtx insn;
 {
   enum rtx_code code = GET_CODE (x);
-  char *fmt;
+  const char *fmt;
   int i, j;
 
   switch (code)
@@ -805,7 +805,7 @@ refers_to_regno_p (regno, endregno, x, loc)
 {
   register int i;
   register RTX_CODE code;
-  register char *fmt;
+  register const char *fmt;
 
  repeat:
   /* The contents of a REG_NONNEG note is always zero, so we must come here
@@ -933,7 +933,7 @@ reg_overlap_mentioned_p (x, in)
     regno = REGNO (x);
   else if (GET_CODE (x) == MEM)
     {
-      char *fmt;
+      const char *fmt;
       int i;
 
       if (GET_CODE (in) == MEM)
@@ -1079,7 +1079,7 @@ rtx_equal_p (x, y)
   register int i;
   register int j;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == y)
     return 1;
@@ -1612,7 +1612,7 @@ volatile_insn_p (x)
   /* Recursively scan the operands of this expression.  */
 
   {
-    register char *fmt = GET_RTX_FORMAT (code);
+    register const char *fmt = GET_RTX_FORMAT (code);
     register int i;
     
     for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
@@ -1678,7 +1678,7 @@ volatile_refs_p (x)
   /* Recursively scan the operands of this expression.  */
 
   {
-    register char *fmt = GET_RTX_FORMAT (code);
+    register const char *fmt = GET_RTX_FORMAT (code);
     register int i;
     
     for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
@@ -1753,7 +1753,7 @@ side_effects_p (x)
   /* Recursively scan the operands of this expression.  */
 
   {
-    register char *fmt = GET_RTX_FORMAT (code);
+    register const char *fmt = GET_RTX_FORMAT (code);
     register int i;
     
     for (i = GET_RTX_LENGTH (code) - 1; i >= 0; i--)
@@ -1783,7 +1783,7 @@ may_trap_p (x)
 {
   int i;
   enum rtx_code code;
-  char *fmt;
+  const char *fmt;
 
   if (x == 0)
     return 0;
@@ -1862,7 +1862,7 @@ int
 inequality_comparisons_p (x)
      rtx x;
 {
-  register char *fmt;
+  register const char *fmt;
   register int len, i;
   register enum rtx_code code = GET_CODE (x);
 
@@ -1926,7 +1926,7 @@ replace_rtx (x, from, to)
      rtx x, from, to;
 {
   register int i, j;
-  register char *fmt;
+  register const char *fmt;
 
   /* The following prevents loops occurrence when we change MEM in
      CONST_DOUBLE onto the same CONST_DOUBLE. */
@@ -1974,7 +1974,7 @@ replace_regs (x, reg_map, nregs, replace_dest)
 {
   register enum rtx_code code;
   register int i;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == 0)
     return x;
@@ -2082,7 +2082,7 @@ jmp_uses_reg_or_mem (x)
 {
   enum rtx_code code = GET_CODE (x);
   int i, j;
-  char *fmt;
+  const char *fmt;
 
   switch (code)
     {
@@ -2187,7 +2187,7 @@ for_each_rtx (x, f, data)
 {
   int result;
   int length;
-  char* format;
+  const char* format;
   int i;
 
   /* Call F on X.  */
@@ -2248,7 +2248,7 @@ regno_use_in (regno, x)
      int regno;
      rtx x;
 {
-  register char *fmt;
+  register const char *fmt;
   int i, j;
   rtx tem;
 
diff --git a/gcc/sched.c b/gcc/sched.c
index 21bb4b6..c438c02 100644
--- a/gcc/sched.c
+++ b/gcc/sched.c
@@ -1274,7 +1274,7 @@ sched_analyze_2 (x, insn)
   register int i;
   register int j;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == 0)
     return;
@@ -2245,7 +2245,7 @@ attach_deaths (x, insn, set_p)
   register int i;
   register int j;
   register enum rtx_code code;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == 0)
     return;
diff --git a/gcc/stupid.c b/gcc/stupid.c
index e111802..b95e135 100644
--- a/gcc/stupid.c
+++ b/gcc/stupid.c
@@ -600,7 +600,7 @@ stupid_mark_refs (x, chain)
      struct insn_chain *chain;
 {
   register RTX_CODE code;
-  register char *fmt;
+  register const char *fmt;
   register int regno, i;
   rtx insn = chain->insn;
 
diff --git a/gcc/unroll.c b/gcc/unroll.c
index 8bfd6b7..d1d4688 100644
--- a/gcc/unroll.c
+++ b/gcc/unroll.c
@@ -4006,7 +4006,7 @@ remap_split_bivs (x)
 {
   register enum rtx_code code;
   register int i;
-  register char *fmt;
+  register const char *fmt;
 
   if (x == 0)
     return x;
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 44c44d9..e4754dc 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -3760,7 +3760,7 @@ mark_constants (x)
      register rtx x;
 {
   register int i;
-  register char *format_ptr;
+  register const char *format_ptr;
 
   if (x == 0)
     return;
-- 
cgit v1.1