gas: sparc: fix collision of registers and pseudo-ops.

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

diff --git a/gas/itbl-ops.c b/gas/itbl-ops.c
index c37896ff55185f6b4b77f6d5244d998da93f7445..488e3be8d6d98051d1769b36cd6033a099c3b34e 100644 (file)
--- a/gas/itbl-ops.c
+++ b/gas/itbl-ops.c
@@ -1,12 +1,11 @@
 /* itbl-ops.c
 /* itbl-ops.c

-   Copyright 1997, 1999, 2000, 2001, 2002, 2003, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1997-2016 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,


@@ -16,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.  */

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


@@ -89,9 +88,7 @@
  *
  */
 
  *
  */
 

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

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


@@ -99,7 +96,7 @@
 
 #ifdef DEBUG
 #include <assert.h>
 
 #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)


@@ -147,12 +144,7 @@ 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 */
 static unsigned long build_opcode (struct itbl_entry *e);
 
 /* local prototypes */
 static unsigned long build_opcode (struct itbl_entry *e);


@@ -253,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.  */


@@ -309,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;


@@ -327,12 +320,9 @@ 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,
                we can't realloc or delete the old memory.  */
   /* FIXME since ITBL_OPCODES culd be a static table,
                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"));
   if (!new_opcodes)
     {
       printf (_("Unable to allocate memory for new instructions\n"));


@@ -344,7 +334,9 @@ append_insns_as_macros (void)
   /* FIXME! some NUMOPCODES are calculated expressions.
                These need to be changed before itbls can be supported.  */
 
   /* 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++)
     {


@@ -602,6 +594,7 @@ 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 preceded by tab.  */
        strcat (s, "\t");
 
       if (f == e->fields)      /* First operand is preceded by tab.  */
        strcat (s, "\t");


@@ -620,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 */


@@ -853,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;


@@ -877,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));