Separate entries for common file changes so the automerge can find them.

[deliverable/binutils-gdb.git] / gas / itbl-ops.c

diff --git a/gas/itbl-ops.c b/gas/itbl-ops.c
index 4440c4f712506d91d29a058fa4fa8bccafeda015..089bff4aac5a6381e17a0642d3546691b02331a0 100644 (file)
--- a/gas/itbl-ops.c
+++ b/gas/itbl-ops.c
@@ -1,5 +1,5 @@
 /* itbl-ops.c
-   Copyright 1997, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -92,7 +92,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "itbl-ops.h"
-#include "itbl-parse.h"
+#include <itbl-parse.h>
 
 /* #define DEBUG */
 
@@ -154,23 +154,21 @@ static struct itbl_entry *entries[e_nprocs][e_ntypes] = {
 };
 
 /* local prototypes */
-static unsigned long build_opcode PARAMS ((struct itbl_entry *e));
-static e_type get_type PARAMS ((int yytype));
-static e_processor get_processor PARAMS ((int yyproc));
-static struct itbl_entry **get_entries PARAMS ((e_processor processor,
-                                               e_type type));
-static struct itbl_entry *find_entry_byname PARAMS ((e_processor processor,
-                                       e_type type, char *name));
-static struct itbl_entry *find_entry_byval PARAMS ((e_processor processor,
-                       e_type type, unsigned long val, struct itbl_range *r));
-static struct itbl_entry *alloc_entry PARAMS ((e_processor processor,
-               e_type type, char *name, unsigned long value));
-static unsigned long apply_range PARAMS ((unsigned long value,
-                                               struct itbl_range r));
-static unsigned long extract_range PARAMS ((unsigned long value,
-                                               struct itbl_range r));
-static struct itbl_field *alloc_field PARAMS ((e_type type, int sbit,
-                                       int ebit, unsigned long flags));
+static unsigned long build_opcode (struct itbl_entry *e);
+static e_type get_type (int yytype);
+static e_processor get_processor (int yyproc);
+static struct itbl_entry **get_entries (e_processor processor,
+                                       e_type type);
+static struct itbl_entry *find_entry_byname (e_processor processor,
+                                       e_type type, char *name);
+static struct itbl_entry *find_entry_byval (e_processor processor,
+                       e_type type, unsigned long val, struct itbl_range *r);
+static struct itbl_entry *alloc_entry (e_processor processor,
+               e_type type, char *name, unsigned long value);
+static unsigned long apply_range (unsigned long value, struct itbl_range r);
+static unsigned long extract_range (unsigned long value, struct itbl_range r);
+static struct itbl_field *alloc_field (e_type type, int sbit,
+                                       int ebit, unsigned long flags);
 
 /*======================================================================*/
 /* Interfaces to the parser */
@@ -183,17 +181,18 @@ itbl_parse (char *insntbl)
 {
   extern FILE *yyin;
   extern int yyparse (void);
-  yyin = fopen (insntbl, "r");
+
+  yyin = fopen (insntbl, FOPEN_RT);
   if (yyin == 0)
     {
       printf ("Can't open processor instruction specification file \"%s\"\n",
              insntbl);
       return 1;
     }
-  else
-    {
-      while (yyparse ());
-    }
+
+  while (yyparse ())
+    ;
+
   fclose (yyin);
   itbl_have_entries = 1;
   return 0;
@@ -350,7 +349,7 @@ append_insns_as_macros (void)
       printf (_("Unable to allocate memory for new instructions\n"));
       return;
     }
-  if (size)                    /* copy prexisting opcodes table */
+  if (size)                    /* copy preexisting opcodes table */
     memcpy (new_opcodes, ITBL_OPCODES, size);
 
   /* FIXME! some NUMOPCODES are calculated expressions.
@@ -371,13 +370,13 @@ append_insns_as_macros (void)
          o->name = e->name;
          o->args = strdup (form_args (e));
          o->mask = apply_range (e->value, e->range);
-         /* FIXME how to catch durring assembly? */
+         /* FIXME how to catch during assembly? */
          /* mask to identify this insn */
          o->match = apply_range (e->value, e->range);
          o->pinfo = 0;
 
 #ifdef USE_MACROS
-         o->mask = id++;       /* FIXME how to catch durring assembly? */
+         o->mask = id++;       /* FIXME how to catch during assembly? */
          o->match = 0;         /* for macros, the insn_isa number */
          o->pinfo = INSN_MACRO;
 #endif
@@ -500,13 +499,13 @@ unsigned long
 itbl_assemble (char *name, char *s)
 {
   unsigned long opcode;
-  struct itbl_entry *e;
+  struct itbl_entry *e = NULL;
   struct itbl_field *f;
   char *n;
   int processor;
 
   if (!name || !*name)
-    return 0;                  /* error!  must have a opcode name/expr */
+    return 0;                  /* error!  must have an opcode name/expr */
 
   /* find entry in list of instructions for all processors */
   for (processor = 0; processor < e_nprocs; processor++)
@@ -615,7 +614,7 @@ itbl_disassemble (char *s, unsigned long insn)
       struct itbl_entry *r;
       unsigned long value;
 
-      if (f == e->fields)      /* First operand is preceeded by tab.  */
+      if (f == e->fields)      /* First operand is preceded by tab.  */
        strcat (s, "\t");
       else                     /* ','s separate following operands.  */
        strcat (s, ",");