This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH 1/4] add const in more places
- From: tbsaunde+binutils at tbsaunde dot org
- To: binutils at sourceware dot org
- Cc: Trevor Saunders <tbsaunde+binutils at tbsaunde dot org>
- Date: Sat, 5 Mar 2016 22:10:15 -0500
- Subject: [PATCH 1/4] add const in more places
- Authentication-results: sourceware.org; auth=none
- References: <1457233818-6697-1-git-send-email-tbsaunde+binutils at tbsaunde dot org>
From: Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
gas/ChangeLog:
2016-03-05 Trevor Saunders <tbsaunde+binutils@tbsaunde.org>
* config/tc-arc.c: Add const qualifiers.
* config/tc-h8300.c (md_begin): Likewise.
* config/tc-ia64.c (print_prmask): Likewise.
* config/tc-msp430.c (msp430_operands): Likewise.
* config/tc-nds32.c (struct suffix_name): Likewise.
(struct nds32_parse_option_table): Likewise.
(struct nds32_set_option_table): Likewise.
(do_pseudo_pushpopm): Likewise.
(do_pseudo_pushpop_stack): Likewise.
(nds32_relax_relocs): Likewise.
(nds32_flag): Likewise.
(struct nds32_hint_map): Likewise.
(nds32_find_reloc_table): Likewise.
(nds32_match_hint_insn): Likewise.
* config/tc-s390.c: Likewise.
* config/tc-sh.c (get_specific): Likewise.
* config/tc-tic30.c: Likewise.
* config/tc-tic4x.c (tic4x_inst_add): Likewise.
(tic4x_indirect_parse): Likewise.
* config/tc-vax.c (vax_cons): Likewise.
* config/tc-z80.c (struct reg_entry): Likewise.
---
gas/config/tc-arc.c | 2 +-
gas/config/tc-h8300.c | 2 +-
gas/config/tc-ia64.c | 4 ++--
gas/config/tc-msp430.c | 2 +-
gas/config/tc-nds32.c | 50 +++++++++++++++++++++++++-------------------------
gas/config/tc-s390.c | 6 +++---
gas/config/tc-sh.c | 2 +-
gas/config/tc-tic30.c | 2 +-
gas/config/tc-tic4x.c | 12 ++++++------
gas/config/tc-vax.c | 2 +-
gas/config/tc-z80.c | 4 ++--
11 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c
index e509fec..0e92c55 100644
--- a/gas/config/tc-arc.c
+++ b/gas/config/tc-arc.c
@@ -2048,7 +2048,7 @@ md_assemble (char *str)
/* Callback to insert a register into the hash table. */
static void
-declare_register (char *name, int number)
+declare_register (const char *name, int number)
{
const char *err;
symbolS *regS = symbol_create (name, reg_section,
diff --git a/gas/config/tc-h8300.c b/gas/config/tc-h8300.c
index 5e6695f..1b075c4 100644
--- a/gas/config/tc-h8300.c
+++ b/gas/config/tc-h8300.c
@@ -266,7 +266,7 @@ md_begin (void)
{
struct h8_opcode *first_skipped = 0;
int len, cmplen = 0;
- char *src = p1->name;
+ const char *src = p1->name;
char *dst, *buffer;
if (p1->name == 0)
diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index 8169bce..e43a7f9 100644
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -3521,7 +3521,7 @@ dot_restorereg (int pred)
add_unwind_entry (output_spill_reg (ab, reg, 0, 0, qp), sep);
}
-static char *special_linkonce_name[] =
+static const char *special_linkonce_name[] =
{
".gnu.linkonce.ia64unw.", ".gnu.linkonce.ia64unwi."
};
@@ -5007,7 +5007,7 @@ static void
print_prmask (valueT mask)
{
int regno;
- char *comma = "";
+ const char *comma = "";
for (regno = 0; regno < 64; regno++)
{
if (mask & ((valueT) 1 << regno))
diff --git a/gas/config/tc-msp430.c b/gas/config/tc-msp430.c
index 4004b44..eb7df08 100644
--- a/gas/config/tc-msp430.c
+++ b/gas/config/tc-msp430.c
@@ -2542,7 +2542,7 @@ msp430_operands (struct msp430_opcode_s * opcode, char * line)
support it for compatibility purposes. */
if (addr_op && opcode->fmt >= 0)
{
- char * old_name = opcode->name;
+ const char * old_name = opcode->name;
char real_name[32];
sprintf (real_name, "%sa", old_name);
diff --git a/gas/config/tc-nds32.c b/gas/config/tc-nds32.c
index bc842da..774c470 100644
--- a/gas/config/tc-nds32.c
+++ b/gas/config/tc-nds32.c
@@ -71,7 +71,7 @@ struct nds32_relocs_pattern
/* Suffix name and relocation. */
struct suffix_name
{
- char *suffix;
+ const char *suffix;
short unsigned int reloc;
int pic;
};
@@ -1912,16 +1912,16 @@ size_t md_longopts_size = sizeof (md_longopts);
struct nds32_parse_option_table
{
const char *name; /* Option string. */
- char *help; /* Help description. */
- int (*func) (char *arg); /* How to parse it. */
+ const char *help; /* Help description. */
+ int (*func) (const char *arg); /* How to parse it. */
};
/* The value `-1' represents this option has *NOT* been set. */
#ifdef NDS32_DEFAULT_ARCH_NAME
-static char* nds32_arch_name = NDS32_DEFAULT_ARCH_NAME;
+static const char* nds32_arch_name = NDS32_DEFAULT_ARCH_NAME;
#else
-static char* nds32_arch_name = "v3";
+static const char* nds32_arch_name = "v3";
#endif
static int nds32_baseline = -1;
static int nds32_gpr16 = -1;
@@ -1934,10 +1934,10 @@ static int nds32_abi = -1;
static int nds32_elf_flags = 0;
static int nds32_fpu_com = 0;
-static int nds32_parse_arch (char *str);
-static int nds32_parse_baseline (char *str);
-static int nds32_parse_freg (char *str);
-static int nds32_parse_abi (char *str);
+static int nds32_parse_arch (const char *str);
+static int nds32_parse_baseline (const char *str);
+static int nds32_parse_freg (const char *str);
+static int nds32_parse_abi (const char *str);
static struct nds32_parse_option_table parse_opts [] =
{
@@ -1975,7 +1975,7 @@ static int nds32_relax_all = 1;
struct nds32_set_option_table
{
const char *name; /* Option string. */
- char *help; /* Help description. */
+ const char *help; /* Help description. */
int *var; /* Variable to be set. */
int value; /* Value to set. */
};
@@ -2174,7 +2174,7 @@ builtin_addend (const char *s, char *x ATTRIBUTE_UNUSED)
}
static void
-md_assemblef (char *format, ...)
+md_assemblef (const char *format, ...)
{
/* FIXME: hope this is long enough. */
char line[1024];
@@ -2189,7 +2189,7 @@ md_assemblef (char *format, ...)
}
/* Some prototypes here, since some op may use another op. */
-static void do_pseudo_li_internal (char *rt, int imm32s);
+static void do_pseudo_li_internal (const char *rt, int imm32s);
static void do_pseudo_move_reg_internal (char *dst, char *src);
static void
@@ -2385,7 +2385,7 @@ do_pseudo_la (int argc ATTRIBUTE_UNUSED, char *argv[], int pv ATTRIBUTE_UNUSED)
}
static void
-do_pseudo_li_internal (char *rt, int imm32s)
+do_pseudo_li_internal (const char *rt, int imm32s)
{
if (enable_16bit && imm32s <= 0xf && imm32s >= -0x10)
md_assemblef ("movi55 %s,%d", rt, imm32s);
@@ -2627,7 +2627,7 @@ do_pseudo_pushpopm (int argc, char *argv[], int pv ATTRIBUTE_UNUSED)
/* SMW.{b | a}{i | d}{m?} Rb, [Ra], Re, Enable4 */
int rb, re, ra, en4;
int i;
- char *opc = "pushpopm";
+ const char *opc = "pushpopm";
if (argc == 3)
as_bad ("'pushm/popm $ra5, $rb5, $label' is deprecated. "
@@ -2722,7 +2722,7 @@ do_pseudo_pushpop_stack (int argc, char *argv[], int pv)
int rb, re;
int en4;
int last_arg_index;
- char *opc = (pv == 0) ? "smw.adm" : "lmw.bim";
+ const char *opc = (pv == 0) ? "smw.adm" : "lmw.bim";
rb = re = 0;
@@ -3047,7 +3047,7 @@ end:
Thus, if the value of option has been set, keep the value the way it is. */
static int
-nds32_parse_arch (char *str)
+nds32_parse_arch (const char *str)
{
static const struct nds32_arch
{
@@ -3097,7 +3097,7 @@ nds32_parse_arch (char *str)
/* This function parses "baseline" specified. */
static int
-nds32_parse_baseline (char *str)
+nds32_parse_baseline (const char *str)
{
if (strcmp (str, "v3") == 0)
nds32_baseline = ISA_V3;
@@ -3118,7 +3118,7 @@ nds32_parse_baseline (char *str)
/* This function parses "fpu-freg" specified. */
static int
-nds32_parse_freg (char *str)
+nds32_parse_freg (const char *str)
{
if (strcmp (str, "2") == 0)
nds32_freg = E_NDS32_FPU_REG_32SP_16DP;
@@ -3141,7 +3141,7 @@ nds32_parse_freg (char *str)
/* This function parse "abi=" specified. */
static int
-nds32_parse_abi (char *str)
+nds32_parse_abi (const char *str)
{
if (strcmp (str, "v2") == 0)
nds32_abi = E_NDS_ABI_AABI;
@@ -3557,7 +3557,7 @@ nds32_relax_relocs (int relax)
char saved_char;
char *name;
int i;
- char *subtype_relax[] =
+ const char *subtype_relax[] =
{"", "", "ex9", "ifc"};
name = input_line_pointer;
@@ -3783,7 +3783,7 @@ nds32_flag (int ignore ATTRIBUTE_UNUSED)
char *name;
char saved_char;
int i;
- char *possible_flags[] = { "verbatim" };
+ const char *possible_flags[] = { "verbatim" };
/* Skip whitespaces. */
name = input_line_pointer;
@@ -4591,7 +4591,7 @@ enum nds32_insn_type
struct nds32_hint_map
{
bfd_reloc_code_real_type hi_type;
- char *opc;
+ const char *opc;
enum nds32_relax_hint_type hint_type;
enum nds32_br_range range;
enum nds32_insn_type insn_list;
@@ -4688,7 +4688,7 @@ nds32_find_reloc_table (struct nds32_relocs_pattern *relocs_pattern,
unsigned int opcode, seq_size;
enum nds32_br_range range;
struct nds32_relocs_pattern *pattern, *hi_pattern = NULL;
- char *opc = NULL;
+ const char *opc = NULL;
relax_info_t *relax_info = NULL;
nds32_relax_fixup_info_t *fixup_info, *hint_fixup;
enum nds32_relax_hint_type hint_type = NDS32_RELAX_HINT_NONE;
@@ -4697,7 +4697,7 @@ nds32_find_reloc_table (struct nds32_relocs_pattern *relocs_pattern,
enum nds32_insn_type relax_type = 0;
struct nds32_hint_map *map_ptr = hint_map;
unsigned int i;
- char *check_insn[] =
+ const char *check_insn[] =
{ "bnes38", "beqs38", "bnez38", "bnezs8", "beqz38", "beqzs8" };
/* TODO: PLT GOT. */
@@ -4859,7 +4859,7 @@ nds32_find_reloc_table (struct nds32_relocs_pattern *relocs_pattern,
static bfd_boolean
nds32_match_hint_insn (struct nds32_opcode *opcode, uint32_t seq)
{
- char *check_insn[] =
+ const char *check_insn[] =
{ "bnes38", "beqs38", "bnez38", "bnezs8", "beqz38", "beqzs8" };
uint32_t insn = opcode->value;
unsigned int i;
diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index fda96a2..8fcbb14 100644
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -33,7 +33,7 @@
#ifndef DEFAULT_ARCH
#define DEFAULT_ARCH "s390"
#endif
-static char *default_arch = DEFAULT_ARCH;
+static const char *default_arch = DEFAULT_ARCH;
/* Either 32 or 64, selects file format. */
static int s390_arch_size = 0;
@@ -705,7 +705,7 @@ s390_insert_operand (unsigned char *insn,
struct map_tls
{
- char *string;
+ const char *string;
int length;
bfd_reloc_code_real_type reloc;
};
@@ -780,7 +780,7 @@ elf_suffix_type;
struct map_bfd
{
- char *string;
+ const char *string;
int length;
elf_suffix_type suffix;
};
diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c
index 9da94a8..8f04c59 100644
--- a/gas/config/tc-sh.c
+++ b/gas/config/tc-sh.c
@@ -1677,7 +1677,7 @@ static sh_opcode_info *
get_specific (sh_opcode_info *opcode, sh_operand_info *operands)
{
sh_opcode_info *this_try = opcode;
- char *name = opcode->name;
+ const char *name = opcode->name;
int n = 0;
while (opcode->name)
diff --git a/gas/config/tc-tic30.c b/gas/config/tc-tic30.c
index 7439693..e069052 100644
--- a/gas/config/tc-tic30.c
+++ b/gas/config/tc-tic30.c
@@ -31,7 +31,7 @@
/* Put here all non-digit non-letter characters that may occur in an
operand. */
static char operand_special_chars[] = "%$-+(,)*._~/<>&^!:[@]";
-static char *ordinal_names[] =
+static const char *ordinal_names[] =
{
N_("first"), N_("second"), N_("third"), N_("fourth"), N_("fifth")
};
diff --git a/gas/config/tc-tic4x.c b/gas/config/tc-tic4x.c
index 0b62e07..0905658 100644
--- a/gas/config/tc-tic4x.c
+++ b/gas/config/tc-tic4x.c
@@ -618,7 +618,7 @@ tic4x_atof (char *str, char what_kind, LITTLENUM_TYPE *words)
}
static void
-tic4x_insert_reg (char *regname, int regnum)
+tic4x_insert_reg (const char *regname, int regnum)
{
char buf[32];
int i;
@@ -634,7 +634,7 @@ tic4x_insert_reg (char *regname, int regnum)
}
static void
-tic4x_insert_sym (char *symname, int value)
+tic4x_insert_sym (const char *symname, int value)
{
symbolS *symbolP;
@@ -1239,7 +1239,7 @@ tic4x_inst_insert (const tic4x_inst_t *inst)
/* Make a new instruction template. */
static tic4x_inst_t *
-tic4x_inst_make (char *name, unsigned long opcode, char *args)
+tic4x_inst_make (const char *name, unsigned long opcode, char *args)
{
static tic4x_inst_t *insts = NULL;
static char *names = NULL;
@@ -1271,7 +1271,7 @@ tic4x_inst_make (char *name, unsigned long opcode, char *args)
static int
tic4x_inst_add (const tic4x_inst_t *insts)
{
- char *s = insts->name;
+ const char *s = insts->name;
char *d;
unsigned int i;
int ok = 1;
@@ -1295,7 +1295,7 @@ tic4x_inst_add (const tic4x_inst_t *insts)
{
tic4x_inst_t *inst;
int k = 0;
- char *c = tic4x_conds[i].name;
+ const char *c = tic4x_conds[i].name;
char *e = d;
while (*c)
@@ -1407,7 +1407,7 @@ static int
tic4x_indirect_parse (tic4x_operand_t *operand,
const tic4x_indirect_t *indirect)
{
- char *n = indirect->name;
+ const char *n = indirect->name;
char *s = input_line_pointer;
char *b;
symbolS *symbolP;
diff --git a/gas/config/tc-vax.c b/gas/config/tc-vax.c
index f04ad61..b2e4926 100644
--- a/gas/config/tc-vax.c
+++ b/gas/config/tc-vax.c
@@ -3274,7 +3274,7 @@ bfd_reloc_code_real_type
vax_cons (expressionS *exp, int size)
{
char *save;
- char *vax_cons_special_reloc;
+ const char *vax_cons_special_reloc;
SKIP_WHITESPACE ();
vax_cons_special_reloc = NULL;
diff --git a/gas/config/tc-z80.c b/gas/config/tc-z80.c
index ca38568..281cc71 100644
--- a/gas/config/tc-z80.c
+++ b/gas/config/tc-z80.c
@@ -163,7 +163,7 @@ static symbolS * zero;
struct reg_entry
{
- char* name;
+ const char* name;
int number;
};
#define R_STACKABLE (0x80)
@@ -408,7 +408,7 @@ typedef const char * (asfunc)(char, char, const char*);
typedef struct _table_t
{
- char* name;
+ const char* name;
char prefix;
char opcode;
asfunc * fp;
--
2.1.4