Merge branch 'master' into merge-job

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

diff --git a/gas/itbl-ops.c b/gas/itbl-ops.c
index 9a7821904bfc9fe8530fa7f55836414226099884..e5d48e48ddc9d4c6d5951351562b4533af307af3 100644 (file)
--- a/gas/itbl-ops.c
+++ b/gas/itbl-ops.c
@@ -1,11 +1,11 @@
 /* itbl-ops.c
 /* itbl-ops.c

-   Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1997-2020 Free Software Foundation, Inc.

 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    GAS is distributed in the hope that it will be useful,
    any later version.
 
    GAS is distributed in the hope that it will be useful,


@@ -15,8 +15,8 @@
 
    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
 
    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.  */
+   Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */

 
 /*======================================================================*/
 /*
 
 /*======================================================================*/
 /*


@@ -88,17 +88,15 @@
  *
  */
 
  *
  */
 

-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "as.h"

 #include "itbl-ops.h"
 #include "itbl-ops.h"

-#include "itbl-parse.h"
+#include <itbl-parse.h>

 
 /* #define DEBUG */
 
 #ifdef DEBUG
 #include <assert.h>
 
 /* #define DEBUG */
 
 #ifdef DEBUG
 #include <assert.h>

-#define ASSERT(x) assert(x)
+#define ASSERT(x) gas_assert (x)

 #define DBG(x) printf x
 #else
 #define ASSERT(x)
 #define DBG(x) printf x
 #else
 #define ASSERT(x)


@@ -134,7 +132,7 @@ struct itbl_field {
 struct itbl_entry {
   e_processor processor;       /* processor number */
   e_type type;                 /* dreg/creg/greg/insn */
 struct itbl_entry {
   e_processor processor;       /* processor number */
   e_type type;                 /* dreg/creg/greg/insn */

-  char *name;                  /* mnemionic name for insn/register */
+  char *name;                  /* mnemonic name for insn/register */

   unsigned long value;         /* opcode/instruction mask/register number */
   unsigned long flags;         /* effects of the instruction */
   struct itbl_range range;     /* bit range within instruction for value */
   unsigned long value;         /* opcode/instruction mask/register number */
   unsigned long flags;         /* effects of the instruction */
   struct itbl_range range;     /* bit range within instruction for value */


@@ -146,31 +144,24 @@ struct itbl_entry {
 
 static int itbl_num_opcodes = 0;
 /* Array of entries for each processor and entry type */
 
 static int itbl_num_opcodes = 0;
 /* Array of entries for each processor and entry type */

-static struct itbl_entry *entries[e_nprocs][e_ntypes] = {
-  {0, 0, 0, 0, 0, 0},
-  {0, 0, 0, 0, 0, 0},
-  {0, 0, 0, 0, 0, 0},
-  {0, 0, 0, 0, 0, 0}
-};
+static struct itbl_entry *entries[e_nprocs][e_ntypes];

 
 /* local prototypes */
 
 /* 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 */
 
 /*======================================================================*/
 /* Interfaces to the parser */


@@ -183,17 +174,18 @@ itbl_parse (char *insntbl)
 {
   extern FILE *yyin;
   extern int yyparse (void);
 {
   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;
     }
   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;
   fclose (yyin);
   itbl_have_entries = 1;
   return 0;


@@ -205,18 +197,6 @@ struct itbl_entry *
 itbl_add_reg (int yyprocessor, int yytype, char *regname,
              int regnum)
 {
 itbl_add_reg (int yyprocessor, int yytype, char *regname,
              int regnum)
 {

-#if 0
-#include "as.h"
-#include "symbols.h"
-  /* Since register names don't have a prefix, we put them in the symbol table so
-     they can't be used as symbols.  This also simplifies argument parsing as
-     we can let gas parse registers for us.  The recorded register number is
-     regnum.  */
-  /* Use symbol_create here instead of symbol_new so we don't try to
-     output registers into the object file's symbol table.  */
-  symbol_table_insert (symbol_create (regname, reg_section,
-                                     regnum, &zero_address_frag));
-#endif

   return alloc_entry (get_processor (yyprocessor), get_type (yytype), regname,
                      (unsigned long) regnum);
 }
   return alloc_entry (get_processor (yyprocessor), get_type (yytype), regname,
                      (unsigned long) regnum);
 }


@@ -265,8 +245,6 @@ itbl_add_operand (struct itbl_entry *e, int yytype, int sbit,
 /* Interfaces for assembler and disassembler */
 
 #ifndef STAND_ALONE
 /* Interfaces for assembler and disassembler */
 
 #ifndef STAND_ALONE

-#include "as.h"
-#include "symbols.h"

 static void append_insns_as_macros (void);
 
 /* Initialize for gas.  */
 static void append_insns_as_macros (void);
 
 /* Initialize for gas.  */


@@ -321,7 +299,10 @@ append_insns_as_macros (void)
 {
   struct ITBL_OPCODE_STRUCT *new_opcodes, *o;
   struct itbl_entry *e, **es;
 {
   struct ITBL_OPCODE_STRUCT *new_opcodes, *o;
   struct itbl_entry *e, **es;

-  int n, id, size, new_size, new_num_opcodes;
+  int n, size, new_num_opcodes;
+#ifdef USE_MACROS
+  int id;
+#endif

 
   if (!itbl_have_entries)
     return;
 
   if (!itbl_have_entries)
     return;


@@ -339,24 +320,23 @@ append_insns_as_macros (void)
   ASSERT (size >= 0);
   DBG (("I get=%d\n", size / sizeof (ITBL_OPCODES[0])));
 
   ASSERT (size >= 0);
   DBG (("I get=%d\n", size / sizeof (ITBL_OPCODES[0])));
 

-  new_size = sizeof (struct ITBL_OPCODE_STRUCT) * new_num_opcodes;
-  ASSERT (new_size > size);
-
-  /* FIXME since ITBL_OPCODES culd be a static table,
+  /* FIXME since ITBL_OPCODES could be a static table,

                we can't realloc or delete the old memory.  */
                we can't realloc or delete the old memory.  */

-  new_opcodes = (struct ITBL_OPCODE_STRUCT *) malloc (new_size);
+  new_opcodes = XNEWVEC (struct ITBL_OPCODE_STRUCT, new_num_opcodes);

   if (!new_opcodes)
     {
       printf (_("Unable to allocate memory for new instructions\n"));
       return;
     }
   if (!new_opcodes)
     {
       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.
                These need to be changed before itbls can be supported.  */
 
     memcpy (new_opcodes, ITBL_OPCODES, size);
 
   /* FIXME! some NUMOPCODES are calculated expressions.
                These need to be changed before itbls can be supported.  */
 

+#ifdef USE_MACROS

   id = ITBL_NUM_MACROS;                /* begin the next macro id after the last */
   id = ITBL_NUM_MACROS;                /* begin the next macro id after the last */

+#endif

   o = &new_opcodes[ITBL_NUM_OPCODES];  /* append macro to opcodes list */
   for (n = e_p0; n < e_nprocs; n++)
     {
   o = &new_opcodes[ITBL_NUM_OPCODES];  /* append macro to opcodes list */
   for (n = e_p0; n < e_nprocs; n++)
     {


@@ -371,13 +351,13 @@ append_insns_as_macros (void)
          o->name = e->name;
          o->args = strdup (form_args (e));
          o->mask = apply_range (e->value, e->range);
          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
          /* 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
          o->match = 0;         /* for macros, the insn_isa number */
          o->pinfo = INSN_MACRO;
 #endif


@@ -500,13 +480,13 @@ unsigned long
 itbl_assemble (char *name, char *s)
 {
   unsigned long opcode;
 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)
   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++)
 
   /* find entry in list of instructions for all processors */
   for (processor = 0; processor < e_nprocs; processor++)


@@ -560,7 +540,7 @@ itbl_assemble (char *name, char *s)
                                return 0;       /-* error; invalid operand *-/
                                break;
                        */
                                return 0;       /-* error; invalid operand *-/
                                break;
                        */

-         /* If not a symbol, fall thru to IMMED */
+         /* If not a symbol, fallthru to IMMED */

        case e_immed:
          if (*n == '0' && *(n + 1) == 'x')     /* hex begins 0x...  */
            {
        case e_immed:
          if (*n == '0' && *(n + 1) == 'x')     /* hex begins 0x...  */
            {


@@ -614,8 +594,9 @@ itbl_disassemble (char *s, unsigned long insn)
     {
       struct itbl_entry *r;
       unsigned long value;
     {
       struct itbl_entry *r;
       unsigned long value;

+      char s_value[20];

 
 

-      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, ",");
        strcat (s, "\t");
       else                     /* ','s separate following operands.  */
        strcat (s, ",");


@@ -632,14 +613,18 @@ itbl_disassemble (char *s, unsigned long insn)
          if (r)
            strcat (s, r->name);
          else
          if (r)
            strcat (s, r->name);
          else

-           sprintf (s, "%s$%lu", s, value);
+           {
+             sprintf (s_value, "$%lu", value);
+             strcat (s, s_value);
+           }

          break;
        case e_addr:
          /* Use assembler's symbol table to find symbol.  */
          /* FIXME!! Do we need this?  If so, what about relocs??  */
          /* If not a symbol, fall through to IMMED.  */
        case e_immed:
          break;
        case e_addr:
          /* Use assembler's symbol table to find symbol.  */
          /* FIXME!! Do we need this?  If so, what about relocs??  */
          /* If not a symbol, fall through to IMMED.  */
        case e_immed:

-         sprintf (s, "%s0x%lx", s, value);
+         sprintf (s_value, "0x%lx", value);
+         strcat (s, s_value);

          break;
        default:
          return 0;             /* error; invalid field spec */
          break;
        default:
          return 0;             /* error; invalid field spec */


@@ -865,13 +850,11 @@ alloc_entry (e_processor processor, e_type type,
   struct itbl_entry *e, **es;
   if (!name)
     return 0;
   struct itbl_entry *e, **es;
   if (!name)
     return 0;

-  e = (struct itbl_entry *) malloc (sizeof (struct itbl_entry));
+  e = XNEW (struct itbl_entry);

   if (e)
     {
       memset (e, 0, sizeof (struct itbl_entry));
   if (e)
     {
       memset (e, 0, sizeof (struct itbl_entry));

-      e->name = (char *) malloc (sizeof (strlen (name)) + 1);
-      if (e->name)
-       strcpy (e->name, name);
+      e->name = xstrdup (name);

       e->processor = processor;
       e->type = type;
       e->value = value;
       e->processor = processor;
       e->type = type;
       e->value = value;


@@ -889,7 +872,7 @@ alloc_field (e_type type, int sbit, int ebit,
             unsigned long flags)
 {
   struct itbl_field *f;
             unsigned long flags)
 {
   struct itbl_field *f;

-  f = (struct itbl_field *) malloc (sizeof (struct itbl_field));
+  f = XNEW (struct itbl_field);

   if (f)
     {
       memset (f, 0, sizeof (struct itbl_field));
   if (f)
     {
       memset (f, 0, sizeof (struct itbl_field));