2000-09-20 Kazu Hirata <kazu@hxi.com>

	* config/tc-tahoe.c: Fix formatting.
	* config/tc-tahoe.h: Likewise.

3 files changed, 152 insertions, 153 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index a56584f426..6d11c7ef61 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-20  Kazu Hirata  <kazu@hxi.com>
+
+	* config/tc-tahoe.c: Fix formatting.
+	* config/tc-tahoe.h: Likewise.
+
 2000-09-19  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
 
 	* config/tc-vax.c (synthetic_votstrs): Remove jbssi and jbcci.
diff --git a/gas/config/tc-tahoe.c b/gas/config/tc-tahoe.c
index 58d9639f28..b5c9abcf9d 100644
--- a/gas/config/tc-tahoe.c
+++ b/gas/config/tc-tahoe.c
@@ -1,5 +1,5 @@
 /* tc-tahoe.c
-   Not part of GAS yet. */
+   Not part of GAS yet.  */
 
 #include "as.h"
 #include "obstack.h"
@@ -22,7 +22,7 @@ struct top			/* tahoe instruction operand */
   int top_ndx;			/* -1, or index register. eg 7=[R7] */
   int top_reg;			/* -1, or register number. eg 7 = R7 or (R7) */
   byte top_mode;		/* Addressing mode byte. This byte, defines
-				   which of the 11 modes opcode is. */
+				   which of the 11 modes opcode is.  */
 
   char top_access;		/* Access type wanted for this opperand
 				   'b'branch ' 'no-instruction 'amrvw' */
@@ -39,7 +39,7 @@ struct top			/* tahoe instruction operand */
 };
 
 /* The addressing modes for an operand. These numbers are the acutal values
-   for certain modes, so be carefull if you screw with them. */
+   for certain modes, so be carefull if you screw with them.  */
 #define TAHOE_DIRECT_REG (0x50)
 #define TAHOE_REG_DEFERRED (0x60)
 
@@ -68,13 +68,13 @@ struct top			/* tahoe instruction operand */
 #define TAHOE_WIDTH_BIG_NON_REV_JUMP ':'
 
 /* The hex code for certain tahoe commands and modes.
-   This is just for readability. */
+   This is just for readability.  */
 #define TAHOE_JMP (0x71)
 #define TAHOE_PC_REL_LONG (0xEF)
 #define TAHOE_BRB (0x11)
 #define TAHOE_BRW (0x13)
 /* These, when 'ored' with, or added to, a register number,
-   set up the number for the displacement mode. */
+   set up the number for the displacement mode.  */
 #define TAHOE_PC_OR_BYTE (0xA0)
 #define TAHOE_PC_OR_WORD (0xC0)
 #define TAHOE_PC_OR_LONG (0xE0)
@@ -82,8 +82,8 @@ struct top			/* tahoe instruction operand */
 struct tit			/* get it out of the sewer, it stands for
 				   tahoe instruction tree (Geeze!) */
 {
-  tahoe_opcodeT tit_opcode;	/* The opcode. */
-  byte tit_operands;		/* How many operands are here. */
+  tahoe_opcodeT tit_opcode;	/* The opcode.  */
+  byte tit_operands;		/* How many operands are here.  */
   struct top tit_operand[TIT_MAX_OPERANDS];	/* Operands */
   char *tit_error;		/* "" or fatal error text */
 };
@@ -100,10 +100,10 @@ struct tit			/* get it out of the sewer, it stands for
 long omagic = OMAGIC;
 
 /* These chars start a comment anywhere in a source file (except inside
-   another comment or a quoted string. */
+   another comment or a quoted string.  */
 const char comment_chars[] = "#;";
 
-/* These chars only start a comment at the beginning of a line. */
+/* These chars only start a comment at the beginning of a line.  */
 const char line_comment_chars[] = "#";
 
 /* Chars that can be used to separate mant from exp in floating point nums */
@@ -113,7 +113,7 @@ const char EXP_CHARS[] = "eE";
    as in 0f123.456
    or    0d1.234E-12 (see exp chars above)
    Note: The Tahoe port doesn't support floating point constants. This is
-         consistant with 'as' If it's needed, I can always add it later. */
+         consistant with 'as' If it's needed, I can always add it later.  */
 const char FLT_CHARS[] = "df";
 
 /* Also be aware that MAXIMUM_NUMBER_OF_CHARS_FOR_FLOAT may have to be
@@ -122,11 +122,11 @@ const char FLT_CHARS[] = "df";
    (The tahoe has plenty of room, so the change currently isn't needed.)
    */
 
-static struct tit t;		/* A tahoe instruction after decoding. */
+static struct tit t;		/* A tahoe instruction after decoding.  */
 
 void float_cons ();
 /* A table of pseudo ops (sans .), the function called, and an integer op
-   that the function is called with. */
+   that the function is called with.  */
 
 const pseudo_typeS md_pseudo_table[] =
 {
@@ -164,7 +164,6 @@ States for Tahoe address relaxing.
 	Always, 1 byte opcode, then displacement/absolute.
 	If word or longword, change opcode to brw or jmp.
 
-	
 2.	TAHOE_WIDTH_CONDITIONAL_JUMP (?)
 	J<cond> where <cond> is a simple flag test.
 	Format: "b?"
@@ -220,7 +219,7 @@ pc_rel_disp? That sort of thing.) */
    to them. (WF + length(word))
 
    The first letter is Byte, Word.
-   2nd letter is Forward, Backward. */
+   2nd letter is Forward, Backward.  */
 #define BF (1+ 127)
 #define BB (1+-128)
 #define WF (2+ 32767)
@@ -228,7 +227,7 @@ pc_rel_disp? That sort of thing.) */
 /* Dont need LF, LB because they always reach. [They are coded as 0.] */
 
 #define C(a,b) ENCODE_RELAX(a,b)
-/* This macro has no side-effects. */
+/* This macro has no side-effects.  */
 #define ENCODE_RELAX(what,length) (((what) << 2) + (length))
 #define RELAX_STATE(what) ((what) >> 2)
 #define RELAX_LENGTH(length) ((length) && 3)
@@ -246,7 +245,7 @@ pc_rel_disp? That sort of thing.) */
 
 /* This is the table used by gas to figure out relaxing modes. The fields are
    forward_branch reach, backward_branch reach, number of bytes it would take,
-   where the next biggest branch is. */
+   where the next biggest branch is.  */
 const relax_typeS md_relax_table[] =
 {
   {
@@ -277,7 +276,7 @@ const relax_typeS md_relax_table[] =
   },				/* unused	    1,3 */
 /* Reversible Conditional Branch. If the branch won't reach, reverse
      it, and jump over a brw or a jmp that will reach. The relax part is the
-     actual address. */
+     actual address.  */
   {
     BF, BB, 1, C (2, 1)
   },				/* b<cond> B`foo    2,0 */
@@ -291,7 +290,7 @@ const relax_typeS md_relax_table[] =
     1, 1, 0, 0
   },				/* unused	    2,3 */
 /* Another type of reversable branch. But this only has a word
-     displacement. */
+     displacement.  */
   {
     1, 1, 0, 0
   },				/* unused	    3,0 */
@@ -308,7 +307,7 @@ const relax_typeS md_relax_table[] =
      displacement. If I can't reach, branch over a byte branch, to a
      jump that will reach. The jumped branch jumps over the reaching
      branch, to continue with the flow of the program. It's like playing
-     leap frog. */
+     leap frog.  */
   {
     1, 1, 0, 0
   },				/* unused	    4,0 */
@@ -323,7 +322,7 @@ const relax_typeS md_relax_table[] =
   },				/* unused	    4,3 */
 /* Normal displacement mode, no jumping or anything like that.
      The relax points to one byte before the address, thats why all
-     the numbers are up by one. */
+     the numbers are up by one.  */
   {
     BF + 1, BB + 1, 2, C (5, 1)
   },				/* B^"foo"	    5,0 */
@@ -349,13 +348,13 @@ const relax_typeS md_relax_table[] =
    md_begin() will crash.  */
 static struct hash_control *op_hash;
 
-/* Init function. Build the hash table. */
+/* Init function. Build the hash table.  */
 void
 md_begin ()
 {
   struct tot *tP;
   char *errorval = 0;
-  int synthetic_too = 1;	/* If 0, just use real opcodes. */
+  int synthetic_too = 1;	/* If 0, just use real opcodes.  */
 
   op_hash = hash_new ();
 
@@ -431,22 +430,22 @@ Tahoe options:\n\
 
 /* The functions in this section take numbers in the machine format, and
    munges them into Tahoe byte order.
-   They exist primarily for cross assembly purpose. */
-void				/* Knows about order of bytes in address. */
+   They exist primarily for cross assembly purpose.  */
+void				/* Knows about order of bytes in address.  */
 md_number_to_chars (con, value, nbytes)
-     char con[];		/* Return 'nbytes' of chars here. */
-     valueT value;		/* The value of the bits. */
-     int nbytes;		/* Number of bytes in the output. */
+     char con[];		/* Return 'nbytes' of chars here.  */
+     valueT value;		/* The value of the bits.  */
+     int nbytes;		/* Number of bytes in the output.  */
 {
   number_to_chars_bigendian (con, value, nbytes);
 }
 
 #ifdef comment
-void				/* Knows about order of bytes in address. */
+void				/* Knows about order of bytes in address.  */
 md_number_to_imm (con, value, nbytes)
-     char con[];		/* Return 'nbytes' of chars here. */
-     long int value;		/* The value of the bits. */
-     int nbytes;		/* Number of bytes in the output. */
+     char con[];		/* Return 'nbytes' of chars here.  */
+     long int value;		/* The value of the bits.  */
+     int nbytes;		/* Number of bytes in the output.  */
 {
   md_number_to_chars (con, value, nbytes);
 }
@@ -462,20 +461,20 @@ tc_apply_fix (fixP, val)
   know (0);
 }
 
-void				/* Knows about order of bytes in address. */
+void				/* Knows about order of bytes in address.  */
 md_number_to_disp (con, value, nbytes)
-     char con[];		/* Return 'nbytes' of chars here. */
-     long int value;		/* The value of the bits. */
-     int nbytes;		/* Number of bytes in the output. */
+     char con[];		/* Return 'nbytes' of chars here.  */
+     long int value;		/* The value of the bits.  */
+     int nbytes;		/* Number of bytes in the output.  */
 {
   md_number_to_chars (con, value, nbytes);
 }
 
-void				/* Knows about order of bytes in address. */
+void				/* Knows about order of bytes in address.  */
 md_number_to_field (con, value, nbytes)
-     char con[];		/* Return 'nbytes' of chars here. */
-     long int value;		/* The value of the bits. */
-     int nbytes;		/* Number of bytes in the output. */
+     char con[];		/* Return 'nbytes' of chars here.  */
+     long int value;		/* The value of the bits.  */
+     int nbytes;		/* Number of bytes in the output.  */
 {
   md_number_to_chars (con, value, nbytes);
 }
@@ -486,7 +485,7 @@ md_number_to_field (con, value, nbytes)
    next three bytes are symbolnum, in kind of 3 byte big endian (least sig. byte last).
    The last byte is broken up with bit 7 as pcrel,
    	bits 6 & 5 as length,
-	bit 4 as extern and the last nibble as 'undefined'. */
+	bit 4 as extern and the last nibble as 'undefined'.  */
 
 #if comment
 void
@@ -495,7 +494,7 @@ md_ri_to_chars (ri_p, ri)
 {
   byte the_bytes[sizeof (struct relocation_info)];
   /* The reason I can't just encode these directly into ri_p is that
-     ri_p may point to ri. */
+     ri_p may point to ri.  */
 
   /* This is easy */
   md_number_to_chars (the_bytes, ri.r_address, sizeof (ri.r_address));
@@ -518,9 +517,9 @@ md_ri_to_chars (ri_p, ri)
    next three bytes are symbolnum, in kind of 3 byte big endian (least sig. byte last).
    The last byte is broken up with bit 7 as pcrel,
    	bits 6 & 5 as length,
-	bit 4 as extern and the last nibble as 'undefined'. */
+	bit 4 as extern and the last nibble as 'undefined'.  */
 
-void 
+void
 tc_aout_fix_to_chars (where, fixP, segment_address_in_file)
      char *where;
      fixS *fixP;
@@ -554,7 +553,7 @@ tc_aout_fix_to_chars (where, fixP, segment_address_in_file)
 
 /* Relocate byte stuff */
 
-/* This is for broken word. */
+/* This is for broken word.  */
 const int md_short_jump_size = 3;
 
 void
@@ -606,7 +605,7 @@ md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
 int
 md_estimate_size_before_relax (fragP, segment_type)
      register fragS *fragP;
-     segT segment_type;		/* N_DATA or N_TEXT. */
+     segT segment_type;		/* N_DATA or N_TEXT.  */
 {
   register char *p;
   register int old_fr_fix;
@@ -619,16 +618,16 @@ md_estimate_size_before_relax (fragP, segment_type)
       if (S_GET_SEGMENT (fragP->fr_symbol) == segment_type)
 	{
 	  /* The symbol was in the same segment as the opcode, and it's
-	 a real pc_rel case so it's a relaxable case. */
+	 a real pc_rel case so it's a relaxable case.  */
 	  fragP->fr_subtype = ENCODE_RELAX (STATE_PC_RELATIVE, STATE_BYTE);
 	}
       else
 	{
 	  /* This case is still undefined, so asume it's a long word for the
-	 linker to fix. */
+	 linker to fix.  */
 	  p = fragP->fr_literal + old_fr_fix;
 	  *p |= TAHOE_PC_OR_LONG;
-	  /* We now know how big it will be, one long word. */
+	  /* We now know how big it will be, one long word.  */
 	  fragP->fr_fix += 1 + 4;
 	  fix_new (fragP, old_fr_fix + 1, fragP->fr_symbol,
 		   fragP->fr_offset, FX_PCREL32, NULL);
@@ -644,7 +643,7 @@ md_estimate_size_before_relax (fragP, segment_type)
       else
 	{
 	  p = fragP->fr_literal + old_fr_fix;
-	  *fragP->fr_opcode ^= 0x10;	/* Reverse sense of branch. */
+	  *fragP->fr_opcode ^= 0x10;	/* Reverse sense of branch.  */
 	  *p++ = 6;
 	  *p++ = TAHOE_JMP;
 	  *p++ = TAHOE_PC_REL_LONG;
@@ -664,7 +663,7 @@ md_estimate_size_before_relax (fragP, segment_type)
       else
 	{
 	  p = fragP->fr_literal + old_fr_fix;
-	  *fragP->fr_opcode ^= 0x10;	/* Reverse sense of branch. */
+	  *fragP->fr_opcode ^= 0x10;	/* Reverse sense of branch.  */
 	  *p++ = 0;
 	  *p++ = 6;
 	  *p++ = TAHOE_JMP;
@@ -737,11 +736,11 @@ md_convert_frag (headers, seg, fragP)
      segT seg;
      register fragS *fragP;
 {
-  register char *addressP;	/* -> _var to change. */
-  register char *opcodeP;	/* -> opcode char(s) to change. */
+  register char *addressP;	/* -> _var to change.  */
+  register char *opcodeP;	/* -> opcode char(s) to change.  */
   register short int length_code;	/* 2=long 1=word 0=byte */
   register short int extension = 0;	/* Size of relaxed address.
-				   Added to fr_fix: incl. ALL var chars. */
+				   Added to fr_fix: incl. ALL var chars.  */
   register symbolS *symbolP;
   register long int where;
   register long int address_of_var;
@@ -764,21 +763,21 @@ md_convert_frag (headers, seg, fragP)
     case ENCODE_RELAX (STATE_PC_RELATIVE, STATE_BYTE):
       /* *addressP holds the registers number, plus 0x10, if it's deferred
        mode. To set up the right mode, just OR the size of this displacement */
-      /* Byte displacement. */
+      /* Byte displacement.  */
       *addressP++ |= TAHOE_PC_OR_BYTE;
       *addressP = target_address - (address_of_var + 2);
       extension = 2;
       break;
 
     case ENCODE_RELAX (STATE_PC_RELATIVE, STATE_WORD):
-      /* Word displacement. */
+      /* Word displacement.  */
       *addressP++ |= TAHOE_PC_OR_WORD;
       md_number_to_chars (addressP, target_address - (address_of_var + 3), 2);
       extension = 3;
       break;
 
     case ENCODE_RELAX (STATE_PC_RELATIVE, STATE_LONG):
-      /* Long word displacement. */
+      /* Long word displacement.  */
       *addressP++ |= TAHOE_PC_OR_LONG;
       md_number_to_chars (addressP, target_address - (address_of_var + 5), 4);
       extension = 5;
@@ -790,7 +789,7 @@ md_convert_frag (headers, seg, fragP)
       break;
 
     case ENCODE_RELAX (STATE_CONDITIONAL_BRANCH, STATE_WORD):
-      *opcodeP ^= 0x10;		/* Reverse sense of test. */
+      *opcodeP ^= 0x10;		/* Reverse sense of test.  */
       *addressP++ = 3;		/* Jump over word branch */
       *addressP++ = TAHOE_BRW;
       md_number_to_chars (addressP, target_address - (address_of_var + 4), 2);
@@ -798,7 +797,7 @@ md_convert_frag (headers, seg, fragP)
       break;
 
     case ENCODE_RELAX (STATE_CONDITIONAL_BRANCH, STATE_LONG):
-      *opcodeP ^= 0x10;		/* Reverse sense of test. */
+      *opcodeP ^= 0x10;		/* Reverse sense of test.  */
       *addressP++ = 6;
       *addressP++ = TAHOE_JMP;
       *addressP++ = TAHOE_PC_REL_LONG;
@@ -863,7 +862,7 @@ md_convert_frag (headers, seg, fragP)
 }				/* md_convert_frag */
 
 
-/* This is the stuff for md_assemble. */
+/* This is the stuff for md_assemble.  */
 #define FP_REG 13
 #define SP_REG 14
 #define PC_REG 15
@@ -885,7 +884,7 @@ md_convert_frag (headers, seg, fragP)
  */
 int
 tahoe_reg_parse (start)
-     char **start;		/* A pointer to the string to parse. */
+     char **start;		/* A pointer to the string to parse.  */
 {
   register char *regpoint = *start;
   register int regnum = -1;
@@ -893,16 +892,16 @@ tahoe_reg_parse (start)
   switch (*regpoint++)
     {
     case '%':			/* Registers can start with a %,
-				   R or r, and then a number. */
+				   R or r, and then a number.  */
     case 'R':
     case 'r':
       if (isdigit (*regpoint))
 	{
-	  /* Got the first digit. */
+	  /* Got the first digit.  */
 	  regnum = *regpoint++ - '0';
 	  if ((regnum == 1) && isdigit (*regpoint))
 	    {
-	      /* Its a two digit number. */
+	      /* Its a two digit number.  */
 	      regnum = 10 + (*regpoint++ - '0');
 	      if (regnum > BIGGESTREG)
 		{		/* Number too big? */
@@ -1011,15 +1010,15 @@ tip_op (optex, topP)
 			 out: ndx, reg, mode, error, dispsize */
 
 {
-  int mode = 0;			/* This operand's mode. */
-  char segfault = *optex;	/* To keep the back parsing from freaking. */
-  char *point = optex + 1;	/* Parsing from front to back. */
-  char *end;			/* Parsing from back to front. */
+  int mode = 0;			/* This operand's mode.  */
+  char segfault = *optex;	/* To keep the back parsing from freaking.  */
+  char *point = optex + 1;	/* Parsing from front to back.  */
+  char *end;			/* Parsing from back to front.  */
   int reg = -1;			/* major register, -1 means absent */
   int imreg = -1;		/* Major register in immediate mode */
   int ndx = -1;			/* index register number, -1 means absent */
   char dec_inc = ' ';		/* Is the SP auto-incremented '+' or
-				   auto-decremented '-' or neither ' '. */
+				   auto-decremented '-' or neither ' '.  */
   int immediate = 0;		/* 1 if '$' immediate mode */
   int call_width = 0;		/* If the caller casts the displacement */
   int abs_width = 0;		/* The width of the absolute displacment */
@@ -1030,14 +1029,14 @@ tip_op (optex, topP)
 
   char *tp, *temp, c;		/* Temporary holders */
 
-  char access = topP->top_access;	/* Save on a deref. */
+  char access = topP->top_access;	/* Save on a deref.  */
   char width = topP->top_width;
 
   int really_none = 0;		/* Empty expressions evaluate to 0
 				   but I need to know if it's there or not */
   expressionS *expP;		/* -> expression values for this operand */
 
-  /* Does this command restrict the displacement size. */
+  /* Does this command restrict the displacement size.  */
   if (access == 'b')
     com_width = (width == 'b' ? 1 :
 		 (width == 'w' ? 2 :
@@ -1095,7 +1094,7 @@ tip_op (optex, topP)
    * yank.
    */
 
-  for (end = point; *end != '\0'; end++)	/* Move to the end. */
+  for (end = point; *end != '\0'; end++)	/* Move to the end.  */
     ;
 
   if (end != point)		/* Null string? */
@@ -1104,38 +1103,38 @@ tip_op (optex, topP)
   if (end > point && *end == ' ' && end[-1] != '\'')
     end--;			/* Hop white space */
 
-  /* Is this an index reg. */
+  /* Is this an index reg.  */
   if ((*end == ']') && (end[-1] != '\''))
     {
       temp = end;
 
-      /* Find opening brace. */
+      /* Find opening brace.  */
       for (--end; (*end != '[' && end != point); end--)
 	;
 
-      /* If I found the opening brace, get the index register number. */
+      /* If I found the opening brace, get the index register number.  */
       if (*end == '[')
 	{
-	  tp = end + 1;		/* tp should point to the start of a reg. */
+	  tp = end + 1;		/* tp should point to the start of a reg.  */
 	  ndx = tahoe_reg_parse (&tp);
 	  if (tp != temp)
-	    {			/* Reg. parse error. */
+	    {			/* Reg. parse error.  */
 	      ndx = -1;
 	    }
 	  else
 	    {
-	      end--;		/* Found it, move past brace. */
+	      end--;		/* Found it, move past brace.  */
 	    }
 	  if (ndx == -1)
 	    {
 	      op_bad = _("Couldn't parse the [index] in this operand.");
-	      end = point;	/* Force all the rest of the tests to fail. */
+	      end = point;	/* Force all the rest of the tests to fail.  */
 	    }
 	}
       else
 	{
 	  op_bad = _("Couldn't find the opening '[' for the index of this operand.");
-	  end = point;		/* Force all the rest of the tests to fail. */
+	  end = point;		/* Force all the rest of the tests to fail.  */
 	}
     }
 
@@ -1152,30 +1151,30 @@ tip_op (optex, topP)
     {
       temp = end;
 
-      /* Find opening paren. */
+      /* Find opening paren.  */
       for (--end; (*end != '(' && end != point); end--)
 	;
 
-      /* If I found the opening paren, get the register number. */
+      /* If I found the opening paren, get the register number.  */
       if (*end == '(')
 	{
 	  tp = end + 1;
 	  reg = tahoe_reg_parse (&tp);
 	  if (tp != temp)
 	    {
-	      /* Not a register, but could be part of the expression. */
+	      /* Not a register, but could be part of the expression.  */
 	      reg = -1;
 	      end = temp;	/* Rest the pointer back */
 	    }
 	  else
 	    {
-	      end--;		/* Found the reg. move before opening paren. */
+	      end--;		/* Found the reg. move before opening paren.  */
 	    }
 	}
       else
 	{
 	  op_bad = _("Couldn't find the opening '(' for the deref of this operand.");
-	  end = point;		/* Force all the rest of the tests to fail. */
+	  end = point;		/* Force all the rest of the tests to fail.  */
 	}
     }
 
@@ -1208,7 +1207,7 @@ tip_op (optex, topP)
 				      if it is there.*/
   if (*point != '\0')
     {
-      /* If there is junk after point, then the it's not immediate reg. */
+      /* If there is junk after point, then the it's not immediate reg.  */
       point = tp;
       imreg = -1;
     }
@@ -1238,9 +1237,9 @@ tip_op (optex, topP)
 	  really_none = 1;
 	case O_constant:
 	  /* for SEG_ABSOLUTE, we shouldnt need to set X_op_symbol,
-	     X_add_symbol to any particular value. */
+	     X_add_symbol to any particular value.  */
 	  /* But, we will program defensively. Since this situation occurs
-	     rarely so it costs us little to do so. */
+	     rarely so it costs us little to do so.  */
 	  expP->X_add_symbol = NULL;
 	  expP->X_op_symbol = NULL;
 	  /* How many bytes are needed to express this abs value? */
@@ -1270,7 +1269,7 @@ tip_op (optex, topP)
 	case O_big:
 	  /* This is an error. Tahoe doesn't allow any expressions
 	     bigger that a 32 bit long word. Any bigger has to be referenced
-	     by address. */
+	     by address.  */
 	  op_bad = _("Expression is too large for a 32 bits.");
 	  break;
 	}
@@ -1285,7 +1284,6 @@ tip_op (optex, topP)
   /* I'm done, so restore optex */
   *optex = segfault;
 
-
   /*
    * At this point in the game, we (in theory) have all the components of
    * the operand at least parsed. Now it's time to check for syntax/semantic
@@ -1437,7 +1435,7 @@ tip_op (optex, topP)
 		op_bad = _("You can't index a register in immediate mode.");
 	      if (access == 'a')
 		op_bad = _("Immediate access can't be used as an address.");
-	      /* ponder the wisdom of a cast because it doesn't do any good. */
+	      /* ponder the wisdom of a cast because it doesn't do any good.  */
 	    }
 	  else if (deferred)
 	    {
@@ -1454,7 +1452,7 @@ tip_op (optex, topP)
 
   /*
    * At this point, all the errors we can do have be checked for.
-   * We can build the 'top'. */
+   * We can build the 'top'.  */
 
   topP->top_ndx = ndx;
   topP->top_reg = reg;
@@ -1480,26 +1478,26 @@ tip_op (optex, topP)
 
 static void
 tip (titP, instring)
-     struct tit *titP;		/* We build an exploded instruction here. */
-     char *instring;		/* Text of a vax instruction: we modify. */
+     struct tit *titP;		/* We build an exploded instruction here.  */
+     char *instring;		/* Text of a vax instruction: we modify.  */
 {
-  register struct tot_wot *twP = NULL;	/* How to bit-encode this opcode. */
+  register struct tot_wot *twP = NULL;	/* How to bit-encode this opcode.  */
   register char *p;		/* 1/skip whitespace.2/scan vot_how */
   register char *q;		/*  */
   register unsigned char count;	/* counts number of operands seen */
   register struct top *operandp;/* scan operands in struct tit */
   register char *alloperr = "";	/* error over all operands */
   register char c;		/* Remember char, (we clobber it
-				   with '\0' temporarily). */
+				   with '\0' temporarily).  */
   char *save_input_line_pointer;
 
   if (*instring == ' ')
-    ++instring;			/* Skip leading whitespace. */
+    ++instring;			/* Skip leading whitespace.  */
   for (p = instring; *p && *p != ' '; p++)
     ;				/* MUST end in end-of-string or
-				   exactly 1 space. */
-  /* Scanned up to end of operation-code. */
-  /* Operation-code is ended with whitespace. */
+				   exactly 1 space.  */
+  /* Scanned up to end of operation-code.  */
+  /* Operation-code is ended with whitespace.  */
   if (p == instring)
     {
       titP->tit_error = _("No operator");
@@ -1516,7 +1514,7 @@ tip (titP, instring)
      * We trust instring points to an op-name, with no whitespace.
      */
       twP = (struct tot_wot *) hash_find (op_hash, instring);
-      *p = c;			/* Restore char after op-code. */
+      *p = c;			/* Restore char after op-code.  */
       if (twP == 0)
 	{
 	  titP->tit_error = _("Unknown operator");
@@ -1565,7 +1563,7 @@ tip (titP, instring)
 		  operandp->top_access = p[0];
 		  operandp->top_width = p[1];
 		  tip_op (instring - 1, operandp);
-		  *q = c;	/* Restore input text. */
+		  *q = c;	/* Restore input text.  */
 		  if (*(operandp->top_error))
 		    {
 		      alloperr = operandp->top_error;
@@ -1576,13 +1574,13 @@ tip (titP, instring)
 	      else
 		alloperr = _("Not enough operands");
 	    }
-	  /* Restore the pointer. */
+	  /* Restore the pointer.  */
 	  input_line_pointer = save_input_line_pointer;
 
 	  if (!*alloperr)
 	    {
 	      if (*instring == ' ')
-		instring++;	/* Skip whitespace. */
+		instring++;	/* Skip whitespace.  */
 	      if (*instring)
 		alloperr = _("Too many operands");
 	    }
@@ -1590,40 +1588,40 @@ tip (titP, instring)
 	}
     }
 
-  titP->tit_opcode = twP->code;	/* The op-code. */
+  titP->tit_opcode = twP->code;	/* The op-code.  */
   titP->tit_operands = count;
 }				/* tip */
 
 /* md_assemble() emit frags for 1 instruction */
 void
 md_assemble (instruction_string)
-     char *instruction_string;	/* A string: assemble 1 instruction. */
+     char *instruction_string;	/* A string: assemble 1 instruction.  */
 {
   char *p;
-  register struct top *operandP;/* An operand. Scans all operands. */
-  /*  char c_save;	fixme: remove this line *//* What used to live after an expression. */
-  /*  struct frag *fragP;	fixme: remove this line *//* Fragment of code we just made. */
+  register struct top *operandP;/* An operand. Scans all operands.  */
+  /*  char c_save;	fixme: remove this line *//* What used to live after an expression.  */
+  /*  struct frag *fragP;	fixme: remove this line *//* Fragment of code we just made.  */
   /*  register struct top *end_operandP; fixme: remove this line *//* -> slot just after last operand
-					Limit of the for (each operand). */
+					Limit of the for (each operand).  */
   register expressionS *expP;	/* -> expression values for this operand */
 
-  /* These refer to an instruction operand expression. */
+  /* These refer to an instruction operand expression.  */
   segT to_seg;			/* Target segment of the address.	 */
 
   register valueT this_add_number;
-  register symbolS *this_add_symbol;	/* +ve (minuend) symbol. */
+  register symbolS *this_add_symbol;	/* +ve (minuend) symbol.  */
 
-  /*  tahoe_opcodeT opcode_as_number; fixme: remove this line *//* The opcode as a number. */
-  char *opcodeP;		/* Where it is in a frag. */
-  /*  char *opmodeP;	fixme: remove this line *//* Where opcode type is, in a frag. */
+  /*  tahoe_opcodeT opcode_as_number; fixme: remove this line *//* The opcode as a number.  */
+  char *opcodeP;		/* Where it is in a frag.  */
+  /*  char *opmodeP;	fixme: remove this line *//* Where opcode type is, in a frag.  */
 
   int dispsize;			/* From top_dispsize: tahoe_operand_width
 				   (in bytes) */
   int is_undefined;		/* 1 if operand expression's
-				   segment not known yet. */
+				   segment not known yet.  */
   int pc_rel;			/* Is this operand pc relative? */
 
-  /* Decode the operand. */
+  /* Decode the operand.  */
   tip (&t, instruction_string);
 
   /*
@@ -1640,11 +1638,11 @@ md_assemble (instruction_string)
   else
     {
       /* We saw no errors in any operands - try to make frag(s) */
-      /* Emit op-code. */
-      /* Remember where it is, in case we want to modify the op-code later. */
+      /* Emit op-code.  */
+      /* Remember where it is, in case we want to modify the op-code later.  */
       opcodeP = frag_more (1);
       *opcodeP = t.tit_opcode;
-      /* Now do each operand. */
+      /* Now do each operand.  */
       for (operandP = t.tit_operand;
 	   operandP < t.tit_operand + t.tit_operands;
 	   operandP++)
@@ -1657,7 +1655,7 @@ md_assemble (instruction_string)
 	      FRAG_APPEND_1_CHAR (0x40 + operandP->top_ndx);
 	    }			/* if(top_ndx>=0) */
 
-	  /* Here to make main operand frag(s). */
+	  /* Here to make main operand frag(s).  */
 	  this_add_number = expP->X_add_number;
 	  this_add_symbol = expP->X_add_symbol;
 	  to_seg = operandP->seg_of_operand;
@@ -1675,14 +1673,14 @@ md_assemble (instruction_string)
 	  if (operandP->top_access == 'b')
 	    {
 	      /* Branches must be expressions. A psuedo branch can also jump to
-	   an absolute address. */
+	   an absolute address.  */
 	      if (to_seg == now_seg || is_undefined)
 		{
-		  /* If is_undefined, then it might BECOME now_seg by relax time. */
+		  /* If is_undefined, then it might BECOME now_seg by relax time.  */
 		  if (dispsize)
 		    {
 		      /* I know how big the branch is supposed to be (it's a normal
-	       branch), so I set up the frag, and let GAS do the rest. */
+	       branch), so I set up the frag, and let GAS do the rest.  */
 		      p = frag_more (dispsize);
 		      fix_new (frag_now, p - frag_now->fr_literal,
 			       this_add_symbol, this_add_number,
@@ -1693,7 +1691,7 @@ md_assemble (instruction_string)
 		    {
 		      /* (to_seg==now_seg || to_seg == SEG_UNKNOWN) && dispsize==0 */
 		      /* If we don't know how big it is, then its a synthetic branch,
-	       so we set up a simple relax state. */
+	       so we set up a simple relax state.  */
 		      switch (operandP->top_width)
 			{
 			case TAHOE_WIDTH_CONDITIONAL_JUMP:
@@ -1708,13 +1706,13 @@ md_assemble (instruction_string)
 			  break;
 			case TAHOE_WIDTH_ALWAYS_JUMP:
 			  /* Simple (unconditional) jump. I may have to convert this to
-		 a word branch, or an absolute jump. */
+		 a word branch, or an absolute jump.  */
 			  frag_var (rs_machine_dependent, 5, 1,
 				    ENCODE_RELAX (STATE_ALWAYS_BRANCH,
 				    is_undefined ? STATE_UNDF : STATE_BYTE),
 				 this_add_symbol, this_add_number, opcodeP);
 			  break;
-			  /* The smallest size for the next 2 cases is word. */
+			  /* The smallest size for the next 2 cases is word.  */
 			case TAHOE_WIDTH_BIG_REV_JUMP:
 			  frag_var (rs_machine_dependent, 8, 2,
 				    ENCODE_RELAX (STATE_BIG_REV_BRANCH,
@@ -1739,19 +1737,19 @@ md_assemble (instruction_string)
 		{
 		  /* to_seg != now_seg && to_seg != seg_unknown (still in branch)
 	     In other words, I'm jumping out of my segment so extend the
-	     branches to jumps, and let GAS fix them. */
+	     branches to jumps, and let GAS fix them.  */
 
 		  /* These are "branches" what will always be branches around a jump
 	     to the correct addresss in real life.
 	     If to_seg is SEG_ABSOLUTE, just encode the branch in,
-	     else let GAS fix the address. */
+	     else let GAS fix the address.  */
 
 		  switch (operandP->top_width)
 		    {
 		      /* The theory:
 	       For SEG_ABSOLUTE, then mode is ABSOLUTE_ADDR, jump
 	       to that addresss (not pc_rel).
-	       For other segs, address is a long word PC rel jump. */
+	       For other segs, address is a long word PC rel jump.  */
 		    case TAHOE_WIDTH_CONDITIONAL_JUMP:
 		      /* b<cond> */
 		      /* To reverse the condition in a TAHOE branch,
@@ -1835,11 +1833,11 @@ md_assemble (instruction_string)
 	    }
 	  else
 	    {
-	      /* It ain't a branch operand. */
+	      /* It ain't a branch operand.  */
 	      switch (operandP->top_mode)
 		{
 		  /* Auto-foo access, only works for one reg (SP)
-	     so the only thing needed is the mode. */
+	     so the only thing needed is the mode.  */
 		case TAHOE_AUTO_DEC:
 		case TAHOE_AUTO_INC:
 		case TAHOE_AUTO_INC_DEFERRED:
@@ -1854,7 +1852,7 @@ md_assemble (instruction_string)
 		  break;
 
 		  /* An absolute address. It's size is always 5 bytes.
-	     (mode_type + 4 byte address). */
+	     (mode_type + 4 byte address).  */
 		case TAHOE_ABSOLUTE_ADDR:
 		  know ((this_add_symbol == NULL));
 		  p = frag_more (5);
@@ -1863,7 +1861,7 @@ md_assemble (instruction_string)
 		  break;
 
 		  /* Immediate data. If the size isn't known, then it's an address
-	     + and offset, which is 4 bytes big. */
+	     + and offset, which is 4 bytes big.  */
 		case TAHOE_IMMEDIATE:
 		  if (this_add_symbol != NULL)
 		    {
@@ -1875,7 +1873,7 @@ md_assemble (instruction_string)
 		    }
 		  else
 		    {
-		      /* It's a integer, and I know it's size. */
+		      /* It's a integer, and I know it's size.  */
 		      if ((unsigned) this_add_number < 0x40)
 			{
 			  /* Will it fit in a literal? */
@@ -1906,7 +1904,7 @@ md_assemble (instruction_string)
 		  /* Distance from the PC. If the size isn't known, we have to relax
 	     into it. The difference between this and disp(sp) is that
 	     this offset is pc_rel, and disp(sp) isn't.
-	     Note the drop through code. */
+	     Note the drop through code.  */
 
 		case TAHOE_DISPLACED_RELATIVE:
 		case TAHOE_DISP_REL_DEFERRED:
@@ -1915,20 +1913,20 @@ md_assemble (instruction_string)
 
 		  /* Register, plus a displacement mode. Save the register number,
 	     and weather its deffered or not, and relax the size if it isn't
-	     known. */
+	     known.  */
 		case TAHOE_REG_DISP:
 		case TAHOE_REG_DISP_DEFERRED:
 		  if (operandP->top_mode == TAHOE_DISP_REL_DEFERRED ||
 		      operandP->top_mode == TAHOE_REG_DISP_DEFERRED)
 		    operandP->top_reg += 0x10;	/* deffered mode is always 0x10 higher
-					  than it's non-deffered sibling. */
+					  than it's non-deffered sibling.  */
 
 		  /* Is this a value out of this segment?
 	     The first part of this conditional is a cludge to make gas
 	     produce the same output as 'as' when there is a lable, in
 	     the current segment, displaceing a register. It's strange,
 	     and no one in their right mind would do it, but it's easy
-	     to cludge. */
+	     to cludge.  */
 		  if ((dispsize == 0 && !pc_rel) ||
 		      (to_seg != now_seg && !is_undefined && to_seg != SEG_ABSOLUTE))
 		    dispsize = 4;
@@ -1948,7 +1946,7 @@ md_assemble (instruction_string)
 		    }
 		  else
 		    {
-		      /* Either this is an abs, or a cast. */
+		      /* Either this is an abs, or a cast.  */
 		      p = frag_more (dispsize + 1);
 		      switch (dispsize)
 			{
@@ -1975,8 +1973,7 @@ md_assemble (instruction_string)
     }				/* if(!need_pass_2 && !goofed) */
 }				/* tahoe_assemble() */
 
-
-/* We have no need to default values of symbols. */
+/* We have no need to default values of symbols.  */
 
 /* ARGSUSED */
 symbolS *
@@ -1986,7 +1983,7 @@ md_undefined_symbol (name)
   return 0;
 }				/* md_undefined_symbol() */
 
-/* Round up a section size to the appropriate boundary. */
+/* Round up a section size to the appropriate boundary.  */
 valueT
 md_section_align (segment, size)
      segT segment;
@@ -1999,7 +1996,7 @@ md_section_align (segment, size)
    On the sparc, they're relative to the address of the offset, plus
    its size.  This gets us to the following instruction.
    (??? Is this right?  FIXME-SOON) */
-long 
+long
 md_pcrel_from (fixP)
      fixS *fixP;
 {
@@ -2015,7 +2012,7 @@ md_pcrel_from (fixP)
 		 : 0))) + fixP->fx_where + fixP->fx_frag->fr_address);
 }				/* md_pcrel_from() */
 
-int 
+int
 tc_is_pcrel (fixP)
      fixS *fixP;
 {
@@ -2023,5 +2020,3 @@ tc_is_pcrel (fixP)
   know (0);
   return (0);
 }				/* tc_is_pcrel() */
-
-/* end of tc-tahoe.c */
diff --git a/gas/config/tc-tahoe.h b/gas/config/tc-tahoe.h
index be8a5bea8e..e18029fee1 100644
--- a/gas/config/tc-tahoe.h
+++ b/gas/config/tc-tahoe.h
@@ -1,6 +1,6 @@
 /* This file is tc-tahoe.h
 
-   Copyright (C) 1987-1992 Free Software Foundation, Inc.
+   Copyright (C) 1987-1992, 2000 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -15,8 +15,9 @@
    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.  */
+   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.  */
 
 #define TC_TAHOE 1
 
@@ -24,8 +25,8 @@
 
 #define NO_LISTING
 
-#define tc_headers_hook(a)		{;}	/* don't need it. */
-#define tc_crawl_symbol_chain(a)	{;}	/* don't need it. */
+#define tc_headers_hook(a)		{;}	/* don't need it.  */
+#define tc_crawl_symbol_chain(a)	{;}	/* don't need it.  */
 #define tc_aout_pre_write_hook(a)	{;}
 
 #define md_operand(x)
@@ -39,5 +40,3 @@ extern const struct relax_type md_relax_table[];
  * fill-column: 131
  * End:
  */
-
-/* end of tc-tahoe.h */