From 08c762a3eb8079e45a0a05353bb0f26e3eaa1f65 Mon Sep 17 00:00:00 2001
From: ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 1 Nov 1999 01:47:41 +0000
Subject: [PATCH] * hard-reg-set.h (reg_names): Constify a char*.
* regclass.c (reg_names): Likewise.
* regs.h (reg_names): Likewise
* a29k/a29k.c (reg_names): Delete declaration.
* a29k/a29k.h (CONDITIONAL_REGISTER_USAGE): Constify a char*.
* arc/arc.c (arc_save_restore, arc_output_function_prologue,
arc_output_function_epilogue): Likewise.
* elxsi/elxsi.c (reg_names): Likewise.
* gmicro/gmicro.h (FUNCTION_PROLOGUE, FUNCTION_EPILOGUE): Likewise.
* m32r/m32r.c (m32r_output_function_epilogue, emit_cond_move):
Likewise.
* m88k/m88k.c (output_function_profiler): Likewise.
* sparc/sparc.c (sparc_flat_output_function_prologue,
sparc_flat_output_function_epilogue): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30303 138bc75d-0d04-0410-961f-82ee72b054a4
---
gcc/ChangeLog | 27 +++++++++++++++++++++++++++
gcc/config/a29k/a29k.c | 3 ---
gcc/config/a29k/a29k.h | 2 +-
gcc/config/arc/arc.c | 12 ++++++------
gcc/config/elxsi/elxsi.c | 2 +-
gcc/config/gmicro/gmicro.h | 4 ++--
gcc/config/m32r/m32r.c | 6 +++---
gcc/config/m88k/m88k.c | 2 +-
gcc/config/sparc/sparc.c | 8 ++++----
gcc/hard-reg-set.h | 2 +-
gcc/regclass.c | 2 +-
gcc/regs.h | 2 +-
12 files changed, 48 insertions(+), 24 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3130b80fc749..b4c4f7136c7c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,30 @@
+Sun Oct 31 20:42:17 1999 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+
+ * hard-reg-set.h (reg_names): Constify a char*.
+
+ * regclass.c (reg_names): Likewise.
+
+ * regs.h (reg_names): Likewise
+
+ * a29k/a29k.c (reg_names): Delete declaration.
+
+ * a29k/a29k.h (CONDITIONAL_REGISTER_USAGE): Constify a char*.
+
+ * arc/arc.c (arc_save_restore, arc_output_function_prologue,
+ arc_output_function_epilogue): Likewise.
+
+ * elxsi/elxsi.c (reg_names): Likewise.
+
+ * gmicro/gmicro.h (FUNCTION_PROLOGUE, FUNCTION_EPILOGUE): Likewise.
+
+ * m32r/m32r.c (m32r_output_function_epilogue, emit_cond_move):
+ Likewise.
+
+ * m88k/m88k.c (output_function_profiler): Likewise.
+
+ * sparc/sparc.c (sparc_flat_output_function_prologue,
+ sparc_flat_output_function_epilogue): Likewise.
+
Sun Oct 31 13:32:15 CET 1999 Marc Lehmann <pcg@goof.com>
* toplev.c (rest_of_compilation): Seperate the setjmp/vfork clobber
diff --git a/gcc/config/a29k/a29k.c b/gcc/config/a29k/a29k.c
index d930363f12db..2caa3a686279 100644
--- a/gcc/config/a29k/a29k.c
+++ b/gcc/config/a29k/a29k.c
@@ -83,9 +83,6 @@ int a29k_debug_reg_map[FIRST_PSEUDO_REGISTER];
rtx a29k_compare_op0, a29k_compare_op1;
int a29k_compare_fp_p;
-
-/* Gives names for registers. */
-extern char *reg_names[];
/* Returns 1 if OP is a 8-bit constant. */
diff --git a/gcc/config/a29k/a29k.h b/gcc/config/a29k/a29k.h
index 4ea977c5fbe0..03e2c6253c58 100644
--- a/gcc/config/a29k/a29k.h
+++ b/gcc/config/a29k/a29k.h
@@ -591,7 +591,7 @@ enum reg_class { NO_REGS, LR0_REGS, GENERAL_REGS, BP_REGS, FC_REGS, CR_REGS,
#define CONDITIONAL_REGISTER_USAGE \
{ \
- char *p; \
+ const char *p; \
int i; \
\
if (TARGET_KERNEL_REGISTERS) \
diff --git a/gcc/config/arc/arc.c b/gcc/config/arc/arc.c
index 372ba0429b6f..8e9c30e46397 100644
--- a/gcc/config/arc/arc.c
+++ b/gcc/config/arc/arc.c
@@ -1061,10 +1061,10 @@ arc_compute_frame_size (size)
void
arc_save_restore (file, base_reg, offset, gmask, op)
FILE *file;
- char *base_reg;
+ const char *base_reg;
unsigned int offset;
unsigned int gmask;
- char *op;
+ const char *op;
{
int regno;
@@ -1089,8 +1089,8 @@ arc_output_function_prologue (file, size)
FILE *file;
int size;
{
- char *sp_str = reg_names[STACK_POINTER_REGNUM];
- char *fp_str = reg_names[FRAME_POINTER_REGNUM];
+ const char *sp_str = reg_names[STACK_POINTER_REGNUM];
+ const char *fp_str = reg_names[FRAME_POINTER_REGNUM];
unsigned int gmask = current_frame_info.gmask;
enum arc_function_type fn_type = arc_compute_function_type (current_function_decl);
@@ -1197,8 +1197,8 @@ arc_output_function_epilogue (file, size)
unsigned int frame_size = size - pretend_size;
int restored, fp_restored_p;
int can_trust_sp_p = !current_function_calls_alloca;
- char *sp_str = reg_names[STACK_POINTER_REGNUM];
- char *fp_str = reg_names[FRAME_POINTER_REGNUM];
+ const char *sp_str = reg_names[STACK_POINTER_REGNUM];
+ const char *fp_str = reg_names[FRAME_POINTER_REGNUM];
/* ??? There are lots of optimizations that can be done here.
EG: Use fp to restore regs if it's closer.
diff --git a/gcc/config/elxsi/elxsi.c b/gcc/config/elxsi/elxsi.c
index 8362e48b7631..77dac67da0b5 100644
--- a/gcc/config/elxsi/elxsi.c
+++ b/gcc/config/elxsi/elxsi.c
@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA. */
#include "rtl.h"
#include "function.h"
-extern char *reg_names[];
+extern const char *reg_names[];
rtx cmp_op0=0, cmp_op1=0;
/* table of relations for compares and branches */
diff --git a/gcc/config/gmicro/gmicro.h b/gcc/config/gmicro/gmicro.h
index 529d3cc8fdf5..e0f226664ae1 100644
--- a/gcc/config/gmicro/gmicro.h
+++ b/gcc/config/gmicro/gmicro.h
@@ -635,7 +635,7 @@ extern enum reg_class regno_reg_class[];
{ register int regno; \
register int mask = 0; \
register int nregs = 0; \
- static char *reg_names[] = REGISTER_NAMES; \
+ static const char * const reg_names[] = REGISTER_NAMES; \
extern char call_used_regs[]; \
int fsize = ((SIZE) + 3) & -4; \
for (regno = 0; regno < 16; regno++) \
@@ -737,7 +737,7 @@ extern enum reg_class regno_reg_class[];
register int nregs, nfregs; \
int offset, foffset; \
extern char call_used_regs[]; \
- static char *reg_names[] = REGISTER_NAMES; \
+ static const char * const reg_names[] = REGISTER_NAMES; \
int fsize = ((SIZE) + 3) & -4; \
FUNCTION_EXTRA_EPILOGUE (FILE, SIZE); \
nfregs = 0; fmask = 0; \
diff --git a/gcc/config/m32r/m32r.c b/gcc/config/m32r/m32r.c
index e737608a02c8..4b2315714ad0 100644
--- a/gcc/config/m32r/m32r.c
+++ b/gcc/config/m32r/m32r.c
@@ -1774,8 +1774,8 @@ m32r_output_function_epilogue (file, size)
unsigned int args_size = current_frame_info.args_size;
unsigned int gmask = current_frame_info.gmask;
int can_trust_sp_p = !current_function_calls_alloca;
- char * sp_str = reg_names[STACK_POINTER_REGNUM];
- char * fp_str = reg_names[FRAME_POINTER_REGNUM];
+ const char * sp_str = reg_names[STACK_POINTER_REGNUM];
+ const char * fp_str = reg_names[FRAME_POINTER_REGNUM];
/* The first thing to do is point the sp at the bottom of the register
save area. */
@@ -2311,7 +2311,7 @@ emit_cond_move (operands, insn)
rtx insn ATTRIBUTE_UNUSED;
{
static char buffer [100];
- char * dest = reg_names [REGNO (operands [0])];
+ const char * dest = reg_names [REGNO (operands [0])];
buffer [0] = 0;
diff --git a/gcc/config/m88k/m88k.c b/gcc/config/m88k/m88k.c
index ddc80506b1b3..d33c6bcc50d4 100644
--- a/gcc/config/m88k/m88k.c
+++ b/gcc/config/m88k/m88k.c
@@ -2373,7 +2373,7 @@ output_function_profiler (file, labelno, name, savep)
{
char label[256];
char dbi[256];
- char *temp = (savep ? reg_names[2] : reg_names[10]);
+ const char *temp = (savep ? reg_names[2] : reg_names[10]);
/* Remember to update FUNCTION_PROFILER_LENGTH. */
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index 34f5e4ee2608..09256d2c49b1 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -5938,7 +5938,7 @@ sparc_flat_output_function_prologue (file, size)
FILE *file;
int size;
{
- char *sp_str = reg_names[STACK_POINTER_REGNUM];
+ const char *sp_str = reg_names[STACK_POINTER_REGNUM];
unsigned long gmask = current_frame_info.gmask;
sparc_output_scratch_registers (file);
@@ -5977,7 +5977,7 @@ sparc_flat_output_function_prologue (file, size)
if (size > 0)
{
unsigned int reg_offset = current_frame_info.reg_offset;
- char *fp_str = reg_names[FRAME_POINTER_REGNUM];
+ const char *fp_str = reg_names[FRAME_POINTER_REGNUM];
const char *t1_str = "%g1";
/* Things get a little tricky if local variables take up more than ~4096
@@ -6155,8 +6155,8 @@ sparc_flat_output_function_epilogue (file, size)
{
unsigned int reg_offset = current_frame_info.reg_offset;
unsigned int size1;
- char *sp_str = reg_names[STACK_POINTER_REGNUM];
- char *fp_str = reg_names[FRAME_POINTER_REGNUM];
+ const char *sp_str = reg_names[STACK_POINTER_REGNUM];
+ const char *fp_str = reg_names[FRAME_POINTER_REGNUM];
const char *t1_str = "%g1";
/* In the reload sequence, we don't need to fill the load delay
diff --git a/gcc/hard-reg-set.h b/gcc/hard-reg-set.h
index 5064dbcc041b..8d1ca75a0ac2 100644
--- a/gcc/hard-reg-set.h
+++ b/gcc/hard-reg-set.h
@@ -467,4 +467,4 @@ extern int n_non_fixed_regs;
/* Vector indexed by hardware reg giving its name. */
-extern char *reg_names[FIRST_PSEUDO_REGISTER];
+extern const char *reg_names[FIRST_PSEUDO_REGISTER];
diff --git a/gcc/regclass.c b/gcc/regclass.c
index 824f1662019e..7cfa62eb3748 100644
--- a/gcc/regclass.c
+++ b/gcc/regclass.c
@@ -158,7 +158,7 @@ enum reg_class reg_class_superunion[N_REG_CLASSES][N_REG_CLASSES];
/* Array containing all of the register names */
-char *reg_names[] = REGISTER_NAMES;
+const char *reg_names[] = REGISTER_NAMES;
/* For each hard register, the widest mode object that it can contain.
This will be a MODE_INT mode if the register can hold integers. Otherwise
diff --git a/gcc/regs.h b/gcc/regs.h
index e551dae8cbd9..d0f7446a584c 100644
--- a/gcc/regs.h
+++ b/gcc/regs.h
@@ -138,7 +138,7 @@ extern char regs_ever_live[FIRST_PSEUDO_REGISTER];
/* Vector indexed by hardware reg giving its name. */
-extern char *reg_names[FIRST_PSEUDO_REGISTER];
+extern const char *reg_names[FIRST_PSEUDO_REGISTER];
/* For each hard register, the widest mode object that it can contain.
This will be a MODE_INT mode if the register can hold integers. Otherwise
--
GitLab