This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
Don't use register keyword
- From: Alan Modra <amodra at gmail dot com>
- To: binutils at sourceware dot org
- Date: Tue, 4 Nov 2014 23:12:26 +1030
- Subject: Don't use register keyword
- Authentication-results: sourceware.org; auth=none
This was commit ed9e98c2 which also included an accidental regenerate
of gas/po/gas.pot (found when my email to the list bounced). I guess
a regen doesn't hurt.
* expr.c (expr_symbol_where): Don't use register keyword.
* app.c (app_push, app_pop, do_scrub_chars): Likewise.
* ecoff.c (add_string, add_ecoff_symbol, add_aux_sym_symint,
add_aux_sym_rndx, add_aux_sym_tir, add_procedure, add_file,
ecoff_build_lineno, ecoff_setup_ext, allocate_cluster.
allocate_scope, allocate_vlinks, allocate_shash,
allocate_thash, allocate_tag, allocate_forward, allocate_thead,
allocate_lineno_list): Likewise.
* frags.c (frag_more, frag_var, frag_variant, frag_wane): Likewise.
* input-file.c (input_file_push, input_file_pop): Likewise.
* input-scrub.c (input_scrub_push, input_scrub_next_buffer): Likewise.
* subsegs.c (subseg_change): Likewise.
* symbols.c (colon, symbol_table_insert, symbol_find_or_make)
(dollar_label_name, fb_label_name): Likewise.
* write.c (relax_align): Likewise.
* config/tc-alpha.c (s_alpha_pdesc): Likewise.
* config/tc-bfin.c (bfin_s_bss): Likewise.
* config/tc-i860.c (md_estimate_size_before_relax): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-m68k.c (m68k_ip, crack_operand): Likewise.
(md_convert_frag_1, s_even): Likewise.
* config/tc-mips.c (mips_clear_insn_labels): Likewise.
* config/tc-mn10200.c (md_begin): Likewise.
* config/tc-s390.c (s390_setup_opcodes, md_begin): Likewise.
* config/tc-sh.c (sh_elf_cons): Likewise.
* config/tc-tic4x.c (tic4x_cons, tic4x_stringer): Likewise.
* config/m68k-parse.y (m68k_reg_parse): Likewise. Convert from K&R.
(yylex, m68k_ip_op, yyerror): Convert from K&R.
diff --git a/gas/app.c b/gas/app.c
index 32a172f..d5a10c1 100644
--- a/gas/app.c
+++ b/gas/app.c
@@ -247,7 +247,7 @@ struct app_save
char *
app_push (void)
{
- register struct app_save *saved;
+ struct app_save *saved;
saved = (struct app_save *) xmalloc (sizeof (*saved));
saved->state = state;
@@ -284,7 +284,7 @@ app_push (void)
void
app_pop (char *arg)
{
- register struct app_save *saved = (struct app_save *) arg;
+ struct app_save *saved = (struct app_save *) arg;
/* There is no do_scrub_end (). */
state = saved->state;
@@ -360,7 +360,7 @@ do_scrub_chars (size_t (*get) (char *, size_t), char *tostart, size_t tolen)
char *from;
char *fromend;
size_t fromlen;
- register int ch, ch2 = 0;
+ int ch, ch2 = 0;
/* Character that started the string we're working on. */
static char quotechar;
diff --git a/gas/config/m68k-parse.y b/gas/config/m68k-parse.y
index d5c59a1..3c7051c 100644
--- a/gas/config/m68k-parse.y
+++ b/gas/config/m68k-parse.y
@@ -685,8 +685,7 @@ static char *strorig;
*CCP. Otherwise don't change *CCP, and return 0. */
static enum m68k_register
-m68k_reg_parse (ccp)
- register char **ccp;
+m68k_reg_parse (char **ccp)
{
char *start = *ccp;
char c;
@@ -748,7 +747,7 @@ m68k_reg_parse (ccp)
/* The lexer. */
static int
-yylex ()
+yylex (void)
{
enum m68k_register reg;
char *s;
@@ -1091,9 +1090,7 @@ yylex ()
from outside this file. */
int
-m68k_ip_op (s, oparg)
- char *s;
- struct m68k_op *oparg;
+m68k_ip_op (char *s, struct m68k_op *oparg)
{
memset (oparg, 0, sizeof *oparg);
oparg->error = NULL;
@@ -1111,8 +1108,7 @@ m68k_ip_op (s, oparg)
/* The error handler. */
static void
-yyerror (s)
- const char *s;
+yyerror (const char *s)
{
op->error = s;
}
diff --git a/gas/config/tc-alpha.c b/gas/config/tc-alpha.c
index ea6aa19..f91c4ca 100644
--- a/gas/config/tc-alpha.c
+++ b/gas/config/tc-alpha.c
@@ -4482,7 +4482,7 @@ s_alpha_pdesc (int ignore ATTRIBUTE_UNUSED)
{
char *name;
char name_end;
- register char *p;
+ char *p;
expressionS exp;
symbolS *entry_sym;
const char *entry_sym_name;
diff --git a/gas/config/tc-bfin.c b/gas/config/tc-bfin.c
index 447a477..6646482 100644
--- a/gas/config/tc-bfin.c
+++ b/gas/config/tc-bfin.c
@@ -111,7 +111,7 @@ bfin_pic_ptr (int nbytes)
static void
bfin_s_bss (int ignore ATTRIBUTE_UNUSED)
{
- register int temp;
+ int temp;
temp = get_absolute_expression ();
subseg_set (bss_section, (subsegT) temp);
diff --git a/gas/config/tc-i860.c b/gas/config/tc-i860.c
index 1b55b80..dd51c26 100644
--- a/gas/config/tc-i860.c
+++ b/gas/config/tc-i860.c
@@ -1028,7 +1028,7 @@ md_number_to_chars (char *buf, valueT val, int n)
/* This should never be called for i860. */
int
-md_estimate_size_before_relax (register fragS *fragP ATTRIBUTE_UNUSED,
+md_estimate_size_before_relax (fragS *fragP ATTRIBUTE_UNUSED,
segT segtype ATTRIBUTE_UNUSED)
{
as_fatal (_("relaxation not supported\n"));
diff --git a/gas/config/tc-m68hc11.c b/gas/config/tc-m68hc11.c
index 3641912..9026ff4 100644
--- a/gas/config/tc-m68hc11.c
+++ b/gas/config/tc-m68hc11.c
@@ -3958,7 +3958,7 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, asection *sec ATTRIBUTE_UNUSED,
char *buffer_address = fragP->fr_literal;
/* Address in object code of the displacement. */
- register int object_address = fragP->fr_fix + fragP->fr_address;
+ int object_address = fragP->fr_fix + fragP->fr_address;
buffer_address += fragP->fr_fix;
diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index 7fc4efe..dbcd87b 100644
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -1395,11 +1395,11 @@ static struct hash_control *op_hash;
static void
m68k_ip (char *instring)
{
- register char *p;
- register struct m68k_op *opP;
- register const struct m68k_incant *opcode;
- register const char *s;
- register int tmpreg = 0, baseo = 0, outro = 0, nextword;
+ char *p;
+ struct m68k_op *opP;
+ const struct m68k_incant *opcode;
+ const char *s;
+ int tmpreg = 0, baseo = 0, outro = 0, nextword;
char *pdot, *pdotmove;
enum m68k_size siz1, siz2;
char c;
@@ -3955,9 +3955,9 @@ install_gen_operand (int mode, int val)
static char *
crack_operand (char *str, struct m68k_op *opP)
{
- register int parens;
- register int c;
- register char *beg_str;
+ int parens;
+ int c;
+ char *beg_str;
int inquote = 0;
if (!str)
@@ -5033,12 +5033,12 @@ md_convert_frag_1 (fragS *fragP)
fixS *fixP = NULL;
/* Address in object code of the displacement. */
- register int object_address = fragP->fr_fix + fragP->fr_address;
+ int object_address = fragP->fr_fix + fragP->fr_address;
/* Address in gas core of the place to store the displacement. */
/* This convinces the native rs6000 compiler to generate the code we
want. */
- register char *buffer_address = fragP->fr_literal;
+ char *buffer_address = fragP->fr_literal;
buffer_address += fragP->fr_fix;
/* End ibm compiler workaround. */
@@ -5663,8 +5663,8 @@ s_bss (int ignore ATTRIBUTE_UNUSED)
static void
s_even (int ignore ATTRIBUTE_UNUSED)
{
- register int temp;
- register long temp_fill;
+ int temp;
+ long temp_fill;
temp = 1; /* JF should be 2? */
temp_fill = get_absolute_expression ();
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 355a566..607689b 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -1861,7 +1861,7 @@ static void mips_compressed_mark_labels (void);
static inline void
mips_clear_insn_labels (void)
{
- register struct insn_label_list **pl;
+ struct insn_label_list **pl;
segment_info_type *si;
if (now_seg)
diff --git a/gas/config/tc-mn10200.c b/gas/config/tc-mn10200.c
index f76fb08..7462d93 100644
--- a/gas/config/tc-mn10200.c
+++ b/gas/config/tc-mn10200.c
@@ -686,7 +686,7 @@ void
md_begin (void)
{
char *prev_name = "";
- register const struct mn10200_opcode *op;
+ const struct mn10200_opcode *op;
mn10200_hash = hash_new ();
diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index 59f6ab6..60a7dac 100644
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -489,7 +489,7 @@ md_show_usage (FILE *stream)
static void
s390_setup_opcodes (void)
{
- register const struct s390_opcode *op;
+ const struct s390_opcode *op;
const struct s390_opcode *op_end;
bfd_boolean dup_insn = FALSE;
const char *retval;
@@ -536,7 +536,7 @@ s390_setup_opcodes (void)
void
md_begin (void)
{
- register const struct s390_opcode *op;
+ const struct s390_opcode *op;
const struct s390_opcode *op_end;
const char *retval;
diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c
index 6e9ae92..888a51f 100644
--- a/gas/config/tc-sh.c
+++ b/gas/config/tc-sh.c
@@ -811,7 +811,7 @@ sh_cons_fix_new (fragS *frag, int off, int size, expressionS *exp,
/* Clobbers input_line_pointer, checks end-of-line. */
/* NBYTES 1=.byte, 2=.word, 4=.long */
static void
-sh_elf_cons (register int nbytes)
+sh_elf_cons (int nbytes)
{
expressionS exp;
diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index 758fcc8..e3fd64a 100644
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -863,9 +863,9 @@ cmp_reg_entry (const void *parg, const void *qarg)
void
md_begin (void)
{
- register const char *retval = NULL;
+ const char *retval = NULL;
int lose = 0;
- register unsigned int i = 0;
+ unsigned int i = 0;
/* We don't get a chance to initialize anything before md_parse_option
is called, and it may not be called, so handle default initialization
diff --git a/gas/config/tc-tic30.c b/gas/config/tc-tic30.c
index dbcbf3c..436aaeb 100644
--- a/gas/config/tc-tic30.c
+++ b/gas/config/tc-tic30.c
@@ -1116,7 +1116,7 @@ md_estimate_size_before_relax (fragS *fragP ATTRIBUTE_UNUSED,
void
md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED,
segT sec ATTRIBUTE_UNUSED,
- register fragS *fragP ATTRIBUTE_UNUSED)
+ fragS *fragP ATTRIBUTE_UNUSED)
{
debug ("In md_convert_frag()\n");
}
diff --git a/gas/config/tc-tic4x.c b/gas/config/tc-tic4x.c
index dc82168..12d8ec9 100644
--- a/gas/config/tc-tic4x.c
+++ b/gas/config/tc-tic4x.c
@@ -831,7 +831,7 @@ tic4x_globl (int ignore ATTRIBUTE_UNUSED)
static void
tic4x_cons (int bytes)
{
- register unsigned int c;
+ unsigned int c;
do
{
SKIP_WHITESPACE ();
@@ -875,7 +875,7 @@ static void
tic4x_stringer (int append_zero)
{
int bytes;
- register unsigned int c;
+ unsigned int c;
bytes = 0;
do
diff --git a/gas/ecoff.c b/gas/ecoff.c
index 771c8b5..fe7ad05 100644
--- a/gas/ecoff.c
+++ b/gas/ecoff.c
@@ -1552,8 +1552,8 @@ add_string (varray_t *vp, /* string obstack */
const char *str, /* string */
shash_t **ret_hash /* return hash pointer */)
{
- register unsigned long len = strlen (str);
- register shash_t *hash_ptr;
+ unsigned long len = strlen (str);
+ shash_t *hash_ptr;
if (len >= PAGE_USIZE)
as_fatal (_("string too big (%lu bytes)"), len);
@@ -1561,7 +1561,7 @@ add_string (varray_t *vp, /* string obstack */
hash_ptr = (shash_t *) hash_find (hash_tbl, str);
if (hash_ptr == (shash_t *) NULL)
{
- register const char *err;
+ const char *err;
if (vp->objects_last_page + len >= PAGE_USIZE)
{
@@ -1604,12 +1604,12 @@ add_ecoff_symbol (const char *str, /* symbol name */
symint_t indx /* index to local/aux. syms */)
{
localsym_t *psym;
- register scope_t *pscope;
- register thead_t *ptag_head;
- register tag_t *ptag;
- register tag_t *ptag_next;
- register varray_t *vp;
- register int scope_delta = 0;
+ scope_t *pscope;
+ thead_t *ptag_head;
+ tag_t *ptag;
+ tag_t *ptag_next;
+ varray_t *vp;
+ int scope_delta = 0;
shash_t *hash_ptr = (shash_t *) NULL;
if (cur_file_ptr == (efdr_t *) NULL)
@@ -1802,8 +1802,8 @@ add_ecoff_symbol (const char *str, /* symbol name */
static symint_t
add_aux_sym_symint (symint_t aux_word /* auxiliary information word */)
{
- register varray_t *vp;
- register aux_t *aux_ptr;
+ varray_t *vp;
+ aux_t *aux_ptr;
if (cur_file_ptr == (efdr_t *) NULL)
as_fatal (_("no current file pointer"));
@@ -1825,8 +1825,8 @@ add_aux_sym_symint (symint_t aux_word /* auxiliary information word */)
static symint_t
add_aux_sym_rndx (int file_index, symint_t sym_index)
{
- register varray_t *vp;
- register aux_t *aux_ptr;
+ varray_t *vp;
+ aux_t *aux_ptr;
if (cur_file_ptr == (efdr_t *) NULL)
as_fatal (_("no current file pointer"));
@@ -1852,8 +1852,8 @@ add_aux_sym_tir (type_info_t *t, /* current type information */
hash_state_t state, /* whether to hash type or not */
thash_t **hash_tbl /* pointer to hash table to use */)
{
- register varray_t *vp;
- register aux_t *aux_ptr;
+ varray_t *vp;
+ aux_t *aux_ptr;
static AUXU init_aux;
symint_t ret;
int i;
@@ -1900,8 +1900,8 @@ add_aux_sym_tir (type_info_t *t, /* current type information */
if (state != hash_no)
{
- register thash_t *hash_ptr;
- register symint_t hi;
+ thash_t *hash_ptr;
+ symint_t hi;
hi = aux.isym & ((1 << HASHBITS) - 1);
hi %= THASH_SIZE;
@@ -1957,9 +1957,9 @@ add_aux_sym_tir (type_info_t *t, /* current type information */
|| t->basic_type == bt_Union
|| t->basic_type == bt_Enum)
{
- register symint_t file_index = t->tag_ptr->ifd;
- register localsym_t *sym = t->tag_ptr->sym;
- register forward_t *forward_ref = allocate_forward ();
+ symint_t file_index = t->tag_ptr->ifd;
+ localsym_t *sym = t->tag_ptr->sym;
+ forward_t *forward_ref = allocate_forward ();
if (sym != (localsym_t *) NULL)
{
@@ -2114,8 +2114,8 @@ add_unknown_tag (tag_t *ptag /* pointer to tag information */)
static void
add_procedure (char *func /* func name */)
{
- register varray_t *vp;
- register proc_t *new_proc_ptr;
+ varray_t *vp;
+ proc_t *new_proc_ptr;
symbolS *sym;
#ifdef ECOFF_DEBUG
@@ -2184,8 +2184,8 @@ ecoff_get_cur_proc_sym (void)
static void
add_file (const char *file_name, int indx ATTRIBUTE_UNUSED, int fake)
{
- register int first_ch;
- register efdr_t *fil_ptr;
+ int first_ch;
+ efdr_t *fil_ptr;
#ifdef ECOFF_DEBUG
if (debug)
@@ -3667,7 +3667,7 @@ ecoff_build_lineno (const struct ecoff_debug_swap *backend,
long *linecntptr)
{
char *bufptr;
- register lineno_list_t *l;
+ lineno_list_t *l;
lineno_list_t *last;
efdr_t *file;
proc_t *proc;
@@ -4592,7 +4592,7 @@ ecoff_build_fdr (const struct ecoff_debug_swap *backend,
static void
ecoff_setup_ext (void)
{
- register symbolS *sym;
+ symbolS *sym;
for (sym = symbol_rootP; sym != (symbolS *) NULL; sym = symbol_next (sym))
{
@@ -4788,7 +4788,7 @@ ecoff_build_debug (HDRR *hdr,
static page_type *
allocate_cluster (unsigned long npages)
{
- register page_type *value = (page_type *) xmalloc (npages * PAGE_USIZE);
+ page_type *value = (page_type *) xmalloc (npages * PAGE_USIZE);
#ifdef ECOFF_DEBUG
if (debug > 3)
@@ -4837,7 +4837,7 @@ allocate_page (void)
static scope_t *
allocate_scope (void)
{
- register scope_t *ptr;
+ scope_t *ptr;
static scope_t initial_scope;
#ifndef MALLOC_CHECK
@@ -4847,8 +4847,8 @@ allocate_scope (void)
alloc_counts[(int) alloc_type_scope].free_list.f_scope = ptr->free;
else
{
- register int unallocated = alloc_counts[(int) alloc_type_scope].unallocated;
- register page_type *cur_page = alloc_counts[(int) alloc_type_scope].cur_page;
+ int unallocated = alloc_counts[(int) alloc_type_scope].unallocated;
+ page_type *cur_page = alloc_counts[(int) alloc_type_scope].cur_page;
if (unallocated == 0)
{
@@ -4892,13 +4892,13 @@ free_scope (scope_t *ptr)
static vlinks_t *
allocate_vlinks (void)
{
- register vlinks_t *ptr;
+ vlinks_t *ptr;
static vlinks_t initial_vlinks;
#ifndef MALLOC_CHECK
- register int unallocated = alloc_counts[(int) alloc_type_vlinks].unallocated;
- register page_type *cur_page = alloc_counts[(int) alloc_type_vlinks].cur_page;
+ int unallocated = alloc_counts[(int) alloc_type_vlinks].unallocated;
+ page_type *cur_page = alloc_counts[(int) alloc_type_vlinks].cur_page;
if (unallocated == 0)
{
@@ -4926,13 +4926,13 @@ allocate_vlinks (void)
static shash_t *
allocate_shash (void)
{
- register shash_t *ptr;
+ shash_t *ptr;
static shash_t initial_shash;
#ifndef MALLOC_CHECK
- register int unallocated = alloc_counts[(int) alloc_type_shash].unallocated;
- register page_type *cur_page = alloc_counts[(int) alloc_type_shash].cur_page;
+ int unallocated = alloc_counts[(int) alloc_type_shash].unallocated;
+ page_type *cur_page = alloc_counts[(int) alloc_type_shash].cur_page;
if (unallocated == 0)
{
@@ -4960,13 +4960,13 @@ allocate_shash (void)
static thash_t *
allocate_thash (void)
{
- register thash_t *ptr;
+ thash_t *ptr;
static thash_t initial_thash;
#ifndef MALLOC_CHECK
- register int unallocated = alloc_counts[(int) alloc_type_thash].unallocated;
- register page_type *cur_page = alloc_counts[(int) alloc_type_thash].cur_page;
+ int unallocated = alloc_counts[(int) alloc_type_thash].unallocated;
+ page_type *cur_page = alloc_counts[(int) alloc_type_thash].cur_page;
if (unallocated == 0)
{
@@ -4994,7 +4994,7 @@ allocate_thash (void)
static tag_t *
allocate_tag (void)
{
- register tag_t *ptr;
+ tag_t *ptr;
static tag_t initial_tag;
#ifndef MALLOC_CHECK
@@ -5004,8 +5004,8 @@ allocate_tag (void)
alloc_counts[(int) alloc_type_tag].free_list.f_tag = ptr->free;
else
{
- register int unallocated = alloc_counts[(int) alloc_type_tag].unallocated;
- register page_type *cur_page = alloc_counts[(int) alloc_type_tag].cur_page;
+ int unallocated = alloc_counts[(int) alloc_type_tag].unallocated;
+ page_type *cur_page = alloc_counts[(int) alloc_type_tag].cur_page;
if (unallocated == 0)
{
@@ -5049,13 +5049,13 @@ free_tag (tag_t *ptr)
static forward_t *
allocate_forward (void)
{
- register forward_t *ptr;
+ forward_t *ptr;
static forward_t initial_forward;
#ifndef MALLOC_CHECK
- register int unallocated = alloc_counts[(int) alloc_type_forward].unallocated;
- register page_type *cur_page = alloc_counts[(int) alloc_type_forward].cur_page;
+ int unallocated = alloc_counts[(int) alloc_type_forward].unallocated;
+ page_type *cur_page = alloc_counts[(int) alloc_type_forward].cur_page;
if (unallocated == 0)
{
@@ -5083,7 +5083,7 @@ allocate_forward (void)
static thead_t *
allocate_thead (void)
{
- register thead_t *ptr;
+ thead_t *ptr;
static thead_t initial_thead;
#ifndef MALLOC_CHECK
@@ -5093,8 +5093,8 @@ allocate_thead (void)
alloc_counts[(int) alloc_type_thead].free_list.f_thead = ptr->free;
else
{
- register int unallocated = alloc_counts[(int) alloc_type_thead].unallocated;
- register page_type *cur_page = alloc_counts[(int) alloc_type_thead].cur_page;
+ int unallocated = alloc_counts[(int) alloc_type_thead].unallocated;
+ page_type *cur_page = alloc_counts[(int) alloc_type_thead].cur_page;
if (unallocated == 0)
{
@@ -5136,13 +5136,13 @@ free_thead (thead_t *ptr)
static lineno_list_t *
allocate_lineno_list (void)
{
- register lineno_list_t *ptr;
+ lineno_list_t *ptr;
static lineno_list_t initial_lineno_list;
#ifndef MALLOC_CHECK
- register int unallocated = alloc_counts[(int) alloc_type_lineno].unallocated;
- register page_type *cur_page = alloc_counts[(int) alloc_type_lineno].cur_page;
+ int unallocated = alloc_counts[(int) alloc_type_lineno].unallocated;
+ page_type *cur_page = alloc_counts[(int) alloc_type_lineno].cur_page;
if (unallocated == 0)
{
diff --git a/gas/expr.c b/gas/expr.c
index 0ccfbd3..b8266fc 100644
--- a/gas/expr.c
+++ b/gas/expr.c
@@ -124,7 +124,7 @@ make_expr_symbol (expressionS *expressionP)
int
expr_symbol_where (symbolS *sym, char **pfile, unsigned int *pline)
{
- register struct expr_symbol_line *l;
+ struct expr_symbol_line *l;
for (l = expr_symbol_lines; l != NULL; l = l->next)
{
diff --git a/gas/frags.c b/gas/frags.c
index defa853..beaceee 100644
--- a/gas/frags.c
+++ b/gas/frags.c
@@ -206,13 +206,13 @@ frag_new (size_t old_frags_var_max_size
char *
frag_more (size_t nchars)
{
- register char *retval;
+ char *retval;
frag_alloc_check (&frchain_now->frch_obstack);
frag_grow (nchars);
retval = obstack_next_free (&frchain_now->frch_obstack);
obstack_blank_fast (&frchain_now->frch_obstack, nchars);
- return (retval);
+ return retval;
}
/* Close the current frag, setting its fields for a relaxable frag. Start a
@@ -254,7 +254,7 @@ frag_var (relax_stateT type, size_t max_chars, size_t var,
relax_substateT subtype, symbolS *symbol, offsetT offset,
char *opcode)
{
- register char *retval;
+ char *retval;
frag_grow (max_chars);
retval = obstack_next_free (&frchain_now->frch_obstack);
@@ -272,7 +272,7 @@ frag_variant (relax_stateT type, size_t max_chars, size_t var,
relax_substateT subtype, symbolS *symbol, offsetT offset,
char *opcode)
{
- register char *retval;
+ char *retval;
retval = obstack_next_free (&frchain_now->frch_obstack);
frag_var_init (type, max_chars, var, subtype, symbol, offset, opcode);
@@ -283,7 +283,7 @@ frag_variant (relax_stateT type, size_t max_chars, size_t var,
/* Reduce the variable end of a frag to a harmless state. */
void
-frag_wane (register fragS *fragP)
+frag_wane (fragS *fragP)
{
fragP->fr_type = rs_fill;
fragP->fr_offset = 0;
diff --git a/gas/input-file.c b/gas/input-file.c
index 354ff56..f1f2ec5 100644
--- a/gas/input-file.c
+++ b/gas/input-file.c
@@ -79,7 +79,7 @@ input_file_buffer_size (void)
char *
input_file_push (void)
{
- register struct saved_file *saved;
+ struct saved_file *saved;
saved = (struct saved_file *) xmalloc (sizeof *saved);
@@ -98,7 +98,7 @@ input_file_push (void)
void
input_file_pop (char *arg)
{
- register struct saved_file *saved = (struct saved_file *) arg;
+ struct saved_file *saved = (struct saved_file *) arg;
input_file_end (); /* Close out old file. */
diff --git a/gas/input-scrub.c b/gas/input-scrub.c
index 042005a..5388e81 100644
--- a/gas/input-scrub.c
+++ b/gas/input-scrub.c
@@ -137,7 +137,7 @@ static struct input_save *next_saved_file;
static struct input_save *
input_scrub_push (char *saved_position)
{
- register struct input_save *saved;
+ struct input_save *saved;
saved = (struct input_save *) xmalloc (sizeof *saved);
@@ -311,7 +311,7 @@ input_scrub_close (void)
char *
input_scrub_next_buffer (char **bufp)
{
- register char *limit; /*->just after last char of buffer. */
+ char *limit; /*->just after last char of buffer. */
if (sb_index != (size_t) -1)
{
@@ -354,7 +354,7 @@ input_scrub_next_buffer (char **bufp)
+ partial_size);
if (limit)
{
- register char *p; /* Find last newline. */
+ char *p; /* Find last newline. */
/* Terminate the buffer to avoid confusing TC_EOL_IN_INSN. */
*limit = '\0';
for (p = limit - 1; *p != '\n' || TC_EOL_IN_INSN (p); --p)
diff --git a/gas/subsegs.c b/gas/subsegs.c
index eb79195..0e0a755 100644
--- a/gas/subsegs.c
+++ b/gas/subsegs.c
@@ -55,7 +55,7 @@ subsegs_begin (void)
* segment context correct.
*/
void
-subseg_change (register segT seg, register int subseg)
+subseg_change (segT seg, int subseg)
{
segment_info_type *seginfo = seg_info (seg);
now_seg = seg;
diff --git a/gas/symbols.c b/gas/symbols.c
index 6af8604..69fda99 100644
--- a/gas/symbols.c
+++ b/gas/symbols.c
@@ -265,7 +265,7 @@ colon (/* Just seen "x:" - rattle symbols & frags. */
const char *sym_name /* Symbol name, as a cannonical string. */
/* We copy this string: OK to alter later. */)
{
- register symbolS *symbolP; /* Symbol we are working with. */
+ symbolS *symbolP; /* Symbol we are working with. */
/* Sun local labels go out of scope whenever a non-local symbol is
defined. */
@@ -482,7 +482,7 @@ colon (/* Just seen "x:" - rattle symbols & frags. */
void
symbol_table_insert (symbolS *symbolP)
{
- register const char *error_string;
+ const char *error_string;
know (symbolP);
know (S_GET_NAME (symbolP));
@@ -510,7 +510,7 @@ symbol_table_insert (symbolS *symbolP)
symbolS *
symbol_find_or_make (const char *name)
{
- register symbolS *symbolP;
+ symbolS *symbolP;
symbolP = symbol_find (name);
@@ -1662,14 +1662,14 @@ define_dollar_label (long label)
of ^A. */
char * /* Return local label name. */
-dollar_label_name (register long n, /* we just saw "n$:" : n a number. */
- register int augend /* 0 for current instance, 1 for new instance. */)
+dollar_label_name (long n, /* we just saw "n$:" : n a number. */
+ int augend /* 0 for current instance, 1 for new instance. */)
{
long i;
/* Returned to caller, then copied. Used for created names ("4f"). */
static char symbol_name_build[24];
- register char *p;
- register char *q;
+ char *p;
+ char *q;
char symbol_name_temporary[20]; /* Build up a number, BACKWARDS. */
know (n >= 0);
@@ -1835,8 +1835,8 @@ fb_label_name (long n, /* We just saw "n:", "nf" or "nb" : n a number. */
long i;
/* Returned to caller, then copied. Used for created names ("4f"). */
static char symbol_name_build[24];
- register char *p;
- register char *q;
+ char *p;
+ char *q;
char symbol_name_temporary[20]; /* Build up a number, BACKWARDS. */
know (n >= 0);
diff --git a/gas/write.c b/gas/write.c
index 0f82d47..0d80c58 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -2304,8 +2304,8 @@ relax_frag (segT segment, fragS *fragP, long stretch)
/* Relax_align. Advance location counter to next address that has 'alignment'
lowest order bits all 0s, return size of adjustment made. */
static relax_addressT
-relax_align (register relax_addressT address, /* Address now. */
- register int alignment /* Alignment (binary). */)
+relax_align (relax_addressT address, /* Address now. */
+ int alignment /* Alignment (binary). */)
{
relax_addressT mask;
relax_addressT new_address;
--
Alan Modra
Australia Development Lab, IBM