diff --git a/gas/ChangeLog b/gas/ChangeLog index 49781527b2..a5ee810915 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,8 +1,18 @@ 2000-09-11 Kazu Hirata - * config/tc-i370.c: Fix formatting. + * bignum-copy.c: Fix formatting. + * config/tc-i370.c: Likewise. * config/tc-i960.c: Likewise. * config/tc-m68k.c: Likewise. + * ehopt.c: Likewise. + * flonum-copy.c: Likewise. + * flonum-konst.c: Likewise. + * flonum-mult.c: Likewise. + * literal.c: Likewise. + * read.c: Likewise. + * sb.c: Likewise. + * stabs.c: Likewise. + * subsegs.c: Likewise. 2000-09-09 Philip Blundell diff --git a/gas/bignum-copy.c b/gas/bignum-copy.c index 2bffcbfea4..8384ff13a3 100644 --- a/gas/bignum-copy.c +++ b/gas/bignum-copy.c @@ -1,5 +1,6 @@ /* bignum_copy.c - copy a bignum - Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. + Copyright (C) 1987, 1990, 1991, 1992, 2000 + Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -15,7 +16,7 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to - the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "as.h" @@ -43,7 +44,7 @@ bignum_copy (in, in_length, out, out_length) if (out_length < in_length) { LITTLENUM_TYPE *p; /* -> most significant (non-zero) input - littlenum. */ + littlenum. */ memcpy ((void *) out, (void *) in, (unsigned int) out_length << LITTLENUM_SHIFT); diff --git a/gas/ehopt.c b/gas/ehopt.c index a0a5f62f4d..03d7a04160 100644 --- a/gas/ehopt.c +++ b/gas/ehopt.c @@ -1,5 +1,5 @@ /* ehopt.c--optimize gcc exception frame information. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2000 Free Software Foundation, Inc. Written by Ian Lance Taylor . This file is part of GAS, the GNU Assembler. @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. */ +02111-1307, USA. */ #include "as.h" #include "subsegs.h" diff --git a/gas/flonum-copy.c b/gas/flonum-copy.c index 5bcc5cce7e..3fb29e72d4 100644 --- a/gas/flonum-copy.c +++ b/gas/flonum-copy.c @@ -1,5 +1,5 @@ /* flonum_copy.c - copy a flonum - Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. + Copyright (C) 1987, 1990, 1991, 1992, 2000 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -59,7 +59,7 @@ flonum_copy (in, out) } else { - int shorten; /* 1-origin. Number of littlenums we drop. */ + int shorten; /* 1-origin. Number of littlenums we drop. */ shorten = in_length - out_length; /* Assume out_length >= 0 ! */ diff --git a/gas/flonum-konst.c b/gas/flonum-konst.c index 09ec3b6f0a..dd330c36c5 100644 --- a/gas/flonum-konst.c +++ b/gas/flonum-konst.c @@ -1,5 +1,5 @@ /* flonum_const.c - Useful Flonum constants - Copyright (C) 1987, 90, 91, 92, 93, 94, 95, 1996 + Copyright (C) 1987, 90, 91, 92, 93, 94, 95, 96, 2000 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -23,7 +23,7 @@ #include "flonum.h" /* JF: I added the last entry to this table, and I'm not sure if its right or not. Could go either way. I wish - I really understood this stuff. */ + I really understood this stuff. */ const int table_size_of_flonum_powers_of_ten = 13; diff --git a/gas/flonum-mult.c b/gas/flonum-mult.c index 9ecb63d3c7..9733724769 100644 --- a/gas/flonum-mult.c +++ b/gas/flonum-mult.c @@ -1,5 +1,6 @@ /* flonum_mult.c - multiply two flonums - Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc. + Copyright (C) 1987, 1990, 1991, 1992, 2000 + Free Software Foundation, Inc. This file is part of Gas, the GNU Assembler. @@ -160,7 +161,7 @@ flonum_multip (a, b, product) } } /* [P]-> position # size_of_sum + 1. - This is where 'carry' should go. */ + This is where 'carry' should go. */ #ifdef TRACE printf ("final carry =%04x\n", carry); #endif diff --git a/gas/literal.c b/gas/literal.c index a3f8fc4da1..f3ccce3812 100644 --- a/gas/literal.c +++ b/gas/literal.c @@ -1,5 +1,5 @@ /* as.c - GAS literal pool management. - Copyright (C) 1994 Free Software Foundation, Inc. + Copyright (C) 1994, 2000 Free Software Foundation, Inc. Written by Ken Raeburn (raeburn@cygnus.com). This file is part of GAS, the GNU Assembler. @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to - the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* This isn't quite a "constant" pool. Some of the values may get adjusted at run time, e.g., for symbolic relocations when shared diff --git a/gas/read.c b/gas/read.c index b2eb2fd03f..0c8b80d55b 100644 --- a/gas/read.c +++ b/gas/read.c @@ -17,7 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. */ +02111-1307, USA. */ #if 0 /* If your chars aren't 8 bits, you will change this a bit. @@ -627,7 +627,7 @@ read_a_source_file (name) /* We are at the begining of a line, or similar place. We expect a well-formed assembler statement. A "symbol-name:" is a statement. - + Depending on what compiler is used, the order of these tests may vary to catch most common case 1st. Each test is independent of all other tests at the (top) level. @@ -699,10 +699,10 @@ read_a_source_file (name) /* In MRI mode, \tsym: set 0 is permitted. */ if (*rest == ':') ++rest; - + if (*rest == ' ' || *rest == '\t') ++rest; - + if ((strncasecmp (rest, "EQU", 3) == 0 || strncasecmp (rest, "SET", 3) == 0) && (rest[3] == ' ' || rest[3] == '\t')) @@ -760,7 +760,7 @@ read_a_source_file (name) || (!flag_m68k_mri && *s == '.')) { /* PSEUDO - OP. - + WARNING: c has next char, which may be end-of-line. We lookup the pseudo-op table with s+1 because we already know that the pseudo-op begins with a '.'. */ @@ -791,7 +791,7 @@ read_a_source_file (name) { do_align (1, (char *) NULL, 0, 0); mri_pending_align = 0; - + if (line_label != NULL) { symbol_set_frag (line_label, frag_now); @@ -1045,7 +1045,7 @@ read_a_source_file (name) buffer = new_buf; input_line_pointer = new_buf; buffer_limit = new_tmp; - + continue; } @@ -1129,7 +1129,7 @@ mri_comment_field (stopcp) #endif *stopcp = *s; *s = '\0'; - + return s; } @@ -1244,7 +1244,7 @@ s_align (arg, bytes_p) ; if (align != 1) as_bad (_("Alignment not a power of 2")); - + align = i; } } @@ -1360,7 +1360,7 @@ s_comm (ignore) p = input_line_pointer; *p = c; SKIP_WHITESPACE (); - + if (*input_line_pointer != ',') { as_bad (_("Expected comma after symbol-name: rest of line ignored.")); @@ -1369,9 +1369,9 @@ s_comm (ignore) mri_comment_end (stop, stopc); return; } - + input_line_pointer++; /* skip ',' */ - + if ((temp = get_absolute_expression ()) < 0) { as_warn (_(".COMMon length (%ld.) <0! Ignored."), (long) temp); @@ -1380,11 +1380,11 @@ s_comm (ignore) mri_comment_end (stop, stopc); return; } - + *p = 0; symbolP = symbol_find_or_make (name); *p = c; - + if (S_IS_DEFINED (symbolP) && !S_IS_COMMON (symbolP)) { as_bad (_("Ignoring attempt to re-define symbol `%s'."), @@ -1394,7 +1394,7 @@ s_comm (ignore) mri_comment_end (stop, stopc); return; } - + if (S_GET_VALUE (symbolP)) { if (S_GET_VALUE (symbolP) != (valueT) temp) @@ -1459,7 +1459,7 @@ s_mri_common (small) ++input_line_pointer; } while (isdigit ((unsigned char) *input_line_pointer)); - + c = *input_line_pointer; *input_line_pointer = '\0'; @@ -1757,9 +1757,9 @@ s_fill (ignore) p = frag_var (rs_space, (int) size, (int) size, (relax_substateT) 0, rep_sym, (offsetT) 0, (char *) 0); } - + memset (p, 0, (unsigned int) size); - + /* The magic number BSD_FILL_SIZE_CROCK_4 is from BSD 4.2 VAX flavoured AS. The following bizzare behaviour is to be compatible with above. I guess they tried to take up to 8 @@ -2003,25 +2003,25 @@ s_lcomm_internal (needs_align, bytes_p) { align = 0; SKIP_WHITESPACE (); - + if (*input_line_pointer != ',') { as_bad (_("Expected comma after size")); ignore_rest_of_line (); return; } - + input_line_pointer++; SKIP_WHITESPACE (); - + if (*input_line_pointer == '\n') { as_bad (_("Missing alignment")); return; } - + align = get_absolute_expression (); - + if (bytes_p) { /* Convert to a power of 2. */ @@ -2036,7 +2036,7 @@ s_lcomm_internal (needs_align, bytes_p) align = i; } } - + if (align > max_alignment) { align = max_alignment; @@ -2047,7 +2047,7 @@ s_lcomm_internal (needs_align, bytes_p) align = 0; as_warn (_("Alignment negative. 0 assumed.")); } - + record_alignment (bss_seg, align); } else @@ -2086,7 +2086,7 @@ s_lcomm_internal (needs_align, bytes_p) if (align) frag_align (align, 0, 0); - + /* Detach from old frag. */ if (S_GET_SEGMENT (symbolP) == bss_seg) symbol_get_frag (symbolP)->fr_symbol = NULL; @@ -2151,7 +2151,7 @@ s_lsym (ignore) p = input_line_pointer; *p = c; SKIP_WHITESPACE (); - + if (*input_line_pointer != ',') { *p = 0; @@ -2160,10 +2160,10 @@ s_lsym (ignore) ignore_rest_of_line (); return; } - + input_line_pointer++; expression (&exp); - + if (exp.X_op != O_constant && exp.X_op != O_register) { @@ -2171,7 +2171,7 @@ s_lsym (ignore) ignore_rest_of_line (); return; } - + *p = 0; symbolP = symbol_find_or_make (name); @@ -2197,7 +2197,7 @@ s_lsym (ignore) { as_bad (_("Symbol %s already defined"), name); } - + *p = c; demand_empty_rest_of_line (); } @@ -2235,7 +2235,7 @@ get_line_sb (line) #endif inquote = '\0'; - + while (!is_end_of_line[(unsigned char) *input_line_pointer] || (inquote != '\0' && *input_line_pointer != '\n')) { @@ -2248,10 +2248,10 @@ get_line_sb (line) else if (*input_line_pointer == quote2) inquote = quote2; } - + sb_add_char (line, *input_line_pointer++); } - + while (input_line_pointer < buffer_limit && is_end_of_line[(unsigned char) *input_line_pointer]) { @@ -2259,7 +2259,7 @@ get_line_sb (line) bump_line_counters (); ++input_line_pointer; } - + return 1; } @@ -2472,7 +2472,7 @@ s_mri_sect (type) ++input_line_pointer; } while (isdigit ((unsigned char) *input_line_pointer)); - + c = *input_line_pointer; *input_line_pointer = '\0'; } @@ -2945,13 +2945,13 @@ s_space (mult) as_bad (_("space allocation too complex in absolute section")); subseg_set (text_section, 0); } - + if (mri_common_symbol != NULL) { as_bad (_("space allocation too complex in common section")); mri_common_symbol = NULL; } - + if (!need_pass_2) p = frag_var (rs_space, 1, 1, (relax_substateT) 0, make_expr_symbol (&exp), (offsetT) 0, (char *) 0); @@ -3114,12 +3114,12 @@ ignore_rest_of_line () else as_bad (_("Rest of line ignored. First ignored character valued 0x%x."), *input_line_pointer); - + while (input_line_pointer < buffer_limit && !is_end_of_line[(unsigned char) *input_line_pointer]) input_line_pointer++; } - + input_line_pointer++; /* Return pointing just after end-of-line. */ @@ -3134,14 +3134,14 @@ discard_rest_of_line () input_line_pointer++; input_line_pointer++; - + /* Return pointing just after end-of-line. */ know (is_end_of_line[(unsigned char) input_line_pointer[-1]]); } /* In: Pointer to a symbol. Input_line_pointer->expression. - + Out: Input_line_pointer->just after any whitespace after expression. Tried to set symbol to value of expression. Will change symbols type, value, and frag; */ @@ -3244,13 +3244,13 @@ pseudo_set (symbolP) } /* cons() - + CONStruct more frag of .bytes, or .words etc. Should need_pass_2 be 1 then emit no frag(s). This understands EXPRESSIONS. - + Bug (?) - + This has a split personality. We use expression() to read the value. We can detect if the value won't fit in a byte or word. But we can't detect if expression() discarded significant digits @@ -3898,11 +3898,11 @@ parse_mri_cons (exp, nbytes) result <<= 8; scan++; } - + /* Create correct expression. */ exp->X_op = O_constant; exp->X_add_number = result; - + /* Fake it so that we can read the next char too. */ if (input_line_pointer[0] != '\'' || (input_line_pointer[0] == '\'' && input_line_pointer[1] == '\'')) @@ -4050,12 +4050,12 @@ hex_float (float_type, bytes) } /* float_cons() - + CONStruct some more frag chars of .floats .ffloats etc. Makes 0 or more new frags. If need_pass_2 == 1, no frags are emitted. This understands only floating literals, not expressions. Sorry. - + A floating constant is defined by atof_generic(), except it is preceded by 0d 0f 0g or 0h. After observing the STRANGE way my BSD AS does its reading, I decided to be incompatible. This always tries to give you @@ -4063,7 +4063,7 @@ hex_float (float_type, bytes) truncatation, restored noisy bits instead of trailing 0s AND gave you a choice of 2 flavours of noise according to which of 2 floating-point scanners you directed AS to use. - + In: input_line_pointer->whitespace before, or '0' of flonum. */ void @@ -4137,7 +4137,7 @@ float_cons (float_type) ++input_line_pointer; expression (&count_exp); - + if (count_exp.X_op != O_constant || count_exp.X_add_number <= 0) as_warn (_("unresolvable or nonpositive repeat count; using 1")); @@ -4627,7 +4627,7 @@ next_char_of_string () { number = number * 8 + c - '0'; } - + c = number & 0xff; } --input_line_pointer; @@ -4771,7 +4771,7 @@ demand_copy_C_string (len_pointer) } } } - + return s; } @@ -4813,9 +4813,9 @@ demand_copy_string (lenP) } /* In: Input_line_pointer->next character. - + Do: Skip input_line_pointer over all whitespace. - + Out: 1 if input_line_pointer->end-of-line. */ int @@ -4906,16 +4906,16 @@ s_include (arg) ++input_line_pointer; ++i; } - + obstack_1grow (¬es, '\0'); filename = obstack_finish (¬es); while (!is_end_of_line[(unsigned char) *input_line_pointer]) ++input_line_pointer; } - + demand_empty_rest_of_line (); path = xmalloc ((unsigned long) i + include_dir_maxlen + 5 /* slop */ ); - + for (i = 0; i < include_dir_count; i++) { strcpy (path, include_dirs[i]); @@ -4927,7 +4927,7 @@ s_include (arg) goto gotit; } } - + free (path); path = filename; gotit: diff --git a/gas/sb.c b/gas/sb.c index 789460286f..632871697a 100644 --- a/gas/sb.c +++ b/gas/sb.c @@ -1,5 +1,5 @@ /* sb.c - string buffer manipulation routines - Copyright (C) 1994, 1995 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 2000 Free Software Foundation, Inc. Written by Steve and Judy Chamberlain of Cygnus Support, sac@cygnus.com @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA - 02111-1307, USA. */ + 02111-1307, USA. */ #include "config.h" #include @@ -62,7 +62,7 @@ int string_count[sb_max_power_two]; static sb_list_vector free_list; -/* initializes an sb. */ +/* initializes an sb. */ void sb_build (ptr, size) @@ -97,7 +97,6 @@ sb_build (ptr, size) ptr->item = e; } - void sb_new (ptr) sb *ptr; @@ -129,7 +128,7 @@ sb_add_sb (ptr, s) } /* make sure that the sb at ptr has room for another len characters, - and grow it if it doesn't. */ + and grow it if it doesn't. */ static void sb_check (ptr, len) @@ -158,7 +157,7 @@ sb_reset (ptr) ptr->len = 0; } -/* add character c to the end of the sb at ptr. */ +/* add character c to the end of the sb at ptr. */ void sb_add_char (ptr, c) @@ -169,7 +168,7 @@ sb_add_char (ptr, c) ptr->ptr[ptr->len++] = c; } -/* add null terminated string s to the end of sb at ptr. */ +/* add null terminated string s to the end of sb at ptr. */ void sb_add_string (ptr, s) @@ -216,7 +215,7 @@ sb_print (outfile, ptr) } } -void +void sb_print_at (outfile, idx, ptr) FILE *outfile; int idx; @@ -228,7 +227,7 @@ sb_print_at (outfile, idx, ptr) } /* put a null at the end of the sb at in and return the start of the - string, so that it can be used as an arg to printf %s. */ + string, so that it can be used as an arg to printf %s. */ char * sb_name (in) @@ -267,7 +266,7 @@ sb_skip_white (idx, ptr) /* start at the index idx into the sb at ptr. skips whitespace, a comma and any following whitespace. returnes the index of the - next character. */ + next character. */ int sb_skip_comma (idx, ptr) diff --git a/gas/stabs.c b/gas/stabs.c index d8f66b45f4..d9998f1a4c 100644 --- a/gas/stabs.c +++ b/gas/stabs.c @@ -1,5 +1,5 @@ /* Generic stabs parsing for gas. - Copyright (C) 1989, 90, 91, 93, 94, 95, 96, 97, 98, 1999 + Copyright (C) 1989, 90, 91, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -17,7 +17,7 @@ the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with GAS; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. */ +02111-1307, USA. */ #include "as.h" #include "obstack.h" @@ -25,7 +25,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "ecoff.h" /* We need this, despite the apparent object format dependency, since - it defines stab types, which all object formats can use now. */ + it defines stab types, which all object formats can use now. */ #include "aout/stab_gnu.h" @@ -112,7 +112,7 @@ get_stab_string_offset (string, stabstr_secname) } if (length > 0) - { /* Ordinary case. */ + { /* Ordinary case. */ p = frag_more (length + 1); strcpy (p, string); @@ -171,9 +171,9 @@ aout_process_stab (what, string, type, other, desc) #endif /* This can handle different kinds of stabs (s,n,d) and different - kinds of stab sections. */ + kinds of stab sections. */ -static void +static void s_stab_generic (what, stab_secname, stabstr_secname) int what; char *stab_secname; @@ -383,7 +383,7 @@ s_stab_generic (what, stab_secname, stabstr_secname) demand_empty_rest_of_line (); } -/* Regular stab directive. */ +/* Regular stab directive. */ void s_stab (what) @@ -392,7 +392,7 @@ s_stab (what) s_stab_generic (what, STAB_SECTION_NAME, STAB_STRING_SECTION_NAME); } -/* "Extended stabs", used in Solaris only now. */ +/* "Extended stabs", used in Solaris only now. */ void s_xstab (what) @@ -438,7 +438,7 @@ s_xstab (what) /* Frob invented at RMS' request. Set the n_desc of a symbol. */ -void +void s_desc (ignore) int ignore ATTRIBUTE_UNUSED; { @@ -524,13 +524,13 @@ generate_asm_file (type, file) int len = (bslash ? (bslash - tmp + 1) : strlen (tmp)); /* double all backslashes, since demand_copy_C_string (used by s_stab to extract the part in quotes) will try to replace them as - escape sequences. backslash may appear in a filespec. */ + escape sequences. backslash may appear in a filespec. */ strncpy (bufp, tmp, len); tmp += len; bufp += len; if (bslash != NULL) *bufp++ = '\\'; - } + } sprintf (bufp, "\",%d,0,0,%s\n", type, sym); input_line_pointer = buf; s_stab ('s'); diff --git a/gas/subsegs.c b/gas/subsegs.c index b2bf70d154..49a93af7ea 100644 --- a/gas/subsegs.c +++ b/gas/subsegs.c @@ -1,5 +1,5 @@ /* subsegs.c - subsegments - - Copyright (C) 1987, 90, 91, 92, 93, 94, 95, 96, 97, 98, 1999 + Copyright (C) 1987, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -37,7 +37,7 @@ static struct obstack frchains; segment_info_type segment_info[SEG_MAXIMUM_ORDINAL]; #else -/* Commented in "subsegs.h". */ +/* Commented in "subsegs.h". */ frchainS *data0_frchainP, *bss0_frchainP; #endif /* MANY_SEGMENTS */ @@ -62,7 +62,7 @@ char const *const seg_name[] = "transfert vector postload", "register", "", -}; /* Used by error reporters, dumpers etc. */ +}; /* Used by error reporters, dumpers etc. */ #else /* BFD_ASSEMBLER */ /* Gas segment information for bfd_abs_section_ptr and @@ -103,12 +103,12 @@ subsegs_begin () #endif frchain_root = NULL; - frchain_now = NULL; /* Warn new_subseg() that we are booting. */ + frchain_now = NULL; /* Warn new_subseg() that we are booting. */ frag_now = &dummy_frag; #ifndef BFD_ASSEMBLER - now_subseg = 42; /* Lie for 1st call to subseg_new. */ + now_subseg = 42; /* Lie for 1st call to subseg_new. */ #ifdef MANY_SEGMENTS { int i; @@ -275,7 +275,7 @@ subseg_set_rest (seg, subseg) */ if (!frcP || (frcP->frch_seg > seg - || frcP->frch_subseg > subseg)) /* Kinky logic only works with 2 segments. */ + || frcP->frch_subseg > subseg)) /* Kinky logic only works with 2 segments. */ { /* * This should be the only code that creates a frchainS. @@ -307,7 +307,7 @@ subseg_set_rest (seg, subseg) seginfo->frchainP = newP; } #endif - + frcP = newP; } /*