diff options
| -rw-r--r-- | gas/ChangeLog | 13 | ||||
| -rw-r--r-- | gas/as.h | 2 | ||||
| -rw-r--r-- | gas/cgen.c | 6 | ||||
| -rw-r--r-- | gas/cgen.h | 2 | ||||
| -rw-r--r-- | gas/dwarf2dbg.c | 2 | ||||
| -rw-r--r-- | gas/frags.h | 2 | ||||
| -rw-r--r-- | gas/gasp.c | 2 | ||||
| -rw-r--r-- | gas/macro.c | 48 | ||||
| -rw-r--r-- | gas/read.c | 2 | ||||
| -rw-r--r-- | gas/stabs.c | 12 | ||||
| -rw-r--r-- | gas/symbols.c | 8 |
11 files changed, 56 insertions, 43 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index b4e4340174..4ca7841dae 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,16 @@ +2002-05-02 Kazu Hirata <kazu@cs.umass.edu> + + * as.h: Fix formatting. + * cgen.c: Likewise. + * cgen.h: Likewise. + * dwarf2dbg.c: Likewise. + * frags.h: Likewise. + * gasp.c: Likewise. + * macro.c: Likewise. + * read.c: Likewise. + * stabs.c: Likewise. + * symbols.c: Likewise. + 2002-05-02 Alan Modra <amodra@bigpond.net.au> * app.c (mri_pseudo): Only declare for TC_M68K. @@ -168,7 +168,7 @@ extern char **environ; /* Hack to make "gcc -Wall" not complain about obstack macros. */ #if !defined (memcpy) && !defined (bcopy) -#define bcopy(src,dest,size) memcpy(dest,src,size) +#define bcopy(src,dest,size) memcpy (dest, src, size) #endif /* Make Saber happier on obstack.h. */ diff --git a/gas/cgen.c b/gas/cgen.c index 75138a4503..67b9b16186 100644 --- a/gas/cgen.c +++ b/gas/cgen.c @@ -105,8 +105,8 @@ queue_fixup (opindex, opinfo, expP) to keep track of how many fixup chains have been stored and which elements of the array they are in. - The algorithms used are the same as in the old scheme. Other than the - "array-ness" of the whole thing, the functionality is identical to the + The algorithms used are the same as in the old scheme. Other than the + "array-ness" of the whole thing, the functionality is identical to the old scheme. gas_cgen_initialize_saved_fixups_array(): @@ -173,7 +173,7 @@ gas_cgen_restore_fixups (i) } num_fixups = stored_fixups[i].num_fixups_in_chain; - memcpy (fixups,stored_fixups[i].fixup_chain, + memcpy (fixups, stored_fixups[i].fixup_chain, (sizeof (stored_fixups[i].fixup_chain[0])) * num_fixups); stored_fixups[i].num_fixups_in_chain = 0; } diff --git a/gas/cgen.h b/gas/cgen.h index 97cd38d61e..9d814b785c 100644 --- a/gas/cgen.h +++ b/gas/cgen.h @@ -53,7 +53,7 @@ extern const char * gas_cgen_parse_operand /* Call this from md_assemble to initialize the assembler callback. */ extern void gas_cgen_init_parse PARAMS ((void)); -/* Routines and macros for saving fixup chains. */ +/* Routines and macros for saving fixup chains. */ extern void gas_cgen_save_fixups PARAMS ((int)); extern void gas_cgen_restore_fixups PARAMS ((int)); extern void gas_cgen_swap_fixups PARAMS ((int)); diff --git a/gas/dwarf2dbg.c b/gas/dwarf2dbg.c index 81cbf8a7d2..2037be3912 100644 --- a/gas/dwarf2dbg.c +++ b/gas/dwarf2dbg.c @@ -241,7 +241,7 @@ dwarf2_gen_line_info (ofs, loc) symbols apply to assembler code. It is necessary to emit duplicate line symbols when a compiler asks for them, because GDB uses them to determine the end of the prologue. */ - if (debug_type == DEBUG_DWARF2 + if (debug_type == DEBUG_DWARF2 && line == loc->line && filenum == loc->filenum) return; diff --git a/gas/frags.h b/gas/frags.h index df259b8fe5..9d52ae8357 100644 --- a/gas/frags.h +++ b/gas/frags.h @@ -38,7 +38,7 @@ struct obstack; of a particular frag}+offset. BUG: it may be smarter to have a single pointer off to various different - notes for different frag kinds. See how code pans. */ + notes for different frag kinds. See how code pans. */ struct frag { /* Object file address (as an octet offset). */ diff --git a/gas/gasp.c b/gas/gasp.c index dc9362292d..0ec7054661 100644 --- a/gas/gasp.c +++ b/gas/gasp.c @@ -575,7 +575,7 @@ is_flonum (idx, string) if (regcomp (®, "^[0-9]*\\.[0-9]+([eE][+-]?[0-9]+)?", REG_EXTENDED) != 0) return 0; - + rc = regexec (®, &buf.ptr[idx], 0, NULL, 0); sb_kill (&buf); regfree (®); diff --git a/gas/macro.c b/gas/macro.c index 11d6511381..08424317c4 100644 --- a/gas/macro.c +++ b/gas/macro.c @@ -383,7 +383,7 @@ get_any_string (idx, in, out, expand, pretend_quoted) idx + 1, in, &val); - sprintf(buf, "%d", val); + sprintf (buf, "%d", val); sb_add_string (out, buf); } else if (in->ptr[idx] == '"' @@ -928,29 +928,29 @@ macro_expand (idx, in, m, out, comment_char) /* The macro may be called with an optional qualifier, which may be referred to in the macro body as \0. */ if (idx < in->len && in->ptr[idx] == '.') - { - /* The Microtec assembler ignores this if followed by a white space. - (Macro invocation with empty extension) */ - idx++; - if ( idx < in->len - && in->ptr[idx] != ' ' - && in->ptr[idx] != '\t') - { - formal_entry *n; - - n = (formal_entry *) xmalloc (sizeof (formal_entry)); - sb_new (&n->name); - sb_new (&n->def); - sb_new (&n->actual); - n->index = QUAL_INDEX; - - n->next = m->formals; - m->formals = n; - - idx = get_any_string (idx, in, &n->actual, 1, 0); - } - } - } + { + /* The Microtec assembler ignores this if followed by a white space. + (Macro invocation with empty extension) */ + idx++; + if ( idx < in->len + && in->ptr[idx] != ' ' + && in->ptr[idx] != '\t') + { + formal_entry *n; + + n = (formal_entry *) xmalloc (sizeof (formal_entry)); + sb_new (&n->name); + sb_new (&n->def); + sb_new (&n->actual); + n->index = QUAL_INDEX; + + n->next = m->formals; + m->formals = n; + + idx = get_any_string (idx, in, &n->actual, 1, 0); + } + } + } /* Peel off the actuals and store them away in the hash tables' actuals. */ idx = sb_skip_white (idx, in); diff --git a/gas/read.c b/gas/read.c index b0446c8d13..1e45eab31f 100644 --- a/gas/read.c +++ b/gas/read.c @@ -45,7 +45,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "ecoff.h" #ifndef TC_START_LABEL -#define TC_START_LABEL(x,y) (x==':') +#define TC_START_LABEL(x,y) (x == ':') #endif /* Set by the object-format or the target. */ diff --git a/gas/stabs.c b/gas/stabs.c index 60b03c4994..bdeae10d10 100644 --- a/gas/stabs.c +++ b/gas/stabs.c @@ -343,7 +343,7 @@ s_stab_generic (what, stab_secname, stabstr_secname) if (what == 's') { /* Release the string, if nobody else has used the obstack. */ - if (saved_string_obstack_end == notes.next_free) + if (saved_string_obstack_end == notes.next_free) obstack_free (¬es, string); } @@ -580,7 +580,7 @@ stabs_generate_asm_lineno () unsigned int lineno; char *buf; char sym[30]; - /* Remember the last file/line and avoid duplicates. */ + /* Remember the last file/line and avoid duplicates. */ static unsigned int prev_lineno = -1; static char *prev_file = NULL; @@ -593,22 +593,22 @@ stabs_generate_asm_lineno () as_where (&file, &lineno); - /* Don't emit sequences of stabs for the same line. */ + /* Don't emit sequences of stabs for the same line. */ if (prev_file == NULL) { - /* First time thru. */ + /* First time thru. */ prev_file = xstrdup (file); prev_lineno = lineno; } else if (lineno == prev_lineno && strcmp (file, prev_file) == 0) { - /* Same file/line as last time. */ + /* Same file/line as last time. */ return; } else { - /* Remember file/line for next time. */ + /* Remember file/line for next time. */ prev_lineno = lineno; if (strcmp (file, prev_file) != 0) { diff --git a/gas/symbols.c b/gas/symbols.c index 5a55fcaf9f..05e6557ea3 100644 --- a/gas/symbols.c +++ b/gas/symbols.c @@ -439,9 +439,9 @@ colon (sym_name) /* Just seen "x:" - rattle symbols & frags. */ #ifdef BFD_ASSEMBLER if (OUTPUT_FLAVOR == bfd_target_aout_flavour) #endif - sprintf(od_buf, "%d.%d.", - S_GET_OTHER (symbolP), - S_GET_DESC (symbolP)); + sprintf (od_buf, "%d.%d.", + S_GET_OTHER (symbolP), + S_GET_DESC (symbolP)); #endif as_bad (_("symbol `%s' is already defined as \"%s\"/%s%ld"), sym_name, @@ -1878,7 +1878,7 @@ S_SET_EXTERNAL (s) { char * file; unsigned int line; - + /* Do not reassign section symbols. */ as_where (& file, & line); as_warn_where (file, line, |