Convert to ISO C90 formatting

1 files changed, 269 insertions, 529 deletions

diff --git a/gas/config/tc-pdp11.c b/gas/config/tc-pdp11.c
index 71870bd..19311e6 100644
--- a/gas/config/tc-pdp11.c
+++ b/gas/config/tc-pdp11.c
@@ -17,37 +17,22 @@
    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.  */
 
-/*
-  Apparently unused functions:
-    md_convert_frag
-    md_estimate_size_before_relax
-    md_create_short_jump
-    md_create_long_jump
-*/
-
 #include "as.h"
 #include "safe-ctype.h"
 #include "opcode/pdp11.h"
 
-static int set_option PARAMS ((char *arg));
-static int set_cpu_model PARAMS ((char *arg));
-static int set_machine_model PARAMS ((char *arg));
-
-extern int flonum_gen2vax PARAMS ((char format_letter, FLONUM_TYPE * f,
-                                   LITTLENUM_TYPE * words));
+extern int flonum_gen2vax (int, FLONUM_TYPE * f, LITTLENUM_TYPE *);
 
-#define TRUE 1
+#define TRUE  1
 #define FALSE 0
 
-/*
- * A representation for PDP-11 machine code.
- */
+/* A representation for PDP-11 machine code.  */
 struct pdp11_code
 {
   char *error;
   int code;
-  int additional;	/* is there an additional word? */
-  int word;		/* additional word, if any */
+  int additional;	/* Is there an additional word?  */
+  int word;		/* Additional word, if any.  */
   struct
   {
     bfd_reloc_code_real_type type;
@@ -56,17 +41,13 @@ struct pdp11_code
   } reloc;
 };
 
-/*
- * Instruction set extensions.
- *
- * If you change this from an array to something else, please update
- * the "PDP-11 instruction set extensions" comment in pdp11.h.
- */
+/* Instruction set extensions.
+
+   If you change this from an array to something else, please update
+   the "PDP-11 instruction set extensions" comment in pdp11.h.  */
 int pdp11_extension[PDP11_EXT_NUM];
 
-/*
- * Assembly options.
- */
+/* Assembly options.  */
 
 #define ASM_OPT_PIC 1
 #define ASM_OPT_NUM 2
@@ -74,7 +55,7 @@ int pdp11_extension[PDP11_EXT_NUM];
 int asm_option[ASM_OPT_NUM];
 
 /* These chars start a comment anywhere in a source file (except inside
-   another comment */
+   another comment.  */
 const char comment_chars[] = "#/";
 
 /* These chars only start a comment at the beginning of a line.  */
@@ -82,12 +63,12 @@ const char line_comment_chars[] = "#/";
 
 const char line_separator_chars[] = ";";
 
-/* Chars that can be used to separate mant from exp in floating point nums */
+/* Chars that can be used to separate mant from exp in floating point nums.  */
 const char EXP_CHARS[] = "eE";
 
-/* Chars that mean this number is a floating point constant */
-/* as in 0f123.456 */
-/* or    0H1.234E-12 (see exp chars above) */
+/* Chars that mean this number is a floating point constant.  */
+/* as in 0f123.456.  */
+/* or    0H1.234E-12 (see exp chars above).  */
 const char FLT_CHARS[] = "dDfF";
 
 void pseudo_even (int);
@@ -100,8 +81,94 @@ const pseudo_typeS md_pseudo_table[] =
   { 0, 0, 0 },
 };
 
+static struct hash_control *insn_hash = NULL;
+
+static int
+set_option (char *arg)
+{
+  int yes = 1;
+
+  if (strcmp (arg, "all-extensions") == 0
+      || strcmp (arg, "all") == 0)
+    {
+      memset (pdp11_extension, ~0, sizeof pdp11_extension);
+      pdp11_extension[PDP11_NONE] = 0;
+      return 1;
+    }
+  else if (strcmp (arg, "no-extensions") == 0)
+    {
+      memset (pdp11_extension, 0, sizeof pdp11_extension);
+      pdp11_extension[PDP11_BASIC] = 1;
+      return 1;
+    }
+
+  if (strncmp (arg, "no-", 3) == 0)
+    {
+      yes = 0;
+      arg += 3;
+    }
+
+  /* Commersial instructions.  */
+  if (strcmp (arg, "cis") == 0)
+    pdp11_extension[PDP11_CIS] = yes;
+  /* Call supervisor mode.  */
+  else if (strcmp (arg, "csm") == 0)
+    pdp11_extension[PDP11_CSM] = yes;
+  /* Extended instruction set.  */
+  else if (strcmp (arg, "eis") == 0)
+    pdp11_extension[PDP11_EIS] = pdp11_extension[PDP11_LEIS] = yes;
+  /* KEV11 floating-point.  */
+  else if (strcmp (arg, "fis") == 0
+	   || strcmp (arg, "kev11") == 0
+	   || strcmp (arg, "kev-11") == 0)
+    pdp11_extension[PDP11_FIS] = yes;
+  /* FP-11 floating-point.  */
+  else if (strcmp (arg, "fpp") == 0
+	   || strcmp (arg, "fpu") == 0
+	   || strcmp (arg, "fp11") == 0
+	   || strcmp (arg, "fp-11") == 0
+	   || strcmp (arg, "fpj11") == 0
+	   || strcmp (arg, "fp-j11") == 0
+	   || strcmp (arg, "fpj-11") == 0)
+    pdp11_extension[PDP11_FPP] = yes;
+  /* Limited extended insns.  */
+  else if (strcmp (arg, "limited-eis") == 0)
+    {
+      pdp11_extension[PDP11_LEIS] = yes;
+      if (!pdp11_extension[PDP11_LEIS])
+	pdp11_extension[PDP11_EIS] = 0;
+    }
+  /* Move from processor type.  */
+  else if (strcmp (arg, "mfpt") == 0)
+    pdp11_extension[PDP11_MFPT] = yes;
+  /* Multiprocessor insns:  */
+  else if (strncmp (arg, "mproc", 5) == 0
+	   /* TSTSET, WRTLCK */
+	   || strncmp (arg, "multiproc", 9) == 0)
+    pdp11_extension[PDP11_MPROC] = yes;
+  /* Move from/to proc status.  */
+  else if (strcmp (arg, "mxps") == 0)
+    pdp11_extension[PDP11_MXPS] = yes;
+  /* Position-independent code.  */
+  else if (strcmp (arg, "pic") == 0)
+    asm_option[ASM_OPT_PIC] = yes;
+  /* Set priority level.  */
+  else if (strcmp (arg, "spl") == 0)
+    pdp11_extension[PDP11_SPL] = yes;
+  /* Microcode instructions:  */
+  else if (strcmp (arg, "ucode") == 0
+	   /* LDUB, MED, XFC */
+	   || strcmp (arg, "microcode") == 0)
+    pdp11_extension[PDP11_UCODE] = yes;
+  else
+    return 0;
+
+  return 1;
+}
+
+
 static void
-init_defaults ()
+init_defaults (void)
 {
   static int first = 1;
 
@@ -113,10 +180,8 @@ init_defaults ()
     }
 }
 
-static struct hash_control *insn_hash = NULL;
-
 void
-md_begin ()
+md_begin (void)
 {
   int i;
 
@@ -127,21 +192,17 @@ md_begin ()
     as_fatal ("Virtual memory exhausted");
 
   for (i = 0; i < pdp11_num_opcodes; i++)
-    hash_insert (insn_hash, pdp11_opcodes[i].name, (PTR)(pdp11_opcodes + i));
+    hash_insert (insn_hash, pdp11_opcodes[i].name, (void *) (pdp11_opcodes + i));
   for (i = 0; i < pdp11_num_aliases; i++)
-    hash_insert (insn_hash, pdp11_aliases[i].name, (PTR)(pdp11_aliases + i));
+    hash_insert (insn_hash, pdp11_aliases[i].name, (void *) (pdp11_aliases + i));
 }
 
 void
-md_number_to_chars (con, value, nbytes)
-     char con[];
-     valueT value;
-     int nbytes;
+md_number_to_chars (char con[], valueT value, int nbytes)
 {
   /* On a PDP-11, 0x1234 is stored as "\x12\x34", and
-   * 0x12345678 is stored as "\x56\x78\x12\x34". It's
-   * anyones guess what 0x123456 would be stored like.
-   */
+     0x12345678 is stored as "\x56\x78\x12\x34". It's
+     anyones guess what 0x123456 would be stored like.  */
 
   switch (nbytes)
     {
@@ -151,13 +212,13 @@ md_number_to_chars (con, value, nbytes)
       con[0] =  value       & 0xff;
       break;
     case 2:
-      con[0] =  value       & 0xff;
+      con[0] =  value        & 0xff;
       con[1] = (value >>  8) & 0xff;
       break;
     case 4:
       con[0] = (value >> 16) & 0xff;
       con[1] = (value >> 24) & 0xff;
-      con[2] =  value       & 0xff;
+      con[2] =  value        & 0xff;
       con[3] = (value >>  8) & 0xff;
       break;
     default:
@@ -169,10 +230,9 @@ md_number_to_chars (con, value, nbytes)
    that they reference.  Knows about order of bytes in address.  */
 
 void
-md_apply_fix3 (fixP, valP, seg)
-     fixS *fixP;
-     valueT * valP;
-     segT seg ATTRIBUTE_UNUSED;
+md_apply_fix3 (fixS *fixP,
+	       valueT * valP,
+	       segT seg ATTRIBUTE_UNUSED)
 {
   valueT code;
   valueT mask;
@@ -223,10 +283,8 @@ md_chars_to_number (con, nbytes)
      int nbytes;		/* Number of bytes in the input.  */
 {
   /* On a PDP-11, 0x1234 is stored as "\x12\x34", and
-   * 0x12345678 is stored as "\x56\x78\x12\x34". It's
-   * anyones guess what 0x123456 would be stored like.
-   */
-
+     0x12345678 is stored as "\x56\x78\x12\x34". It's
+     anyones guess what 0x123456 would be stored like.  */
   switch (nbytes)
     {
     case 0:
@@ -237,8 +295,8 @@ md_chars_to_number (con, nbytes)
       return (con[1] << BITS_PER_CHAR) | con[0];
     case 4:
       return
-	(((con[1] << BITS_PER_CHAR) | con[0]) << (2 * BITS_PER_CHAR)) |
-	 ((con[3] << BITS_PER_CHAR) | con[2]);
+	(((con[1] << BITS_PER_CHAR) | con[0]) << (2 * BITS_PER_CHAR))
+	|((con[3] << BITS_PER_CHAR) | con[2]);
     default:
       BAD_CASE (nbytes);
       return 0;
@@ -280,14 +338,14 @@ parse_reg (char *str, struct pdp11_code *operand)
 	  return str - 1;
 	}
     }
-  else if (strncmp (str, "sp", 2) == 0 ||
-	   strncmp (str, "SP", 2) == 0)
+  else if (strncmp (str, "sp", 2) == 0
+	   || strncmp (str, "SP", 2) == 0)
     {
       operand->code = 6;
       str += 2;
     }
-  else if (strncmp (str, "pc", 2) == 0 ||
-	   strncmp (str, "PC", 2) == 0)
+  else if (strncmp (str, "pc", 2) == 0
+	   || strncmp (str, "PC", 2) == 0)
     {
       operand->code = 7;
       str += 2;
@@ -305,10 +363,10 @@ static char *
 parse_ac5 (char *str, struct pdp11_code *operand)
 {
   str = skip_whitespace (str);
-  if (strncmp (str, "fr", 2) == 0 ||
-      strncmp (str, "FR", 2) == 0 ||
-      strncmp (str, "ac", 2) == 0 ||
-      strncmp (str, "AC", 2) == 0)
+  if (strncmp (str, "fr", 2) == 0
+      || strncmp (str, "FR", 2) == 0
+      || strncmp (str, "ac", 2) == 0
+      || strncmp (str, "AC", 2) == 0)
     {
       str += 2;
       switch (*str)
@@ -400,7 +458,8 @@ parse_op_no_deferred (char *str, struct pdp11_code *operand)
 	}
       break;
 
-    case '#':				/* immediate */
+      /* Immediate.  */
+    case '#':
     case '$':
       str = parse_expression (str + 1, operand);
       if (operand->error)
@@ -423,7 +482,7 @@ parse_op_no_deferred (char *str, struct pdp11_code *operand)
               operand->error = "Error in expression";
               break;
             }
-          /* it's a floating literal...  */
+          /* It's a floating literal...  */
           know (operand->reloc.exp.X_add_number < 0);
           flonum_gen2vax ('f', &generic_floating_point_number, literal_float);
           operand->word = literal_float[0];
@@ -437,7 +496,8 @@ parse_op_no_deferred (char *str, struct pdp11_code *operand)
       operand->code = 027;
       break;
 
-    default:				/* label, d(rn), -(rn) */
+      /* label, d(rn), -(rn)  */
+    default:
       {
 	char *old = str;
 
@@ -463,7 +523,7 @@ parse_op_no_deferred (char *str, struct pdp11_code *operand)
 
 	str = skip_whitespace (str);
 
-	if (*str != '(')		/* label */
+	if (*str != '(')
 	  {
 	    if (operand->reloc.exp.X_op != O_symbol)
 	      {
@@ -478,7 +538,8 @@ parse_op_no_deferred (char *str, struct pdp11_code *operand)
 	    break;
 	  }
 
-	str++;				/* d(rn) */
+	/* d(rn) */
+	str++;
 	str = parse_reg (str, operand);
 	if (operand->error)
 	  return str;
@@ -507,9 +568,8 @@ parse_op_no_deferred (char *str, struct pdp11_code *operand)
 		operand->word = operand->reloc.exp.X_add_number;
 	      }
 	    else
-	      {
-		operand->word = operand->reloc.exp.X_add_number;
-	      }
+	      operand->word = operand->reloc.exp.X_add_number;
+
 	    break;
 	  default:
 	    BAD_CASE (operand->reloc.exp.X_op);
@@ -591,8 +651,7 @@ parse_separator (char *str, int *error)
 }
 
 void
-md_assemble (instruction_string)
-     char *instruction_string;
+md_assemble (char *instruction_string)
 {
   const struct pdp11_opcode *op;
   struct pdp11_code insn, op1, op2;
@@ -957,18 +1016,16 @@ md_assemble (instruction_string)
 }
 
 int
-md_estimate_size_before_relax (fragP, segment)
-     fragS *fragP ATTRIBUTE_UNUSED;
-     segT segment ATTRIBUTE_UNUSED;
+md_estimate_size_before_relax (fragS *fragP ATTRIBUTE_UNUSED,
+			       segT segment ATTRIBUTE_UNUSED)
 {
   return 0;
 }
 
 void
-md_convert_frag (headers, seg, fragP)
-     bfd *headers ATTRIBUTE_UNUSED;
-     segT seg ATTRIBUTE_UNUSED;
-     fragS *fragP ATTRIBUTE_UNUSED;
+md_convert_frag (bfd *headers ATTRIBUTE_UNUSED,
+		 segT seg ATTRIBUTE_UNUSED,
+		 fragS *fragP ATTRIBUTE_UNUSED)
 {
 }
 
@@ -976,98 +1033,25 @@ int md_short_jump_size = 2;
 int md_long_jump_size = 4;
 
 void
-md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol)
-     char *ptr ATTRIBUTE_UNUSED;
-     addressT from_addr ATTRIBUTE_UNUSED;
-     addressT to_addr ATTRIBUTE_UNUSED;
-     fragS *frag ATTRIBUTE_UNUSED;
-     symbolS *to_symbol ATTRIBUTE_UNUSED;
+md_create_short_jump (char *ptr ATTRIBUTE_UNUSED,
+		      addressT from_addr ATTRIBUTE_UNUSED,
+		      addressT to_addr ATTRIBUTE_UNUSED,
+		      fragS *frag ATTRIBUTE_UNUSED,
+		      symbolS *to_symbol ATTRIBUTE_UNUSED)
 {
 }
 
 void
-md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
-     char *ptr ATTRIBUTE_UNUSED;
-     addressT from_addr ATTRIBUTE_UNUSED;
-     addressT to_addr ATTRIBUTE_UNUSED;
-     fragS *frag ATTRIBUTE_UNUSED;
-     symbolS *to_symbol ATTRIBUTE_UNUSED;
+md_create_long_jump (char *ptr ATTRIBUTE_UNUSED,
+		     addressT from_addr ATTRIBUTE_UNUSED,
+		     addressT to_addr ATTRIBUTE_UNUSED,
+		     fragS *frag ATTRIBUTE_UNUSED,
+		     symbolS *to_symbol ATTRIBUTE_UNUSED)
 {
 }
 
 static int
-set_option (arg)
-     char *arg;
-{
-  int yes = 1;
-
-  if (strcmp (arg, "all-extensions") == 0 ||
-      strcmp (arg, "all") == 0)
-    {
-      memset (pdp11_extension, ~0, sizeof pdp11_extension);
-      pdp11_extension[PDP11_NONE] = 0;
-      return 1;
-    }
-  else if (strcmp (arg, "no-extensions") == 0)
-    {
-      memset (pdp11_extension, 0, sizeof pdp11_extension);
-      pdp11_extension[PDP11_BASIC] = 1;
-      return 1;
-    }
-
-  if (strncmp (arg, "no-", 3) == 0)
-    {
-      yes = 0;
-      arg += 3;
-    }
-
-  if (strcmp (arg, "cis") == 0)			/* commersial instructions */
-    pdp11_extension[PDP11_CIS] = yes;
-  else if (strcmp (arg, "csm") == 0)		/* call supervisor mode */
-    pdp11_extension[PDP11_CSM] = yes;
-  else if (strcmp (arg, "eis") == 0)		/* extended instruction set */
-    pdp11_extension[PDP11_EIS] = pdp11_extension[PDP11_LEIS] = yes;
-  else if (strcmp (arg, "fis") == 0 ||		/* KEV11 floating-point */
-	   strcmp (arg, "kev11") == 0 ||
-	   strcmp (arg, "kev-11") == 0)
-    pdp11_extension[PDP11_FIS] = yes;
-  else if (strcmp (arg, "fpp") == 0 ||		/* FP-11 floating-point */
-	   strcmp (arg, "fpu") == 0 ||
-	   strcmp (arg, "fp11") == 0 ||
-	   strcmp (arg, "fp-11") == 0 ||
-	   strcmp (arg, "fpj11") == 0 ||
-	   strcmp (arg, "fp-j11") == 0 ||
-	   strcmp (arg, "fpj-11") == 0)
-    pdp11_extension[PDP11_FPP] = yes;
-  else if (strcmp (arg, "limited-eis") == 0)	/* limited extended insns */
-    {
-      pdp11_extension[PDP11_LEIS] = yes;
-      if (!pdp11_extension[PDP11_LEIS])
-	pdp11_extension[PDP11_EIS] = 0;
-    }
-  else if (strcmp (arg, "mfpt") == 0)		/* move from processor type */
-    pdp11_extension[PDP11_MFPT] = yes;
-  else if (strncmp (arg, "mproc", 5) == 0 ||	/* multiprocessor insns: */
-	   strncmp (arg, "multiproc", 9) == 0 )	/* TSTSET, WRTLCK */
-    pdp11_extension[PDP11_MPROC] = yes;
-  else if (strcmp (arg, "mxps") == 0)		/* move from/to proc status */
-    pdp11_extension[PDP11_MXPS] = yes;
-  else if (strcmp (arg, "pic") == 0)		/* position-independent code */
-    asm_option[ASM_OPT_PIC] = yes;
-  else if (strcmp (arg, "spl") == 0)		/* set priority level */
-    pdp11_extension[PDP11_SPL] = yes;
-  else if (strcmp (arg, "ucode") == 0 ||	/* microcode instructions: */
-	   strcmp (arg, "microcode") == 0)	/* LDUB, MED, XFC */
-    pdp11_extension[PDP11_UCODE] = yes;
-  else
-    return 0;
-
-  return 1;
-}
-
-static int
-set_cpu_model (arg)
-     char *arg;
+set_cpu_model (char *arg)
 {
   char buf[4];
   char *model = buf;
@@ -1082,8 +1066,7 @@ set_cpu_model (arg)
 
   if (model[-1] == 'd')
     {
-      if (arg[0] == 'f' ||
-	  arg[0] == 'j')
+      if (arg[0] == 'f' || arg[0] == 'j')
 	model[-1] = *arg++;
     }
   else if (model[-1] == 'x')
@@ -1105,7 +1088,7 @@ set_cpu_model (arg)
 	return 0;
     }
 
-  /* allow up to two revision letters */
+  /* Allow up to two revision letters.  */
   if (arg[0] != 0)
     *model++ = *arg++;
   if (arg[0] != 0)
@@ -1115,70 +1098,80 @@ set_cpu_model (arg)
 
   set_option ("no-extensions");
 
-  if (strncmp (buf, "a", 1) == 0)		/* KA11 (11/15/20) */
-    return 1; /* no extensions */
+  /* KA11 (11/15/20).  */
+  if (strncmp (buf, "a", 1) == 0)
+    return 1; /* No extensions.  */
 
-  else if (strncmp (buf, "b", 1) == 0)		/* KB11 (11/45/50/55/70) */
-    return set_option ("eis") &&
-           set_option ("spl");
+  /* KB11 (11/45/50/55/70).  */
+  else if (strncmp (buf, "b", 1) == 0)
+    return set_option ("eis") && set_option ("spl");
 
-  else if (strncmp (buf, "da", 2) == 0)		/* KD11-A (11/35/40) */
+  /* KD11-A (11/35/40).  */
+  else if (strncmp (buf, "da", 2) == 0)
     return set_option ("limited-eis");
 
-  else if (strncmp (buf, "db", 2) == 0 ||	/* KD11-B (11/05/10) */
-	   strncmp (buf, "dd", 2) == 0)		/* KD11-D (11/04) */
+  /* KD11-B (11/05/10).  */
+  else if (strncmp (buf, "db", 2) == 0
+	   /* KD11-D (11/04).  */
+	   || strncmp (buf, "dd", 2) == 0)
     return 1; /* no extensions */
 
-  else if (strncmp (buf, "de", 2) == 0)		/* KD11-E (11/34) */
-    return set_option ("eis") &&
-           set_option ("mxps");
-
-  else if (strncmp (buf, "df", 2) == 0 ||	/* KD11-F (11/03) */
-	   strncmp (buf, "dh", 2) == 0 ||	/* KD11-H (11/03) */
-	   strncmp (buf, "dq", 2) == 0)		/* KD11-Q (11/03) */
-    return set_option ("limited-eis") &&
-           set_option ("mxps");
-
-  else if (strncmp (buf, "dk", 2) == 0)		/* KD11-K (11/60) */
-    return set_option ("eis") &&
-           set_option ("mxps") &&
-           set_option ("ucode");
-
-  else if (strncmp (buf, "dz", 2) == 0)		/* KD11-Z (11/44) */
-    return set_option ("csm") &&
-           set_option ("eis") &&
-           set_option ("mfpt") &&
-           set_option ("mxps") &&
-           set_option ("spl");
-
-  else if (strncmp (buf, "f", 1) == 0)		/* F11 (11/23/24) */
-    return set_option ("eis") &&
-           set_option ("mfpt") &&
-           set_option ("mxps");
-
-  else if (strncmp (buf, "j", 1) == 0)		/* J11 (11/53/73/83/84/93/94)*/
-    return set_option ("csm") &&
-           set_option ("eis") &&
-           set_option ("mfpt") &&
-           set_option ("multiproc") &&
-           set_option ("mxps") &&
-           set_option ("spl");
-
-  else if (strncmp (buf, "t", 1) == 0)		/* T11 (11/21) */
-    return set_option ("limited-eis") &&
-           set_option ("mxps");
+  /* KD11-E (11/34).  */
+  else if (strncmp (buf, "de", 2) == 0)
+    return set_option ("eis") && set_option ("mxps");
+
+  /* KD11-F (11/03).  */
+  else if (strncmp (buf, "df", 2) == 0
+	   /* KD11-H (11/03).  */
+	   || strncmp (buf, "dh", 2) == 0
+	   /* KD11-Q (11/03).  */
+	   || strncmp (buf, "dq", 2) == 0)
+    return set_option ("limited-eis") && set_option ("mxps");
+
+  /* KD11-K (11/60).  */
+  else if (strncmp (buf, "dk", 2) == 0)
+    return set_option ("eis")
+      && set_option ("mxps")
+      && set_option ("ucode");
+
+  /* KD11-Z (11/44).  */
+  else if (strncmp (buf, "dz", 2) == 0)
+    return set_option ("csm")
+      && set_option ("eis")
+      && set_option ("mfpt")
+      && set_option ("mxps")
+      && set_option ("spl");
+
+  /* F11 (11/23/24).  */
+  else if (strncmp (buf, "f", 1) == 0)
+    return set_option ("eis")
+      && set_option ("mfpt")
+      && set_option ("mxps");
+
+  /* J11 (11/53/73/83/84/93/94).  */
+  else if (strncmp (buf, "j", 1) == 0)
+    return set_option ("csm")
+      && set_option ("eis")
+      && set_option ("mfpt")
+      && set_option ("multiproc")
+      && set_option ("mxps")
+      && set_option ("spl");
+
+  /* T11 (11/21).  */
+  else if (strncmp (buf, "t", 1) == 0)
+    return set_option ("limited-eis")
+      && set_option ("mxps");
 
   else
     return 0;
 }
 
 static int
-set_machine_model (arg)
-     char *arg;
+set_machine_model (char *arg)
 {
-  if (strncmp (arg, "pdp-11/", 7) != 0 &&
-      strncmp (arg, "pdp11/", 6) != 0 &&
-      strncmp (arg, "11/", 3) != 0)
+  if (strncmp (arg, "pdp-11/", 7) != 0
+      && strncmp (arg, "pdp11/", 6) != 0
+      && strncmp (arg, "11/", 3) != 0)
     return 0;
 
   if (strncmp (arg, "pdp", 3) == 0)
@@ -1188,56 +1181,56 @@ set_machine_model (arg)
   if (strncmp (arg, "11/", 3) == 0)
     arg += 3;
 
-  if (strcmp (arg, "03") == 0)			/* 11/03 */
-    return set_cpu_model ("kd11f");		/* KD11-F */
+  if (strcmp (arg, "03") == 0)
+    return set_cpu_model ("kd11f");
+
+  else if (strcmp (arg, "04") == 0)
+    return set_cpu_model ("kd11d");
 
-  else if (strcmp (arg, "04") == 0)		/* 11/04 */
-    return set_cpu_model ("kd11d");		/* KD11-D */
+  else if (strcmp (arg, "05") == 0
+	   || strcmp (arg, "10") == 0)
+    return set_cpu_model ("kd11b");
 
-  else if (strcmp (arg, "05") == 0 ||		/* 11/05 or 11/10 */
-	   strcmp (arg, "10") == 0)
-    return set_cpu_model ("kd11b");		/* KD11-B */
+  else if (strcmp (arg, "15") == 0
+	   || strcmp (arg, "20") == 0)
+    return set_cpu_model ("ka11");
 
-  else if (strcmp (arg, "15") == 0 ||		/* 11/15 or 11/20 */
-	   strcmp (arg, "20") == 0)
-    return set_cpu_model ("ka11");		/* KA11 */
+  else if (strcmp (arg, "21") == 0)
+    return set_cpu_model ("t11");
 
-  else if (strcmp (arg, "21") == 0)		/* 11/21 */
-    return set_cpu_model ("t11");		/* T11 */
+  else if (strcmp (arg, "23") == 0
+	   || strcmp (arg, "24") == 0)
+    return set_cpu_model ("f11");
 
-  else if (strcmp (arg, "23") == 0 ||		/* 11/23 or 11/24 */
-	   strcmp (arg, "24") == 0)
-    return set_cpu_model ("f11");		/* F11 */
+  else if (strcmp (arg, "34") == 0
+	   || strcmp (arg, "34a") == 0)
+    return set_cpu_model ("kd11e");
 
-  else if (strcmp (arg, "34") == 0 ||		/* 11/34 or 11/34a */
-           strcmp (arg, "34a") == 0)
-    return set_cpu_model ("kd11e");		/* KD11-E */
+  else if (strcmp (arg, "35") == 0
+	   || strcmp (arg, "40") == 0)
+    return set_cpu_model ("kd11da");
 
-  else if (strcmp (arg, "35") == 0 ||		/* 11/35 or 11/40 */
-	   strcmp (arg, "40") == 0)
-    return set_cpu_model ("kd11da");		/* KD11-A */
+  else if (strcmp (arg, "44") == 0)
+    return set_cpu_model ("kd11dz");
 
-  else if (strcmp (arg, "44") == 0)		/* 11/44 */
-    return set_cpu_model ("kd11dz");		/* KD11-Z */
+  else if (strcmp (arg, "45") == 0
+	   || strcmp (arg, "50") == 0
+	   || strcmp (arg, "55") == 0
+	   || strcmp (arg, "70") == 0)
+    return set_cpu_model ("kb11");
 
-  else if (strcmp (arg, "45") == 0 ||		/* 11/45/50/55/70 */
-	   strcmp (arg, "50") == 0 ||
-	   strcmp (arg, "55") == 0 ||
-	   strcmp (arg, "70") == 0)
-    return set_cpu_model ("kb11");		/* KB11 */
+  else if (strcmp (arg, "60") == 0)
+    return set_cpu_model ("kd11k");
 
-  else if (strcmp (arg, "60") == 0)		/* 11/60 */
-    return set_cpu_model ("kd11k");		/* KD11-K */ /* FPP? */
+  else if (strcmp (arg, "53") == 0
+	   || strcmp (arg, "73") == 0
+	   || strcmp (arg, "83") == 0
+	   || strcmp (arg, "84") == 0
+	   || strcmp (arg, "93") == 0
+	   || strcmp (arg, "94") == 0)
+    return set_cpu_model ("j11")
+      && set_option ("fpp");
 
-  else if (strcmp (arg, "53") == 0 ||		/* 11/53/73/83/84/93/94 */
-	   strcmp (arg, "73") == 0 ||
-	   strcmp (arg, "83") == 0 ||
-	   strcmp (arg, "84") == 0 ||
-	   strcmp (arg, "93") == 0 ||
-	   strcmp (arg, "94") == 0)
-    return set_cpu_model ("j11") &&		/* J11 */
-           set_option ("fpp");			/* All J11 machines come */
-						/* with FPP installed.  */
   else
     return 0;
 }
@@ -1257,16 +1250,11 @@ struct option md_longopts[] =
 
 size_t md_longopts_size = sizeof (md_longopts);
 
-/*
- * md_parse_option
- *	Invocation line includes a switch not recognized by the base assembler.
- *	See if it's a processor-specific option.
- */
+/* Invocation line includes a switch not recognized by the base assembler.
+   See if it's a processor-specific option.  */
 
 int
-md_parse_option (c, arg)
-     int c;
-     char *arg;
+md_parse_option (int c, char *arg)
 {
   init_defaults ();
 
@@ -1303,249 +1291,8 @@ md_parse_option (c, arg)
   return 0;
 }
 
-/*
-One possible way of parsing options.
-
-enum
-{
-  OPTION_CSM,
-  OPTION_CIS,
-  ...
-};
-
-struct
-{
-  const char *pattern;
-  int opt;
-  const char *description;
-} options;
-
-static struct options extension_opts[] =
-{
-  { "Ncsm", OPTION_CSM,
-			"allow (disallow) CSM instruction" },
-  { "Ncis", OPTION_CIS,
-			"allow (disallow) commersial instruction set" },
-  { "Neis", OPTION_EIS,
-			"allow (disallow) extended instruction set" },
-  ...
-  { "all-extensions", OPTION_ALL_EXTENSIONS,
-			"allow all instruction set extensions\n\
-			(this is the default)" },
-  { "no-extensions", OPTION_NO_EXTENSIONS,
-			"disallow all instruction set extensions" },
-  { "pic", OPTION_PIC,
-			"position-independent code" },
-};
-
-static struct options cpu_opts[] =
-{
-  { "Ka_11_*", OPTION_KA11, "KA11 CPU. ..." },
-  { "Kb_11_*", OPTION_KB11, "KB11 CPU. ..." },
-  { "Kd_11_a*", OPTION_KD11A, "KD11-A CPU. ..." },
-  { "Kd_11_b*", OPTION_KD11B, "KD11-B CPU. ..." },
-  { "Kd_11_d*", OPTION_KD11D, "KD11-D CPU. ..." },
-  { "Kd_11_e*", OPTION_KD11E, "KD11-E CPU. ..." },
-  { "Kd_11_f*", OPTION_KD11F, "KD11-F CPU. ..." },
-  { "Kd_11_h*", OPTION_KD11H, "KD11-H CPU. ..." },
-  { "Kd_11_q*", OPTION_KD11Q, "KD11-Q CPU. ..." },
-  { "Kd_11_z*", OPTION_KD11Z, "KD11-Z CPU. ..." },
-  { "Df_11_*", OPTION_F11, "F11 CPU. ..." },
-  { "Dj_11_*", OPTION_J11, "J11 CPU. ..." },
-  { "Dt_11_*", OPTION_T11, "T11 CPU. ..." },
-};
-
-static struct options model_opts[] =
-{
-  { "P03", OPTION_PDP11_03, "same as ..." },
-  { "P04", OPTION_PDP11_04, "same as ..." },
-  { "P05", OPTION_PDP11_05, "same as ..." },
-  { "P10", OPTION_PDP11_10, "same as ..." },
-  { "P15", OPTION_PDP11_15, "same as ..." },
-  { "P20", OPTION_PDP11_20, "same as ..." },
-  { "P21", OPTION_PDP11_21, "same as ..." },
-  { "P24", OPTION_PDP11_24, "same as ..." },
-  { "P34", OPTION_PDP11_34, "same as ..." },
-  { "P34a", OPTION_PDP11_34A, "same as ..." },
-  { "P40", OPTION_PDP11_40, "same as ..." },
-  { "P44", OPTION_PDP11_44, "same as ..." },
-  { "P45", OPTION_PDP11_45, "same as ..." },
-  { "P50", OPTION_PDP11_50, "same as ..." },
-  { "P53", OPTION_PDP11_53, "same as ..." },
-  { "P55", OPTION_PDP11_55, "same as ..." },
-  { "P60", OPTION_PDP11_60, "same as ..." },
-  { "P70", OPTION_PDP11_70, "same as ..." },
-  { "P73", OPTION_PDP11_73, "same as ..." },
-  { "P83", OPTION_PDP11_83, "same as ..." },
-  { "P84", OPTION_PDP11_84, "same as ..." },
-  { "P93", OPTION_PDP11_93, "same as ..." },
-  { "P94", OPTION_PDP11_94, "same as ..." },
-};
-
-struct
-{
-  const char *title;
-  struct options *opts;
-  int num;
-} all_opts[] =
-{
-  { "PDP-11 instruction set extentions",
-    extension_opts,
-    sizeof extension_opts / sizeof extension_opts[0] },
-  { "PDP-11 CPU model options",
-    cpu_opts,
-    sizeof cpu_opts / sizeof cpu_opts[0] },
-  { "PDP-11 machine model options",
-    model_opts,
-    sizeof model_opts / sizeof model_opts[0] },
-};
-
-int
-parse_match (char *arg, char *pattern)
-{
-  int yes = 1;
-
-  while (*pattern)
-    {
-      switch (*pattern++)
-	{
-	case 'N':
-	  if (strncmp (arg, "no-") == 0)
-	    {
-	      yes = 0;
-	      arg += 3;
-	    }
-	  break;
-
-	case 'K':
-	  if (arg[0] == 'k')
-	    arg++;
-	  break;
-
-	case 'D':
-	  if (strncmp (arg, "kd", 2) == 0)
-	    arg +=2;
-	  break;
-
-	case 'P':
-	  if (strncmp (arg, "pdp-11/", 7) == 0)
-	    arg += 7;
-	  else if (strncmp (arg, "pdp11/", 6) == 0)
-	    arg += 6;
-	  else if (strncmp (arg, "11/", 3) == 0)
-	    arg += 3;
-	  break;
-
-	case '_':
-	  if (arg[0] == "-")
-	    {
-	      if (*++arg == 0)
-		return 0;
-	    }
-	  break;
-
-	case '*':
-	  return 1;
-
-	default:
-	  if (*arg++ != pattern[-1])
-	    return 0;
-	}
-    }
-
-  return arg[0] == 0;
-}
-
-int
-fprint_opt (stream, pattern)
-     FILE *stream;
-     const char *pattern;
-{
-  int n;
-
-  while (*pattern)
-    {
-      switch (*pattern++)
-	{
-	case 'N':
-	  n += fprintf (stream, "(no-)");
-	  break;
-
-	case 'K':
-	  n += fprintf (stream, "k");
-	  break;
-
-	case 'P':
-	  n += fprintf (stream "11/");
-	  break;
-
-	case 'D':
-	case '_':
-	case '*':
-	  break;
-
-	default:
-	  fputc (pattern[-1], stream);
-	  n++;
-	}
-    }
-
-  return n;
-}
-
-int
-parse_option (char *arg)
-{
-  int i, j;
-
-  for (i = 0; i < sizeof all_opts / sizeof all_opts[0]; i++)
-    {
-      for (j = 0; j < all_opts[i].num; j++)
-	{
-	  if (parse_match (arg, all_opts[i].opts[j].pattern))
-	    {
-	      set_option (all_opts[i].opts[j].opt);
-	      return 1;
-	    }
-	}
-    }
-
-  return 0;
-}
-
-static void
-fprint_space (stream, n)
-     FILE *stream;
-     int n;
-{
-  while (n--)
-    fputc (' ', stream);
-}
-
 void
-md_show_usage (stream)
-     FILE *stream;
-{
-  int i, j, n;
-
-  for (i = 0; i < sizeof all_opts / sizeof all_opts[0]; i++)
-    {
-      fprintf (stream "\n%s:\n\n", all_opts[i].title);
-
-      for (j = 0; j < all_opts[i].num; j++)
-	{
-	  fprintf (stream, "-m");
-	  n = fprintf_opt (stream, all_opts[i].opts[j].pattern);
-	  fprint_space (stream, 22 - n);
-	  fprintf (stream, "%s\n", all_opts[i].opts[j].description);
-	}
-    }
-}
-*/
-
-void
-md_show_usage (stream)
-     FILE *stream;
+md_show_usage (FILE *stream)
 {
   fprintf (stream, "\
 \n\
@@ -1619,40 +1366,37 @@ PDP-11 machine model options:\n\
 }
 
 symbolS *
-md_undefined_symbol (name)
-     char *name ATTRIBUTE_UNUSED;
+md_undefined_symbol (char *name ATTRIBUTE_UNUSED)
 {
   return 0;
 }
 
 valueT
-md_section_align (segment, size)
-     segT segment ATTRIBUTE_UNUSED;
-     valueT size;
+md_section_align (segT segment ATTRIBUTE_UNUSED,
+		  valueT size)
 {
   return (size + 1) & ~1;
 }
 
 long
-md_pcrel_from (fixP)
-     fixS *fixP;
+md_pcrel_from (fixS *fixP)
 {
   return fixP->fx_frag->fr_address + fixP->fx_where + fixP->fx_size;
 }
 
 /* Translate internal representation of relocation info to BFD target
    format.  */
+
 arelent *
-tc_gen_reloc (section, fixp)
-     asection *section ATTRIBUTE_UNUSED;
-     fixS *fixp;
+tc_gen_reloc (asection *section ATTRIBUTE_UNUSED,
+	      fixS *fixp)
 {
   arelent *reloc;
   bfd_reloc_code_real_type code;
 
-  reloc = (arelent *) xmalloc (sizeof (arelent));
+  reloc = xmalloc (sizeof (* reloc));
 
-  reloc->sym_ptr_ptr = (asymbol **) xmalloc (sizeof (asymbol *));
+  reloc->sym_ptr_ptr = xmalloc (sizeof (asymbol *));
   *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
   reloc->address = fixp->fx_frag->fr_address + fixp->fx_where;
 
@@ -1691,8 +1435,7 @@ tc_gen_reloc (section, fixp)
 }
 
 void
-pseudo_bss (c)
-     int c ATTRIBUTE_UNUSED;
+pseudo_bss (int c ATTRIBUTE_UNUSED)
 {
   int temp;
 
@@ -1702,12 +1445,9 @@ pseudo_bss (c)
 }
 
 void
-pseudo_even (c)
-     int c ATTRIBUTE_UNUSED;
+pseudo_even (int c ATTRIBUTE_UNUSED)
 {
   int alignment = 1; /* 2^1 */
   frag_align (alignment, 0, 1);
   record_alignment (now_seg, alignment);
 }
-
-/* end of tc-pdp11.c */