* Extensive changes to permit symbols to contain any expression
[deliverable/binutils-gdb.git] / gas / config / tc-sparc.c
index df18f15b4f1847495c8f9c5ff9a0f3e979836393..075308f1364ec62acb6ccf8c642e9828c85ee979 100644 (file)
@@ -1,22 +1,24 @@
 /* tc-sparc.c -- Assemble for the SPARC
-   Copyright (C) 1989, 1990, 1991 Free Software Foundation, Inc.
-   
+   Copyright (C) 1989, 1990, 1991, 1992 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
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
-   
+
    GAS is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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, 675 Mass Ave, Cambridge, MA 02139, USA. */
 
+#define cypress 1234
+
 #include <stdio.h>
 #include <ctype.h>
 
 /* careful, this file includes data *declarations* */
 #include "opcode/sparc.h"
 
-void md_begin();
-void md_end();
-void md_number_to_chars();
-void md_assemble();
-char *md_atof();
-void md_convert_frag();
-void md_create_short_jump();
-void md_create_long_jump();
-int md_estimate_size_before_relax();
-void md_ri_to_chars();
-symbolS *md_undefined_symbol();
-static void sparc_ip();
+void md_begin ();
+void md_end ();
+void md_number_to_chars ();
+void md_assemble ();
+char *md_atof ();
+void md_create_short_jump ();
+void md_create_long_jump ();
+int md_estimate_size_before_relax ();
+void md_ri_to_chars ();
+symbolS *md_undefined_symbol ();
+static void sparc_ip ();
 
 static enum sparc_architecture current_architecture = v6;
-static int architecture_requested = 0;
-static int warn_on_bump = 0;
+static int architecture_requested;
+static int warn_on_bump;
 
-const relax_typeS md_relax_table[] = {
-       0 };
+extern int target_big_endian;
+
+const relax_typeS md_relax_table[1];
 
 /* handle of the OPCODE hash table */
 static struct hash_control *op_hash = NULL;
 
-static void s_seg(), s_proc(), s_data1(), s_reserve(), s_common();
-extern void s_globl(), s_long(), s_short(), s_space(), cons();
-extern void s_align_bytes(), s_ignore();
-
-const pseudo_typeS md_pseudo_table[] = {
-       { "align",      s_align_bytes,  0       },    /* Defaulting is invalid (0) */
-       { "common",     s_common,       0       },
-       { "global",     s_globl,        0       },
-       { "half",       cons,           2       },
-       { "optim",      s_ignore,       0       },
-       { "proc",       s_proc,         0       },
-       { "reserve",    s_reserve,      0       },
-       { "seg",        s_seg,          0       },
-       { "skip",       s_space,        0       },
-       { "word",       cons,           4       },
-       { NULL, 0,              0       },
+static void s_seg (), s_proc (), s_data1 (), s_reserve (), s_common ();
+extern void s_globl (), s_long (), s_short (), s_space (), cons ();
+extern void s_align_bytes (), s_ignore (), s_local();
+/* start-sanitize-v9 */
+#ifndef NO_V9
+static void s_xword ();
+#endif
+/* end-sanitize-v9 */
+
+/* Ugly hack to keep non-BFD version working.  */
+#ifndef BFD_ASSEMBLER
+#define BFD_RELOC_NONE         NO_RELOC
+#define BFD_RELOC_32           RELOC_32
+#define BFD_RELOC_HI22         RELOC_HI22
+#define BFD_RELOC_LO10         RELOC_LO10
+#define BFD_RELOC_SPARC_WDISP22        RELOC_WDISP22
+#define BFD_RELOC_32_PCREL_S2  RELOC_WDISP30
+#define BFD_RELOC_SPARC22      RELOC_22
+#define BFD_RELOC_SPARC_BASE13 RELOC_BASE13
+#define BFD_RELOC_SPARC13      RELOC_13
+#define BFD_RELOC_SPARC_BASE22 RELOC_BASE22
+#define subseg_set             subseg_new
+#endif
+
+const pseudo_typeS md_pseudo_table[] =
+{
+  {"align", s_align_bytes, 0}, /* Defaulting is invalid (0) */
+  {"common", s_common, 0},
+  {"global", s_globl, 0},
+  {"half", cons, 2},
+#ifdef OBJ_ELF
+  {"local", s_local, 0},
+#endif
+  {"optim", s_ignore, 0},
+  {"proc", s_proc, 0},
+  {"reserve", s_reserve, 0},
+  {"seg", s_seg, 0},
+  {"skip", s_space, 0},
+  {"word", cons, 4},
+/* start-sanitize-v9 */
+#ifndef NO_V9
+  {"xword", s_xword, 0},
+#endif
+/* end-sanitize-v9 */
+  {NULL, 0, 0},
 };
 
 const int md_short_jump_size = 4;
 const int md_long_jump_size = 4;
-const int md_reloc_size = 12;                  /* Size of relocation record */
+const int md_reloc_size = 12;  /* Size of relocation record */
 
 /* This array holds the chars that always start a comment.  If the
    pre-processor is disabled, these aren't very useful */
@@ -84,6 +115,8 @@ const char comment_chars[] = "!";    /* JF removed '|' from comment_chars */
    work if '/' isn't otherwise defined. */
 const char line_comment_chars[] = "#";
 
+const char line_separator_chars[] = "";
+
 /* Chars that can be used to separate mant from exp in floating point nums */
 const char EXP_CHARS[] = "eE";
 
@@ -101,26 +134,27 @@ static unsigned char octal[256];
 #define isoctal(c)  octal[c]
 static unsigned char toHex[256];
 
-struct sparc_it {
-       char *error;
-       unsigned long opcode;
-       struct nlist *nlistp;
-       expressionS exp;
-       int pcrel;
-       enum reloc_type reloc;
-} the_insn, set_insn;
-
-#ifdef __STDC__
-#if 0
-static void print_insn(struct sparc_it *insn);
-#endif
-static int getExpression(char *str);
+struct sparc_it
+  {
+    char *error;
+    unsigned long opcode;
+    struct nlist *nlistp;
+    expressionS exp;
+    int pcrel;
+#ifdef BFD_ASSEMBLER
+    bfd_reloc_code_real_type reloc;
 #else
-#if 0
-static void print_insn();
+    enum reloc_type reloc;
 #endif
-static int getExpression();
+  };
+
+struct sparc_it the_insn, set_insn;
+
+#if 0
+static void print_insn PARAMS ((struct sparc_it *insn));
 #endif
+static int getExpression PARAMS ((char *str));
+
 static char *expr_end;
 static int special_case;
 
@@ -137,1087 +171,1643 @@ static int special_case;
  */
 static int max_alignment = 15;
 
-static void s_reserve() {
-       char *name;
-       char *p;
-       char c;
-       int align;
-       int size;
-       int temp;
-       symbolS *symbolP;
-       
-       name = input_line_pointer;
-       c = get_symbol_end();
-       p = input_line_pointer;
-       *p = c;
-       SKIP_WHITESPACE();
-
-       if (*input_line_pointer != ',') {
-               as_bad("Expected comma after name");
-               ignore_rest_of_line();
-               return;
+static void
+s_reserve ()
+{
+  char *name;
+  char *p;
+  char c;
+  int align;
+  int size;
+  int temp;
+  symbolS *symbolP;
+
+  name = input_line_pointer;
+  c = get_symbol_end ();
+  p = input_line_pointer;
+  *p = c;
+  SKIP_WHITESPACE ();
+
+  if (*input_line_pointer != ',')
+    {
+      as_bad ("Expected comma after name");
+      ignore_rest_of_line ();
+      return;
+    }
+
+  ++input_line_pointer;
+
+  if ((size = get_absolute_expression ()) < 0)
+    {
+      as_bad ("BSS length (%d.) <0! Ignored.", size);
+      ignore_rest_of_line ();
+      return;
+    }                          /* bad length */
+
+  *p = 0;
+  symbolP = symbol_find_or_make (name);
+  *p = c;
+
+  if (strncmp (input_line_pointer, ",\"bss\"", 6) != 0
+      && strncmp (input_line_pointer, ",\".bss\"", 7) != 0)
+    {
+      as_bad ("bad .reserve segment: `%s'", input_line_pointer);
+      return;
+    }                          /* if not bss */
+
+  if (input_line_pointer[2] == '.')
+    input_line_pointer += 7;
+  else
+    input_line_pointer += 6;
+  SKIP_WHITESPACE ();
+
+  if (*input_line_pointer == ',')
+    {
+      ++input_line_pointer;
+
+      SKIP_WHITESPACE ();
+      if (*input_line_pointer == '\n')
+       {
+         as_bad ("Missing alignment");
+         return;
        }
 
-       ++input_line_pointer;
+      align = get_absolute_expression ();
+      if (align > max_alignment)
+       {
+         align = max_alignment;
+         as_warn ("Alignment too large: %d. assumed.", align);
+       }
+      else if (align < 0)
+       {
+         align = 0;
+         as_warn ("Alignment negative. 0 assumed.");
+       }
 
-       if ((size = get_absolute_expression()) < 0) {
-               as_bad("BSS length (%d.) <0! Ignored.", size);
-               ignore_rest_of_line();
-               return;
-       } /* bad length */
+      record_alignment (bss_section, align);
 
-       *p = 0;
-       symbolP = symbol_find_or_make(name);
-       *p = c;
+      /* convert to a power of 2 alignment */
+      for (temp = 0; (align & 1) == 0; align >>= 1, ++temp);;
 
-       if (strncmp(input_line_pointer, ",\"bss\"", 6) != 0) {
-               as_bad("bad .reserve segment: `%s'", input_line_pointer);
-               return;
-       } /* if not bss */
+      if (align != 1)
+       {
+         as_bad ("Alignment not a power of 2");
+         ignore_rest_of_line ();
+         return;
+       }                       /* not a power of two */
 
-       input_line_pointer += 6;
-       SKIP_WHITESPACE();
+      align = temp;
+    }                          /* if has optional alignment */
+  else
+    align = 0;
 
-       if (*input_line_pointer == ',') {
-               ++input_line_pointer;
+  if ((S_GET_SEGMENT (symbolP) == bss_section
+       || !S_IS_DEFINED (symbolP))
+#ifdef OBJ_AOUT
+      && S_GET_OTHER (symbolP) == 0
+      && S_GET_DESC (symbolP) == 0
+#endif
+      )
+    {
+      if (! need_pass_2)
+       {
+         char *p;
+         segT current_seg = now_seg;
+         subsegT current_subseg = now_subseg;
 
-               SKIP_WHITESPACE();
-               if (*input_line_pointer == '\n') {
-                       as_bad("Missing alignment");
-                       return;
-               }
+         subseg_set (bss_section, 1); /* switch to bss */
 
-               align = get_absolute_expression();
-               if (align > max_alignment){
-                       align = max_alignment;
-                       as_warn("Alignment too large: %d. assumed.", align);
-               } else if (align < 0) {
-                       align = 0;
-                       as_warn("Alignment negative. 0 assumed.");
-               }
-#ifdef MANY_SEGMENTS
-#define SEG_BSS SEG_E2
-               record_alignment(SEG_E2, align);
-#else
-               record_alignment(SEG_BSS, align);
-#endif
+         if (align)
+           frag_align (align, 0); /* do alignment */
 
- /* convert to a power of 2 alignment */
-               for (temp = 0; (align & 1) == 0; align >>= 1, ++temp) ;;
-
-               if (align != 1) {
-                       as_bad("Alignment not a power of 2");
-                       ignore_rest_of_line();
-                       return;
-               } /* not a power of two */
-
-               align = temp;
-    
-               /* Align */
-               align = ~((~0) << align);       /* Convert to a mask */
-               local_bss_counter = (local_bss_counter + align) & (~align);
-       } /* if has optional alignment */
-
-       if (S_GET_OTHER(symbolP) == 0
-           && S_GET_DESC(symbolP) == 0
-           && ((S_GET_SEGMENT(symbolP) == SEG_BSS
-                && S_GET_VALUE(symbolP) == local_bss_counter)
-               || !S_IS_DEFINED(symbolP))) {
-               S_SET_VALUE(symbolP, local_bss_counter);
-               S_SET_SEGMENT(symbolP, SEG_BSS);
-               symbolP->sy_frag  = &bss_address_frag;
-               local_bss_counter += size;
-       } else {
-               as_warn("Ignoring attempt to re-define symbol from %d. to %d.",
-                       S_GET_VALUE(symbolP), local_bss_counter);
-       } /* if not redefining */
-
-       demand_empty_rest_of_line();
-       return;
-} /* s_reserve() */
-
-static void s_common() {
-       register char *name;
-       register char c;
-       register char *p;
-       register int temp;
-       register symbolS *      symbolP;
-       
-       name = input_line_pointer;
-       c = get_symbol_end();
-       /* just after name is now '\0' */
-       p = input_line_pointer;
-       *p = c;
-       SKIP_WHITESPACE();
-       if (* input_line_pointer != ',') {
-               as_bad("Expected comma after symbol-name");
-               ignore_rest_of_line();
-               return;
-       }
-       input_line_pointer ++; /* skip ',' */
-       if ((temp = get_absolute_expression ()) < 0) {
-               as_bad(".COMMon length (%d.) <0! Ignored.", temp);
-               ignore_rest_of_line();
-               return;
+         /* detach from old frag */
+         if (S_GET_SEGMENT(symbolP) == bss_section)
+           symbolP->sy_frag->fr_symbol = NULL;
+
+         symbolP->sy_frag = frag_now;
+         p = frag_var (rs_org, 1, 1, (relax_substateT)0, symbolP,
+                       size, (char *)0);
+         *p = 0;
+
+         S_SET_SEGMENT (symbolP, bss_section);
+
+         subseg_set (current_seg, current_subseg);
        }
-       *p = 0;
-       symbolP = symbol_find_or_make(name);
-       *p = c;
-       if (S_IS_DEFINED(symbolP)) {
-               as_bad("Ignoring attempt to re-define symbol");
-               ignore_rest_of_line();
-               return;
+    }
+  else
+    {
+      as_warn("Ignoring attempt to re-define symbol %s.", name);
+    }                          /* if not redefining */
+
+  demand_empty_rest_of_line ();
+}
+
+#ifdef OBJ_ELF
+/* Currently used only by Solaris 2.  */
+void 
+s_local ()
+{
+  char *name;
+  int c;
+  symbolS *symbolP;
+
+  do
+    {
+      name = input_line_pointer;
+      c = get_symbol_end ();
+      symbolP = symbol_find_or_make (name);
+      *input_line_pointer = c;
+      SKIP_WHITESPACE ();
+      S_CLEAR_EXTERNAL (symbolP);
+      symbolP->local = 1;
+      if (c == ',')
+       {
+         input_line_pointer++;
+         SKIP_WHITESPACE ();
+         if (*input_line_pointer == '\n')
+           c = '\n';
        }
-       if (S_GET_VALUE(symbolP) != 0) {
-               if (S_GET_VALUE(symbolP) != temp) {
-                       as_warn("Length of .comm \"%s\" is already %d. Not changed to %d.",
-                               S_GET_NAME(symbolP), S_GET_VALUE(symbolP), temp);
-               }
-       } else {
-               S_SET_VALUE(symbolP, temp);
-               S_SET_EXTERNAL(symbolP);
+    }
+  while (c == ',');
+  demand_empty_rest_of_line ();
+}
+#endif
+
+static void
+s_common ()
+{
+  char *name;
+  char c;
+  char *p;
+  int temp, size;
+  symbolS *symbolP;
+
+  name = input_line_pointer;
+  c = get_symbol_end ();
+  /* just after name is now '\0' */
+  p = input_line_pointer;
+  *p = c;
+  SKIP_WHITESPACE ();
+  if (*input_line_pointer != ',')
+    {
+      as_bad ("Expected comma after symbol-name");
+      ignore_rest_of_line ();
+      return;
+    }
+  input_line_pointer++;                /* skip ',' */
+  if ((temp = get_absolute_expression ()) < 0)
+    {
+      as_bad (".COMMon length (%d.) <0! Ignored.", temp);
+      ignore_rest_of_line ();
+      return;
+    }
+  size = temp;
+  *p = 0;
+  symbolP = symbol_find_or_make (name);
+  *p = c;
+  if (S_IS_DEFINED (symbolP))
+    {
+      as_bad ("Ignoring attempt to re-define symbol");
+      ignore_rest_of_line ();
+      return;
+    }
+  if (S_GET_VALUE (symbolP) != 0)
+    {
+      if (S_GET_VALUE (symbolP) != size)
+       {
+         as_warn ("Length of .comm \"%s\" is already %ld. Not changed to %d.",
+                  S_GET_NAME (symbolP), (long) S_GET_VALUE (symbolP), size);
        }
-       know(symbolP->sy_frag == &zero_address_frag);
-       if (strncmp(input_line_pointer, ",\"bss\"", 6) != 0
-           && strncmp(input_line_pointer, ",\"data\"", 7) != 0) {
-               p=input_line_pointer;
-               while(*p && *p!='\n')
-                   p++;
-               c= *p;
-               *p='\0';
-               as_bad("bad .common segment: `%s'", input_line_pointer);
-               *p=c;
-               return;
+    }
+  else
+    {
+#ifndef OBJ_ELF
+      S_SET_VALUE (symbolP, size);
+      S_SET_EXTERNAL (symbolP);
+#endif
+    }
+  know (symbolP->sy_frag == &zero_address_frag);
+  if (*input_line_pointer != ',')
+    {
+      as_bad ("Expected comma after common length");
+      ignore_rest_of_line ();
+      return;
+    }
+  input_line_pointer++;
+  SKIP_WHITESPACE ();
+  if (*input_line_pointer != '"')
+    {
+      temp = get_absolute_expression ();
+      if (temp > max_alignment)
+       {
+         temp = max_alignment;
+         as_warn ("Common alignment too large: %d. assumed", temp);
        }
-       input_line_pointer += 6 + (input_line_pointer[2] == 'd'); /* Skip either */
-       demand_empty_rest_of_line();
-       return;
-} /* s_common() */
-
-static void s_seg() {
-       
-       if (strncmp(input_line_pointer, "\"text\"", 6) == 0) {
-               input_line_pointer += 6;
-               s_text();
-               return;
+      else if (temp < 0)
+       {
+         temp = 0;
+         as_warn ("Common alignment negative; 0 assumed");
        }
-       if (strncmp(input_line_pointer, "\"data\"", 6) == 0) {
-               input_line_pointer += 6;
-               s_data();
-               return;
+#ifdef OBJ_ELF
+      if (symbolP->local)
+       {
+         segT old_sec;
+         int old_subsec;
+         char *p;
+         int align;
+
+       allocate_bss:
+         old_sec = now_seg;
+         old_subsec = now_subseg;
+         align = temp;
+         record_alignment (bss_section, align);
+         subseg_set (bss_section, 0);
+         if (align)
+           frag_align (align, 0);
+         if (S_GET_SEGMENT (symbolP) == bss_section)
+           symbolP->sy_frag->fr_symbol = 0;
+         symbolP->sy_frag = frag_now;
+         p = frag_var (rs_org, 1, 1, (relax_substateT) 0, symbolP, size,
+                       (char *) 0);
+         *p = 0;
+         S_SET_SEGMENT (symbolP, bss_section);
+         S_CLEAR_EXTERNAL (symbolP);
+         subseg_set (old_sec, old_subsec);
        }
-       if (strncmp(input_line_pointer, "\"data1\"", 7) == 0) {
-               input_line_pointer += 7;
-               s_data1();
-               return;
+      else
+#endif
+       {
+       allocate_common:
+         S_SET_VALUE (symbolP, size);
+         S_SET_EXTERNAL (symbolP);
+         /* should be common, but this is how gas does it for now */
+         S_SET_SEGMENT (symbolP, &bfd_und_section);
        }
-       if (strncmp(input_line_pointer, "\"bss\"", 5) == 0) {
-               input_line_pointer += 5;
-               /* We only support 2 segments -- text and data -- for now, so
-                  things in the "bss segment" will have to go into data for now.
-                  You can still allocate SEG_BSS stuff with .lcomm or .reserve. */
-               subseg_new(SEG_DATA, 255);      /* FIXME-SOMEDAY */
-               return;
+    }
+  else
+    {
+      input_line_pointer++;
+      /* @@ Some use the dot, some don't.  Can we get some consistency??  */
+      if (*input_line_pointer == '.')
+       input_line_pointer++;
+      /* @@ Some say data, some say bss.  */
+      if (strncmp (input_line_pointer, "bss\"", 4)
+         && strncmp (input_line_pointer, "data\"", 5))
+       {
+         while (*--input_line_pointer != '"')
+           ;
+         input_line_pointer--;
+         goto bad_common_segment;
        }
-       as_bad("Unknown segment type");
-       demand_empty_rest_of_line();
-       return;
-} /* s_seg() */
+      while (*input_line_pointer++ != '"')
+       ;
+      goto allocate_common;
+    }
+  demand_empty_rest_of_line ();
+  return;
+
+  {
+  bad_common_segment:
+    p = input_line_pointer;
+    while (*p && *p != '\n')
+      p++;
+    c = *p;
+    *p = '\0';
+    as_bad ("bad .common segment %s", input_line_pointer + 1);
+    *p = c;
+    input_line_pointer = p;
+    ignore_rest_of_line ();
+    return;
+  }
+}
+
+static void
+s_seg ()
+{
 
-static void s_data1() {
-       subseg_new(SEG_DATA, 1);
-       demand_empty_rest_of_line();
-       return;
-} /* s_data1() */
+  if (strncmp (input_line_pointer, "\"text\"", 6) == 0)
+    {
+      input_line_pointer += 6;
+      s_text ();
+      return;
+    }
+  if (strncmp (input_line_pointer, "\"data\"", 6) == 0)
+    {
+      input_line_pointer += 6;
+      s_data ();
+      return;
+    }
+  if (strncmp (input_line_pointer, "\"data1\"", 7) == 0)
+    {
+      input_line_pointer += 7;
+      s_data1 ();
+      return;
+    }
+  if (strncmp (input_line_pointer, "\"bss\"", 5) == 0)
+    {
+      input_line_pointer += 5;
+      /* We only support 2 segments -- text and data -- for now, so
+        things in the "bss segment" will have to go into data for now.
+        You can still allocate SEG_BSS stuff with .lcomm or .reserve. */
+      subseg_set (data_section, 255);  /* FIXME-SOMEDAY */
+      return;
+    }
+  as_bad ("Unknown segment type");
+  demand_empty_rest_of_line ();
+  return;
+}                              /* s_seg() */
+
+static void
+s_data1 ()
+{
+  subseg_set (data_section, 1);
+  demand_empty_rest_of_line ();
+  return;
+}                              /* s_data1() */
 
-static void s_proc() {
-       extern char is_end_of_line[];
-       
-       while (!is_end_of_line[*input_line_pointer]) {
-               ++input_line_pointer;
-       }
-       ++input_line_pointer;
-       return;
-} /* s_proc() */
+static void
+s_proc ()
+{
+  extern char is_end_of_line[];
+
+  while (!is_end_of_line[*input_line_pointer])
+    {
+      ++input_line_pointer;
+    }
+  ++input_line_pointer;
+  return;
+}                              /* s_proc() */
+
+/* start-sanitize-v9 */
+#ifndef NO_V9
+static void
+s_xword ()
+{
+  SKIP_WHITESPACE ();
+  if (isdigit (*input_line_pointer))
+    big_cons (8);
+  else
+    cons (8);
+}
+
+struct priv_reg_entry
+  {
+    char *name;
+    int regnum;
+  };
+
+struct priv_reg_entry priv_reg_table[] =
+{
+  {"tpc", 0},
+  {"tnpc", 1},
+  {"tstate", 2},
+  {"tt", 3},
+  {"tick", 4},
+  {"tba", 5},
+  {"pstate", 6},
+  {"tl", 7},
+  {"pil", 8},
+  {"cwp", 9},
+  {"cansave", 10},
+  {"canrestore", 11},
+  {"cleanwin", 12},
+  {"otherwin", 13},
+  {"wstate", 14},
+  {"fq", 15},
+  {"ver", 31},
+  {"", -1},                    /* end marker */
+};
+
+struct membar_masks
+{
+  char *name;
+  int len;
+  int mask;
+};
+
+#define MEMBAR_MASKS_SIZE 7
+
+struct membar_masks membar_masks[MEMBAR_MASKS_SIZE] =
+{
+  {"Sync", 4, 0x40},
+  {"MemIssue", 8, 0x20},
+  {"Lookaside", 9, 0x10},
+  {"StoreStore", 10, 0x08},
+  {"LoadStore", 9, 0x04},
+  {"StoreLoad", 9, 0x02},
+  {"LoadLoad", 8, 0x01},
+};
+
+static int
+cmp_reg_entry (p, q)
+     struct priv_reg_entry *p, *q;
+{
+  return strcmp (q->name, p->name);
+}
+
+#endif
+/* end-sanitize-v9 */
 
 /* This function is called once, at assembler startup time.  It should
    set up all the tables, etc. that the MD part of the assembler will need. */
-void md_begin() {
-       register char *retval = NULL;
-       int lose = 0;
-       register unsigned int i = 0;
-       
-       op_hash = hash_new();
-       if (op_hash == NULL)
-           as_fatal("Virtual memory exhausted");
-       
-       while (i < NUMOPCODES) {
-               const char *name = sparc_opcodes[i].name;
-               retval = hash_insert(op_hash, name, &sparc_opcodes[i]);
-               if(retval != NULL && *retval != '\0') {
-                       fprintf (stderr, "internal error: can't hash `%s': %s\n",
-                                sparc_opcodes[i].name, retval);
-                       lose = 1;
-               }
-               do
-                   {
-                           if (sparc_opcodes[i].match & sparc_opcodes[i].lose) {
-                                   fprintf (stderr, "internal error: losing opcode: `%s' \"%s\"\n",
-                                            sparc_opcodes[i].name, sparc_opcodes[i].args);
-                                   lose = 1;
-                           }
-                           ++i;
-                   } while (i < NUMOPCODES
-                            && !strcmp(sparc_opcodes[i].name, name));
-       }
-       
-       if (lose)
-           as_fatal("Broken assembler.  No assembly attempted.");
-       
-       for (i = '0'; i < '8'; ++i)
-           octal[i] = 1;
-       for (i = '0'; i <= '9'; ++i)
-           toHex[i] = i - '0';
-       for (i = 'a'; i <= 'f'; ++i)
-           toHex[i] = i + 10 - 'a';
-       for (i = 'A'; i <= 'F'; ++i)
-           toHex[i] = i + 10 - 'A';
-} /* md_begin() */
-
-void md_end() {
-       return;
-} /* md_end() */
-
-void md_assemble(str)
-char *str;
+void
+md_begin ()
 {
-       char *toP;
-       int rsd;
-       
-       know(str);
-       sparc_ip(str);
-       
-       /* See if "set" operand is absolute and small; skip sethi if so. */
-       if (special_case == SPECIAL_CASE_SET && the_insn.exp.X_seg == SEG_ABSOLUTE) {
-               if (the_insn.exp.X_add_number >= -(1<<12)
-                   && the_insn.exp.X_add_number <   (1<<12)) {
-                       the_insn.opcode = 0x80102000            /* or %g0,imm,... */
-                           | (the_insn.opcode & 0x3E000000)    /* dest reg */
-                               | (the_insn.exp.X_add_number & 0x1FFF); /* imm */
-                       special_case = 0;               /* No longer special */
-                       the_insn.reloc = NO_RELOC;      /* No longer relocated */
-               }
+  register char *retval = NULL;
+  int lose = 0;
+  register unsigned int i = 0;
+
+  op_hash = hash_new ();
+  if (op_hash == NULL)
+    as_fatal ("Virtual memory exhausted");
+
+  while (i < NUMOPCODES)
+    {
+      const char *name = sparc_opcodes[i].name;
+      retval = hash_insert (op_hash, name, &sparc_opcodes[i]);
+      if (retval != NULL && *retval != '\0')
+       {
+         fprintf (stderr, "internal error: can't hash `%s': %s\n",
+                  sparc_opcodes[i].name, retval);
+         lose = 1;
        }
-       
-       toP = frag_more(4);
-       /* put out the opcode */
-       md_number_to_chars(toP, the_insn.opcode, 4);
-       
-       /* put out the symbol-dependent stuff */
-       if (the_insn.reloc != NO_RELOC) {
-               fix_new(frag_now,                           /* which frag */
-                       (toP - frag_now->fr_literal), /* where */
-                       4,                                  /* size */
-                       the_insn.exp.X_add_symbol,
-                       the_insn.exp.X_subtract_symbol,
-                       the_insn.exp.X_add_number,
-                       the_insn.pcrel,
-                       the_insn.reloc);
+      do
+       {
+         if (sparc_opcodes[i].match & sparc_opcodes[i].lose)
+           {
+             fprintf (stderr, "internal error: losing opcode: `%s' \"%s\"\n",
+                      sparc_opcodes[i].name, sparc_opcodes[i].args);
+             lose = 1;
+           }
+         ++i;
        }
-       switch (special_case) {
-               
-       case SPECIAL_CASE_SET:
-               special_case = 0;
-               assert(the_insn.reloc == RELOC_HI22);
-               /* See if "set" operand has no low-order bits; skip OR if so. */
-               if (the_insn.exp.X_seg == SEG_ABSOLUTE
-                   && ((the_insn.exp.X_add_number & 0x3FF) == 0))
-                   return;
-               toP = frag_more(4);
-               rsd = (the_insn.opcode >> 25) & 0x1f;
-               the_insn.opcode = 0x80102000 | (rsd << 25) | (rsd << 14);
-               md_number_to_chars(toP, the_insn.opcode, 4);
-               fix_new(frag_now,                           /* which frag */
-                       (toP - frag_now->fr_literal),       /* where */
-                       4,                                  /* size */
-                       the_insn.exp.X_add_symbol,
-                       the_insn.exp.X_subtract_symbol,
-                       the_insn.exp.X_add_number,
-                       the_insn.pcrel,
-                       RELOC_LO10);
-               return;
-               
-       case SPECIAL_CASE_FDIV:
-               /* According to information leaked from Sun, the "fdiv" instructions
-                  on early SPARC machines would produce incorrect results sometimes.
-                  The workaround is to add an fmovs of the destination register to
-                  itself just after the instruction.  This was true on machines
-                  with Weitek 1165 float chips, such as the Sun-4/260 and /280. */
-               special_case = 0;
-               assert(the_insn.reloc == NO_RELOC);
-               toP = frag_more(4);
-               rsd = (the_insn.opcode >> 25) & 0x1f;
-               the_insn.opcode = 0x81A00020 | (rsd << 25) | rsd;  /* fmovs dest,dest */
-               md_number_to_chars(toP, the_insn.opcode, 4);
-               return;
-               
-       case 0:
-               return;
-               
-       default:
-               as_fatal("failed sanity check.");
-       }
-} /* md_assemble() */
+      while (i < NUMOPCODES
+            && !strcmp (sparc_opcodes[i].name, name));
+    }
+
+  if (lose)
+    as_fatal ("Broken assembler.  No assembly attempted.");
+
+  for (i = '0'; i < '8'; ++i)
+    octal[i] = 1;
+  for (i = '0'; i <= '9'; ++i)
+    toHex[i] = i - '0';
+  for (i = 'a'; i <= 'f'; ++i)
+    toHex[i] = i + 10 - 'a';
+  for (i = 'A'; i <= 'F'; ++i)
+    toHex[i] = i + 10 - 'A';
+
+  /* start-sanitize-v9 */
+#ifndef NO_V9
+#ifdef sparcv9
+  current_architecture = v9;
+#endif
+
+  qsort (priv_reg_table, sizeof (priv_reg_table) / sizeof (priv_reg_table[0]),
+        sizeof (priv_reg_table[0]), cmp_reg_entry);
+#endif
+  /* end-sanitize-v9 */
 
-static void sparc_ip(str)
-char *str;
+  target_big_endian = 1;
+}                              /* md_begin() */
+
+void
+md_end ()
 {
-       char *error_message = "";
-       char *s;
-       const char *args;
-       char c;
-       struct sparc_opcode *insn;
-       char *argsStart;
-       unsigned long opcode;
-       unsigned int mask = 0;
-       int match = 0;
-       int comma = 0;
-       
-       for (s = str; islower(*s) || (*s >= '0' && *s <= '3'); ++s)
-           ;
-       switch (*s) {
-               
-       case '\0':
-               break;
-               
-       case ',':
-               comma = 1;
-               
-               /*FALLTHROUGH */
-               
-       case ' ':
-               *s++ = '\0';
-               break;
-               
-       default:
-               as_bad("Unknown opcode: `%s'", str);
-               exit(1);
-       }
-       if ((insn = (struct sparc_opcode *) hash_find(op_hash, str)) == NULL) {
-               as_bad("Unknown opcode: `%s'", str);
-               return;
-       }
-       if (comma) {
-               *--s = ',';
+  return;
+}                              /* md_end() */
+
+void
+md_assemble (str)
+     char *str;
+{
+  char *toP;
+  int rsd;
+
+  know (str);
+  sparc_ip (str);
+
+  /* See if "set" operand is absolute and small; skip sethi if so. */
+  if (special_case == SPECIAL_CASE_SET
+      && the_insn.exp.X_op == O_constant)
+    {
+      if (the_insn.exp.X_add_number >= -(1 << 12)
+         && the_insn.exp.X_add_number < (1 << 12))
+       {
+         the_insn.opcode = 0x80102000  /* or %g0,imm,... */
+           | (the_insn.opcode & 0x3E000000)    /* dest reg */
+           | (the_insn.exp.X_add_number & 0x1FFF);     /* imm */
+         special_case = 0;     /* No longer special */
+         the_insn.reloc = BFD_RELOC_NONE;      /* No longer relocated */
        }
-       argsStart = s;
-       for (;;) {
-               opcode = insn->match;
-               bzero(&the_insn, sizeof(the_insn));
-               the_insn.reloc = NO_RELOC;
-               
-               /*
-                * Build the opcode, checking as we go to make
-                * sure that the operands match
-                */
-               for (args = insn->args; ; ++args) {
-                       switch (*args) {
-                               
-                       case 'M':
-                       case 'm':
-                               if (strncmp(s, "%asr", 4) == 0) {
-                                       s += 4;
-
-                                       if (isdigit(*s)) {
-                                               long num = 0;
-
-                                               while (isdigit(*s)) {
-                                                       num = num*10 + *s-'0';
-                                                       ++s;
-                                               }
-
-                                               if (num < 16 || 31 < num) {
-                                                       error_message = ": asr number must be between 15 and 31";
-                                                       goto error;
-                                               } /* out of range */
-
-                                               opcode |= (*args == 'M' ? RS1(num) : RD(num));
-                                               continue;
-                                       } else {
-                                               error_message = ": expecting %asrN";
-                                               goto error;
-                                       } /* if %asr followed by a number. */
-                                       
-                               } /* if %asr */
-                               break;
-
- /* start-sanitize-v9 */
+    }
+
+  toP = frag_more (4);
+  /* put out the opcode */
+  md_number_to_chars (toP, (valueT) the_insn.opcode, 4);
+
+  /* put out the symbol-dependent stuff */
+  if (the_insn.reloc != BFD_RELOC_NONE)
+    {
+      fix_new_exp (frag_now,   /* which frag */
+                  (toP - frag_now->fr_literal),        /* where */
+                  4,           /* size */
+                  &the_insn.exp,
+                  the_insn.pcrel,
+                  the_insn.reloc);
+    }
+
+  switch (special_case)
+    {
+    case SPECIAL_CASE_SET:
+      special_case = 0;
+      assert (the_insn.reloc == BFD_RELOC_HI22);
+      /* See if "set" operand has no low-order bits; skip OR if so. */
+      if (the_insn.exp.X_op == O_constant
+         && ((the_insn.exp.X_add_number & 0x3FF) == 0))
+       return;
+      toP = frag_more (4);
+      rsd = (the_insn.opcode >> 25) & 0x1f;
+      the_insn.opcode = 0x80102000 | (rsd << 25) | (rsd << 14);
+      md_number_to_chars (toP, (valueT) the_insn.opcode, 4);
+      fix_new_exp (frag_now,   /* which frag */
+                  (toP - frag_now->fr_literal),        /* where */
+                  4,           /* size */
+                  &the_insn.exp,
+                  the_insn.pcrel,
+                  BFD_RELOC_LO10);
+      return;
+
+    case SPECIAL_CASE_FDIV:
+      /* According to information leaked from Sun, the "fdiv" instructions
+        on early SPARC machines would produce incorrect results sometimes.
+        The workaround is to add an fmovs of the destination register to
+        itself just after the instruction.  This was true on machines
+        with Weitek 1165 float chips, such as the Sun-4/260 and /280. */
+      special_case = 0;
+      assert (the_insn.reloc == BFD_RELOC_NONE);
+      toP = frag_more (4);
+      rsd = (the_insn.opcode >> 25) & 0x1f;
+      the_insn.opcode = 0x81A00020 | (rsd << 25) | rsd;        /* fmovs dest,dest */
+      md_number_to_chars (toP, (valueT) the_insn.opcode, 4);
+      return;
+
+    case 0:
+      return;
+
+    default:
+      as_fatal ("failed sanity check.");
+    }
+}                              /* md_assemble() */
+
+static void
+sparc_ip (str)
+     char *str;
+{
+  char *error_message = "";
+  char *s;
+  const char *args;
+  char c;
+  struct sparc_opcode *insn;
+  char *argsStart;
+  unsigned long opcode;
+  unsigned int mask = 0;
+  int match = 0;
+  int comma = 0;
+  long immediate_max = 0;
+
+  for (s = str; islower (*s) || (*s >= '0' && *s <= '3'); ++s)
+    ;
+  switch (*s)
+    {
+
+    case '\0':
+      break;
+
+    case ',':
+      comma = 1;
+
+      /*FALLTHROUGH */
+
+    case ' ':
+      *s++ = '\0';
+      break;
+
+    default:
+      as_bad ("Unknown opcode: `%s'", str);
+      exit (1);
+    }
+  if ((insn = (struct sparc_opcode *) hash_find (op_hash, str)) == NULL)
+    {
+      as_bad ("Unknown opcode: `%s'", str);
+      return;
+    }
+  if (comma)
+    {
+      *--s = ',';
+    }
+  argsStart = s;
+  for (;;)
+    {
+      opcode = insn->match;
+      memset (&the_insn, '\0', sizeof (the_insn));
+      the_insn.reloc = BFD_RELOC_NONE;
+
+      /*
+       * Build the opcode, checking as we go to make
+       * sure that the operands match
+       */
+      for (args = insn->args;; ++args)
+       {
+         switch (*args)
+           {
+
+             /* start-sanitize-v9 */
+#ifndef NO_V9
+           case 'K':
+             {
+               int mask = 0;
+               int i;
+
+               /* Parse a series of masks.  */
+               if (*s == '#')
+                 {
+                   while (*s == '#')
+                     {
+                       ++s;
+                       for (i = 0; i < MEMBAR_MASKS_SIZE; i++)
+                         if (!strncmp (s, membar_masks[i].name,
+                                       membar_masks[i].len))
+                           break;
+                       if (i < MEMBAR_MASKS_SIZE)
+                         {
+                           mask |= membar_masks[i].mask;
+                           s += membar_masks[i].len;
+                         }
+                       else
+                         {
+                           error_message = ": invalid membar mask name";
+                           goto error;
+                         }
+                       if (*s == '|')
+                         ++s;
+                     }
+                 }
+               else if (isdigit (*s))
+                 {
+                   while (isdigit (*s))
+                     {
+                       mask = mask * 10 + *s - '0';
+                       ++s;
+                     }
+
+                   if (mask < 0 || mask > 127)
+                     {
+                       error_message = ": invalid membar mask number";
+                       goto error;
+                     }
+                 }
+               else
+                 {
+                   error_message = ": unrecognizable membar mask";
+                   goto error;
+                 }
+               opcode |= SIMM13 (mask);
+               continue;
+             }
+
+           case '*':
+             {
+               int prefetch_fcn = 0;
+
+               /* Parse a prefetch function.  */
+               if (*s == '#')
+                 {
+                   s += 1;
+                   if (!strncmp (s, "n_reads", 7))
+                     prefetch_fcn = 0, s += 7;
+                   else if (!strncmp (s, "one_read", 8))
+                     prefetch_fcn = 1, s += 8;
+                   else if (!strncmp (s, "n_writes", 8))
+                     prefetch_fcn = 2, s += 8;
+                   else if (!strncmp (s, "one_write", 9))
+                     prefetch_fcn = 3, s += 9;
+                   else if (!strncmp (s, "page", 4))
+                     prefetch_fcn = 4, s += 4;
+                   else
+                     {
+                       error_message = ": invalid prefetch function name";
+                       goto error;
+                     }
+                 }
+               else if (isdigit (*s))
+                 {
+                   while (isdigit (*s))
+                     {
+                       prefetch_fcn = prefetch_fcn * 10 + *s - '0';
+                       ++s;
+                     }
+
+                   if (prefetch_fcn < 0 || prefetch_fcn > 31)
+                     {
+                       error_message = ": invalid prefetch function number";
+                       goto error;
+                     }
+                 }
+               else
+                 {
+                   error_message = ": unrecognizable prefetch function";
+                   goto error;
+                 }
+               opcode |= RD (prefetch_fcn);
+               continue;
+             }
+
+           case '!':
+           case '?':
+             /* Parse a privileged register.  */
+             if (*s == '%')
+               {
+                 struct priv_reg_entry *p = priv_reg_table;
+                 int len = 9999999; /* init to make gcc happy */
+
+                 s += 1;
+                 while (p->name[0] > s[0])
+                   p++;
+                 while (p->name[0] == s[0])
+                   {
+                     len = strlen (p->name);
+                     if (strncmp (p->name, s, len) == 0)
+                       break;
+                     p++;
+                   }
+                 if (p->name[0] != s[0])
+                   {
+                     error_message = ": unrecognizable privileged register";
+                     goto error;
+                   }
+                 if (*args == '?')
+                   opcode |= (p->regnum << 14);
+                 else
+                   opcode |= (p->regnum << 25);
+                 s += len;
+                 continue;
+               }
+             else
+               {
+                 error_message = ": unrecognizable privileged register";
+                 goto error;
+               }
+#endif
+             /* end-sanitize-v9 */
+
+           case 'M':
+           case 'm':
+             if (strncmp (s, "%asr", 4) == 0)
+               {
+                 s += 4;
+
+                 if (isdigit (*s))
+                   {
+                     long num = 0;
+
+                     while (isdigit (*s))
+                       {
+                         num = num * 10 + *s - '0';
+                         ++s;
+                       }
+
+                     if (num < 16 || 31 < num)
+                       {
+                         error_message = ": asr number must be between 15 and 31";
+                         goto error;
+                       }       /* out of range */
+
+                     opcode |= (*args == 'M' ? RS1 (num) : RD (num));
+                     continue;
+                   }
+                 else
+                   {
+                     error_message = ": expecting %asrN";
+                     goto error;
+                   }           /* if %asr followed by a number. */
+
+               }               /* if %asr */
+             break;
+
+             /* start-sanitize-v9 */
 #ifndef NO_V9
-                       case 'I':
-                               the_insn.reloc = RELOC_11;
-                               goto immediate;
-
-                       case 'k':
-                               the_insn.reloc = RELOC_WDISP2_14;
-                               the_insn.pcrel = 1;
-                               goto immediate;
-                               
-                       case 'G':
-                               the_insn.reloc = RELOC_WDISP19;
-                               the_insn.pcrel = 1;
-                               goto immediate;
-                               
-                       case 'N':
-                               if (*s == 'p' && s[1] == 'n') {
-                                       s += 2;
-                                       continue;
-                               }
-                               break;
-
-                       case 'T':
-                               if (*s == 'p' && s[1] == 't') {
-                                       s += 2;
-                                       continue;
-                               }
-                               break;
-
-                       case 'Y':
-                               if (strncmp(s, "%amr", 4) == 0) {
-                                       s += 4;
-                                       continue;
-                               }
-                               break;
-
-                       case 'z':
-                               if (*s == ' ') {
-                                       ++s;
-                               }
-                               if (strncmp(s, "icc", 3) == 0) {
-                                       s += 3;
-                                       continue;
-                               }
-                               break;
-
-                       case 'Z':
-                               if (*s == ' ') {
-                                       ++s;
-                               }
-                               if (strncmp(s, "xcc", 3) == 0) {
-                                       s += 3;
-                                       continue;
-                               }
-                               break;
-
-                       case '6':
-                               if (*s == ' ') {
-                                       ++s;
-                               }
-                               if (strncmp(s, "fcc0", 4) == 0) {
-                                       s += 4;
-                                       continue;
-                               }
-                               break;
-
-                       case '7':
-                               if (*s == ' ') {
-                                       ++s;
-                               }
-                               if (strncmp(s, "fcc1", 4) == 0) {
-                                       s += 4;
-                                       continue;
-                               }
-                               break;
-
-                       case '8':
-                               if (*s == ' ') {
-                                       ++s;
-                               }
-                               if (strncmp(s, "fcc2", 4) == 0) {
-                                       s += 4;
-                                       continue;
-                               }
-                               break;
-
-                       case '9':
-                               if (*s == ' ') {
-                                       ++s;
-                               }
-                               if (strncmp(s, "fcc3", 4) == 0) {
-                                       s += 4;
-                                       continue;
-                               }
-                               break;
-
-                       case 'P':
-                               if (strncmp(s, "%pc", 3) == 0) {
-                                       s += 3;
-                                       continue;
-                               }
-                               break;
-
-                       case 'E':
-                               if (strncmp(s, "%modes", 6) == 0) {
-                                       s += 6;
-                                       continue;
-                               }
-                               break;
-
-                       case 'W':
-                               if (strncmp(s, "%tick", 5) == 0) {
-                                       s += 5;
-                                       continue;
-                               }
-                               break;
+           case 'I':
+             the_insn.reloc = BFD_RELOC_SPARC_11;
+             immediate_max = 0x03FF;
+             goto immediate;
+
+           case 'j':
+             the_insn.reloc = BFD_RELOC_SPARC_10;
+             immediate_max = 0x01FF;
+             goto immediate;
+
+           case 'k':
+             the_insn.reloc = /* RELOC_WDISP2_14 */ BFD_RELOC_SPARC_WDISP16;
+             the_insn.pcrel = 1;
+             goto immediate;
+
+           case 'G':
+             the_insn.reloc = BFD_RELOC_SPARC_WDISP19;
+             the_insn.pcrel = 1;
+             goto immediate;
+
+           case 'N':
+             if (*s == 'p' && s[1] == 'n')
+               {
+                 s += 2;
+                 continue;
+               }
+             break;
+
+           case 'T':
+             if (*s == 'p' && s[1] == 't')
+               {
+                 s += 2;
+                 continue;
+               }
+             break;
+
+           case 'z':
+             if (*s == ' ')
+               {
+                 ++s;
+               }
+             if (strncmp (s, "%icc", 4) == 0)
+               {
+                 s += 4;
+                 continue;
+               }
+             break;
+
+           case 'Z':
+             if (*s == ' ')
+               {
+                 ++s;
+               }
+             if (strncmp (s, "%xcc", 4) == 0)
+               {
+                 s += 4;
+                 continue;
+               }
+             break;
+
+           case '6':
+             if (*s == ' ')
+               {
+                 ++s;
+               }
+             if (strncmp (s, "%fcc0", 5) == 0)
+               {
+                 s += 5;
+                 continue;
+               }
+             break;
+
+           case '7':
+             if (*s == ' ')
+               {
+                 ++s;
+               }
+             if (strncmp (s, "%fcc1", 5) == 0)
+               {
+                 s += 5;
+                 continue;
+               }
+             break;
+
+           case '8':
+             if (*s == ' ')
+               {
+                 ++s;
+               }
+             if (strncmp (s, "%fcc2", 5) == 0)
+               {
+                 s += 5;
+                 continue;
+               }
+             break;
+
+           case '9':
+             if (*s == ' ')
+               {
+                 ++s;
+               }
+             if (strncmp (s, "%fcc3", 5) == 0)
+               {
+                 s += 5;
+                 continue;
+               }
+             break;
+
+           case 'P':
+             if (strncmp (s, "%pc", 3) == 0)
+               {
+                 s += 3;
+                 continue;
+               }
+             break;
+
+           case 'W':
+             if (strncmp (s, "%tick", 5) == 0)
+               {
+                 s += 5;
+                 continue;
+               }
+             break;
 #endif /* NO_V9 */
- /* end-sanitize-v9 */
-
-                       case '\0':  /* end of args */
-                               if (*s == '\0') {
-                                       match = 1;
-                               }
-                               break;
-                               
-                       case '+':
-                               if (*s == '+') {
-                                       ++s;
-                                       continue;
-                               }
-                               if (*s == '-') {
-                                       continue;
-                               }
-                               break;
-                               
-                       case '[':   /* these must match exactly */
-                       case ']':
-                       case ',':
-                       case ' ':
-                               if (*s++ == *args)
-                                   continue;
-                               break;
-                               
-                       case '#':   /* must be at least one digit */
-                               if (isdigit(*s++)) {
-                                       while (isdigit(*s)) {
-                                               ++s;
-                                       }
-                                       continue;
-                               }
-                               break;
-                               
-                       case 'C':   /* coprocessor state register */
-                               if (strncmp(s, "%csr", 4) == 0) {
-                                       s += 4;
-                                       continue;
-                               }
-                               break;
-                               
-                       case 'b':    /* next operand is a coprocessor register */
-                       case 'c':
-                       case 'D':
-                               if (*s++ == '%' && *s++ == 'c' && isdigit(*s)) {
-                                       mask = *s++;
-                                       if (isdigit(*s)) {
-                                               mask = 10 * (mask - '0') + (*s++ - '0');
-                                               if (mask >= 32) {
-                                                       break;
-                                               }
-                                       } else {
-                                               mask -= '0';
-                                       }
-                                       switch (*args) {
-                                               
-                                       case 'b':
-                                               opcode |= mask << 14;
-                                               continue;
-                                               
-                                       case 'c':
-                                               opcode |= mask;
-                                               continue;
-                                               
-                                       case 'D':
-                                               opcode |= mask << 25;
-                                               continue;
-                                       }
-                               }
-                               break;
-                               
-                       case 'r':   /* next operand must be a register */
-                       case '1':
-                       case '2':
-                       case 'd':
-                               if (*s++ == '%') {
-                                       switch (c = *s++) {
-                                               
-                                       case 'f':   /* frame pointer */
-                                               if (*s++ == 'p') {
-                                                       mask = 0x1e;
-                                                       break;
-                                               }
-                                               goto error;
-                                               
-                                       case 'g':   /* global register */
-                                               if (isoctal(c = *s++)) {
-                                                       mask = c - '0';
-                                                       break;
-                                               }
-                                               goto error;
-                                               
-                                       case 'i':   /* in register */
-                                               if (isoctal(c = *s++)) {
-                                                       mask = c - '0' + 24;
-                                                       break;
-                                               }
-                                               goto error;
-                                               
-                                       case 'l':   /* local register */
-                                               if (isoctal(c = *s++)) {
-                                                       mask= (c - '0' + 16) ;
-                                                       break;
-                                               }
-                                               goto error;
-                                               
-                                       case 'o':   /* out register */
-                                               if (isoctal(c = *s++)) {
-                                                       mask= (c - '0' + 8) ;
-                                                       break;
-                                               }
-                                               goto error;
-                                               
-                                       case 's':   /* stack pointer */
-                                               if (*s++ == 'p') {
-                                                       mask= 0xe;
-                                                       break;
-                                               }
-                                               goto error;
-                                               
-                                       case 'r': /* any register */
-                                               if (!isdigit(c = *s++)) {
-                                                       goto error;
-                                               }
-                                               /* FALLTHROUGH */
-                                       case '0': case '1': case '2': case '3': case '4':
-                                       case '5': case '6': case '7': case '8': case '9':
-                                               if (isdigit(*s)) {
-                                                       if ((c = 10 * (c - '0') + (*s++ - '0')) >= 32) {
-                                                               goto error;
-                                                       }
-                                               } else {
-                                                       c -= '0';
-                                               }
-                                               mask= c;
-                                               break;
-                                               
-                                       default:
-                                               goto error;
-                                       }
-                                       /*
+             /* end-sanitize-v9 */
+
+           case '\0':          /* end of args */
+             if (*s == '\0')
+               {
+                 match = 1;
+               }
+             break;
+
+           case '+':
+             if (*s == '+')
+               {
+                 ++s;
+                 continue;
+               }
+             if (*s == '-')
+               {
+                 continue;
+               }
+             break;
+
+           case '[':           /* these must match exactly */
+           case ']':
+           case ',':
+           case ' ':
+             if (*s++ == *args)
+               continue;
+             break;
+
+           case '#':           /* must be at least one digit */
+             if (isdigit (*s++))
+               {
+                 while (isdigit (*s))
+                   {
+                     ++s;
+                   }
+                 continue;
+               }
+             break;
+
+           case 'C':           /* coprocessor state register */
+             if (strncmp (s, "%csr", 4) == 0)
+               {
+                 s += 4;
+                 continue;
+               }
+             break;
+
+           case 'b':           /* next operand is a coprocessor register */
+           case 'c':
+           case 'D':
+             if (*s++ == '%' && *s++ == 'c' && isdigit (*s))
+               {
+                 mask = *s++;
+                 if (isdigit (*s))
+                   {
+                     mask = 10 * (mask - '0') + (*s++ - '0');
+                     if (mask >= 32)
+                       {
+                         break;
+                       }
+                   }
+                 else
+                   {
+                     mask -= '0';
+                   }
+                 switch (*args)
+                   {
+
+                   case 'b':
+                     opcode |= mask << 14;
+                     continue;
+
+                   case 'c':
+                     opcode |= mask;
+                     continue;
+
+                   case 'D':
+                     opcode |= mask << 25;
+                     continue;
+                   }
+               }
+             break;
+
+           case 'r':           /* next operand must be a register */
+           case '1':
+           case '2':
+           case 'd':
+             if (*s++ == '%')
+               {
+                 switch (c = *s++)
+                   {
+
+                   case 'f':   /* frame pointer */
+                     if (*s++ == 'p')
+                       {
+                         mask = 0x1e;
+                         break;
+                       }
+                     goto error;
+
+                   case 'g':   /* global register */
+                     if (isoctal (c = *s++))
+                       {
+                         mask = c - '0';
+                         break;
+                       }
+                     goto error;
+
+                   case 'i':   /* in register */
+                     if (isoctal (c = *s++))
+                       {
+                         mask = c - '0' + 24;
+                         break;
+                       }
+                     goto error;
+
+                   case 'l':   /* local register */
+                     if (isoctal (c = *s++))
+                       {
+                         mask = (c - '0' + 16);
+                         break;
+                       }
+                     goto error;
+
+                   case 'o':   /* out register */
+                     if (isoctal (c = *s++))
+                       {
+                         mask = (c - '0' + 8);
+                         break;
+                       }
+                     goto error;
+
+                   case 's':   /* stack pointer */
+                     if (*s++ == 'p')
+                       {
+                         mask = 0xe;
+                         break;
+                       }
+                     goto error;
+
+                   case 'r':   /* any register */
+                     if (!isdigit (c = *s++))
+                       {
+                         goto error;
+                       }
+                     /* FALLTHROUGH */
+                   case '0':
+                   case '1':
+                   case '2':
+                   case '3':
+                   case '4':
+                   case '5':
+                   case '6':
+                   case '7':
+                   case '8':
+                   case '9':
+                     if (isdigit (*s))
+                       {
+                         if ((c = 10 * (c - '0') + (*s++ - '0')) >= 32)
+                           {
+                             goto error;
+                           }
+                       }
+                     else
+                       {
+                         c -= '0';
+                       }
+                     mask = c;
+                     break;
+
+                   default:
+                     goto error;
+                   }
+                 /*
                                         * Got the register, now figure out where
                                         * it goes in the opcode.
                                         */
-                                       switch (*args) {
-                                               
-                                       case '1':
-                                               opcode |= mask << 14;
-                                               continue;
-                                               
-                                       case '2':
-                                               opcode |= mask;
-                                               continue;
-                                               
-                                       case 'd':
-                                               opcode |= mask << 25;
-                                               continue;
-                                               
-                                       case 'r':
-                                               opcode |= (mask << 25) | (mask << 14);
-                                               continue;
-                                       }
-                               }
-                               break;
-                               
- /* start-sanitize-v9 */
-#ifndef NO_V9
-                       case 'j':
-                       case 'u':
-                       case 'U':
-#endif /* NO_V9 */
- /* end-sanitize-v9 */
-                       case 'e': /* next operand is a floating point register */
-                       case 'v':
-                       case 'V':
+                 switch (*args)
+                   {
+
+                   case '1':
+                     opcode |= mask << 14;
+                     continue;
+
+                   case '2':
+                     opcode |= mask;
+                     continue;
 
-                       case 'f':
-                       case 'B':
-                       case 'R':
+                   case 'd':
+                     opcode |= mask << 25;
+                     continue;
 
-                       case 'g':
-                       case 'H':
-                       case 'J': {
-                               char format;
+                   case 'r':
+                     opcode |= (mask << 25) | (mask << 14);
+                     continue;
+                   }
+               }
+             break;
+
+           case 'e':           /* next operand is a floating point register */
+           case 'v':
+           case 'V':
+
+           case 'f':
+           case 'B':
+           case 'R':
+
+           case 'g':
+           case 'H':
+           case 'J':
+             {
+               char format;
+
+               if (*s++ == '%'
+                   && ((format = *s) == 'f')
+                   && isdigit (*++s))
+                 {
+                   for (mask = 0; isdigit (*s); ++s)
+                     {
+                       mask = 10 * mask + (*s - '0');
+                     }         /* read the number */
+
+                   if ((*args == 'v'
+                        || *args == 'B'
+                        || *args == 'H')
+                       && (mask & 1))
+                     {
+                       break;
+                     }         /* register must be even numbered */
 
-                               if (*s++ == '%'
+                   if ((*args == 'V'
+                        || *args == 'R'
+                        || *args == 'J')
+                       && (mask & 3))
+                     {
+                       break;
+                     }         /* register must be multiple of 4 */
 
- /* start-sanitize-v9 */
+/* start-sanitize-v9 */
 #ifndef NO_V9
-                                   && ((format = *s) == 'f'
-                                   || *s == 'd'
-                                   || *s == 'q')
+                   if (mask >= 64)
+                     {
+                       error_message = ": There are only 64 f registers; [0-63]";
+                       goto error;
+                     } /* on error */
+                   if (mask >= 32)
+                     {
+                       mask -= 31;
+                     } /* wrap high bit */
 #else
- /* end-sanitize-v9 */
-                                   && ((format = *s) == 'f')
+/* end-sanitize-v9 */
+                   if (mask >= 32)
+                     {
+                       error_message = ": There are only 32 f registers; [0-31]";
+                       goto error;
+                     } /* on error */
+/* start-sanitize-v9 */
+#endif
+/* end-sanitize-v9 */
+                 }
+               else
+                 {
+                   break;
+                 }     /* if not an 'f' register. */
+
+               switch (*args)
+                 {
+
+                 case 'v':
+                 case 'V':
+                 case 'e':
+                   opcode |= RS1 (mask);
+                   continue;
+
+
+                 case 'f':
+                 case 'B':
+                 case 'R':
+                   opcode |= RS2 (mask);
+                   continue;
+
+                 case 'g':
+                 case 'H':
+                 case 'J':
+                   opcode |= RD (mask);
+                   continue;
+                 }             /* pack it in. */
+
+               know (0);
+               break;
+             }                 /* float arg */
 
- /* start-sanitize-v9 */
-#endif /* NO_V9 */
- /* end-sanitize-v9 */
-                                   && isdigit(*++s)) {
-
-
-
-                                       for (mask = 0; isdigit(*s); ++s) {
-                                               mask = 10 * mask + (*s - '0');
-                                       } /* read the number */
-
-                                       if ((*args == 'u'
-                                            || *args == 'v'
-                                            || *args == 'B'
-                                            || *args == 'H')
-                                           && (mask & 1)) {
-                                               break;
-                                       } /* register must be even numbered */
-
-                                       if ((*args == 'U'
-                                            || *args == 'V'
-                                            || *args == 'R'
-                                            || *args == 'J')
-                                           && (mask & 3)) {
-                                               break;
-                                       } /* register must be multiple of 4 */
-
-                                       if (format == 'f') {
-                                               if (mask >= 32) {
-                                                       error_message = ": There are only 32 f registers; [0-31]";
-                                                       goto error;
-                                               } /* on error */
- /* start-sanitize-v9 */
+           case 'F':
+             if (strncmp (s, "%fsr", 4) == 0)
+               {
+                 s += 4;
+                 continue;
+               }
+             break;
+
+           case 'h':           /* high 22 bits */
+             the_insn.reloc = BFD_RELOC_HI22;
+             goto immediate;
+
+           case 'l':           /* 22 bit PC relative immediate */
+             the_insn.reloc = BFD_RELOC_SPARC_WDISP22;
+             the_insn.pcrel = 1;
+             goto immediate;
+
+           case 'L':           /* 30 bit immediate */
+             the_insn.reloc = BFD_RELOC_32_PCREL_S2;
+             the_insn.pcrel = 1;
+             goto immediate;
+
+           case 'n':           /* 22 bit immediate */
+             the_insn.reloc = BFD_RELOC_SPARC22;
+             goto immediate;
+
+           case 'i':           /* 13 bit immediate */
+             /* What's the difference between base13 and 13?  */
+             the_insn.reloc = BFD_RELOC_SPARC_BASE13;
+             immediate_max = 0x0FFF;
+
+             /*FALLTHROUGH */
+
+           immediate:
+             if (*s == ' ')
+               s++;
+             if (*s == '%')
+               {
+                 if ((c = s[1]) == 'h' && s[2] == 'i')
+                   {
+                     the_insn.reloc = BFD_RELOC_HI22;
+                     s += 3;
+                   }
+                 else if (c == 'l' && s[2] == 'o')
+                   {
+                     the_insn.reloc = BFD_RELOC_LO10;
+                     s += 3;
+                     /* start-sanitize-v9 */
 #ifndef NO_V9
-                                       } else {
-                                               if (format == 'd') {
-                                                       if (mask >= 64) {
-                                                               error_message = ": There are only 32 d registers [0, 2, ... 62].";
-                                                               goto error;
-                                                       } else if (mask & 1) {
-                                                               error_message = ": Only even numbered d registers exist.";
-                                                               goto error;
-                                                       } /* on error */
-                                                       
-                                               } else if (format == 'q') {
-                                                       if (mask >= 64) {
-                                                               error_message =
-                                                                   ": There are only 16 q registers [0, 4, ... 60].";
-                                                               goto error;
-                                                       } else if (mask & 3) {
-                                                               error_message =
-                                                                   ": Only q registers evenly divisible by four exist.";
-                                                               goto error;
-                                                       } /* on error */
-                                               } else {
-                                                       know(0);
-                                               } /* depending on format */
-                                               
-                                               if (mask >= 32) {
-                                                       mask -= 31;
-                                               } /* wrap high bit */
+                   }
+                 else if (c == 'u'
+                          && s[2] == 'h'
+                          && s[3] == 'i')
+                   {
+                     the_insn.reloc = BFD_RELOC_SPARC_HH22;
+                     s += 4;
+                   }
+                 else if (c == 'u'
+                          && s[2] == 'l'
+                          && s[3] == 'o')
+                   {
+                     the_insn.reloc = BFD_RELOC_SPARC_HM10;
+                     s += 4;
 #endif /* NO_V9 */
- /* end-sanitize-v9 */
-                                       } /* if not an 'f' register. */
-                               } /* on error */
-
-                               switch (*args) {
- /* start-sanitize-v9 */
+                     /* end-sanitize-v9 */
+                   }
+                 else
+                   break;
+               }
+             /* Note that if the getExpression() fails, we
+                will still have created U entries in the
+                symbol table for the 'symbols' in the input
+                string.  Try not to create U symbols for
+                registers, etc. */
+             {
+               /* This stuff checks to see if the
+                  expression ends in +%reg If it does,
+                  it removes the register from the
+                  expression, and re-sets 's' to point
+                  to the right place */
+
+               char *s1;
+
+               for (s1 = s; *s1 && *s1 != ',' && *s1 != ']'; s1++);;
+
+               if (s1 != s && isdigit (s1[-1]))
+                 {
+                   if (s1[-2] == '%' && s1[-3] == '+')
+                     {
+                       s1 -= 3;
+                       *s1 = '\0';
+                       (void) getExpression (s);
+                       *s1 = '+';
+                       s = s1;
+                       continue;
+                     }
+                   else if (strchr ("goli0123456789", s1[-2]) && s1[-3] == '%' && s1[-4] == '+')
+                     {
+                       s1 -= 4;
+                       *s1 = '\0';
+                       (void) getExpression (s);
+                       *s1 = '+';
+                       s = s1;
+                       continue;
+                     }
+                 }
+             }
+             (void) getExpression (s);
+             s = expr_end;
+
+             /* Check for invalid constant values.  Don't
+                warn if constant was inside %hi or %lo,
+                since these truncate the constant to
+                fit.  */
+             if (immediate_max != 0
+                 && the_insn.reloc != BFD_RELOC_LO10
+                 && the_insn.reloc != BFD_RELOC_HI22
+             /* start-sanitize-v9 */
 #ifndef NO_V9
-                               case 'j':
-                               case 'u':
-                               case 'U':
-                                       opcode |= (mask & 0x1f) << 9;
-                                       continue;
-#endif /* NO_V9 */
- /* end-sanitize-v9 */
-
-                               case 'v':
-                               case 'V':
-                               case 'e':
-                                       opcode |= RS1(mask);
-                                       continue;
-                                       
-
-                               case 'f':
-                               case 'B':
-                               case 'R':
-                                       opcode |= RS2(mask);
-                                       continue;
-                                       
-                               case 'g':
-                               case 'H':
-                               case 'J':
-                                       opcode |= RD(mask);
-                                       continue;
-                               } /* pack it in. */
-
-                               know(0);
-                               break;
-                       } /* float arg */
-                               
-                       case 'F':
-                               if (strncmp(s, "%fsr", 4) == 0) {
-                                       s += 4;
-                                       continue;
-                               }
-                               break;
-                               
-                       case 'h': /* high 22 bits */
-                               the_insn.reloc = RELOC_HI22;
-                               goto immediate;
-                               
-                       case 'l': /* 22 bit PC relative immediate */
-                               the_insn.reloc = RELOC_WDISP22;
-                               the_insn.pcrel = 1;
-                               goto immediate;
-                               
-                       case 'L': /* 30 bit immediate */
-                               the_insn.reloc = RELOC_WDISP30;
-                               the_insn.pcrel = 1;
-                               goto immediate;
-                               
-                       case 'n': /* 22 bit immediate */
-                               the_insn.reloc = RELOC_22;
-                               goto immediate;
-
-                       case 'i':   /* 13 bit immediate */
-                               the_insn.reloc = RELOC_BASE13;
-                               
-                               /*FALLTHROUGH */
-                               
-                       immediate:
-                               if(*s==' ')
-                                   s++;
-                               if (*s == '%') {
-                                       if ((c = s[1]) == 'h' && s[2] == 'i') {
-                                               the_insn.reloc = RELOC_HI22;
-                                               s+=3;
-                                       } else if (c == 'l' && s[2] == 'o') {
-                                               the_insn.reloc = RELOC_LO10;
-                                               s+=3;
- /* start-sanitize-v9 */
+#ifndef BFD_ASSEMBLER /* the bfd backend doesn't support these relocs yet */
+                 && the_insn.reloc != RELOC_HLO10
+                 && the_insn.reloc != RELOC_HHI22
+#endif
+#endif
+             /* end-sanitize-v9 */
+                 && the_insn.exp.X_add_symbol == 0
+                 && the_insn.exp.X_op_symbol == 0
+                 && the_insn.exp.X_op == O_constant
+                 && (the_insn.exp.X_add_number > immediate_max
+                     || the_insn.exp.X_add_number < ~immediate_max))
+               as_bad ("constant value must be between %ld and %ld",
+                       ~immediate_max, immediate_max);
+             /* Reset to prevent extraneous range check.  */
+             immediate_max = 0;
+
+             continue;
+
+           case 'a':
+             if (*s++ == 'a')
+               {
+                 opcode |= ANNUL;
+                 continue;
+               }
+             break;
+
+           case 'A':
+             {
+/* start-sanitize-v9 */
+#ifdef NO_V9
+/* end-sanitize-v9 */
+               char *push = input_line_pointer;
+               expressionS e;
+
+               input_line_pointer = s;
+
+               expression (&e);
+               if (e.X_op == O_constant)
+                 {
+                   opcode |= e.X_add_number << 5;
+                   s = input_line_pointer;
+                   input_line_pointer = push;
+                   continue;
+                 }             /* if absolute */
+
+               break;
+/* start-sanitize-v9 */
+#else
+               int asi = 0;
+
+               /* Parse an asi.  */
+               if (*s == '#')
+                 {
+                   s += 1;
+                   if (!strncmp (s, "ASI_AIUP", 8))
+                     asi = 0x10, s += 8;
+                   else if (!strncmp (s, "ASI_AIUS", 8))
+                     asi = 0x11, s += 8;
+                   else if (!strncmp (s, "ASI_PNF", 7))
+                     asi = 0x82, s += 7;
+                   else if (!strncmp (s, "ASI_SNF", 7))
+                     asi = 0x83, s += 7;
+                   else if (!strncmp (s, "ASI_P", 5))
+                     asi = 0x80, s += 5;
+                   else if (!strncmp (s, "ASI_S", 5))
+                     asi = 0x81, s += 5;
+                   else
+                     {
+                       error_message = ": invalid asi name";
+                       goto error;
+                     }
+                 }
+               else if (isdigit (*s))
+                 {
+                   char *push = input_line_pointer;
+                   input_line_pointer = s;
+                   asi = get_absolute_expression ();
+                   s = input_line_pointer;
+                   input_line_pointer = push;
+                   
+                   if (asi < 0 || asi > 255)
+                     {
+                       error_message = ": invalid asi number";
+                       goto error;
+                     }
+                 }
+               else
+                 {
+                   error_message = ": unrecognizable asi";
+                   goto error;
+                 }
+               opcode |= ASI (asi);
+               continue;
+#endif
+/* end-sanitize-v9 */
+             }                 /* alternate space */
+
+           case 'p':
+             if (strncmp (s, "%psr", 4) == 0)
+               {
+                 s += 4;
+                 continue;
+               }
+             break;
+
+           case 'q':           /* floating point queue */
+             if (strncmp (s, "%fq", 3) == 0)
+               {
+                 s += 3;
+                 continue;
+               }
+             break;
+
+           case 'Q':           /* coprocessor queue */
+             if (strncmp (s, "%cq", 3) == 0)
+               {
+                 s += 3;
+                 continue;
+               }
+             break;
+
+           case 'S':
+             if (strcmp (str, "set") == 0)
+               {
+                 special_case = SPECIAL_CASE_SET;
+                 continue;
+               }
+             else if (strncmp (str, "fdiv", 4) == 0)
+               {
+                 special_case = SPECIAL_CASE_FDIV;
+                 continue;
+               }
+             break;
+
+             /* start-sanitize-v9 */
 #ifndef NO_V9
-                                       } else if (c == 'h'
-                                                  && s[2] == 'h'
-                                                  && s[3] == 'i') {
-                                               the_insn.reloc = RELOC_HHI22;
-                                               s += 4;
-
-                                       } else if (c == 'h'
-                                                  && s[2] == 'l'
-                                                  && s[3] == 'o') {
-                                               the_insn.reloc = RELOC_HLO10;
-                                               s += 4;
+           case 'o':
+             if (strncmp (s, "%asi", 4) != 0)
+               break;
+             s += 4;
+             continue;
+
+           case 's':
+             if (strncmp (s, "%fprs", 5) != 0)
+               break;
+             s += 5;
+             continue;
+
+           case 'E':
+             if (strncmp (s, "%ccr", 4) != 0)
+               break;
+             s += 4;
+             continue;
 #endif /* NO_V9 */
- /* end-sanitize-v9 */
-                                       } else
-                                           break;
-                               }
-                               /* Note that if the getExpression() fails, we
-                                  will still have created U entries in the
-                                  symbol table for the 'symbols' in the input
-                                  string.  Try not to create U symbols for
-                                  registers, etc. */ 
-                               {
-                                       /* This stuff checks to see if the
-                                          expression ends in +%reg If it does,
-                                          it removes the register from the
-                                          expression, and re-sets 's' to point
-                                          to the right place */
-                                       
-                                       char *s1;
-                                       
-                                       for (s1 = s; *s1 && *s1 != ',' && *s1 != ']'; s1++) ;;
-                                       
-                                       if (s1 != s && isdigit(s1[-1])) {
-                                               if(s1[-2] == '%' && s1[-3] == '+') {
-                                                       s1 -= 3;
-                                                       *s1 = '\0';
-                                                       (void) getExpression(s);
-                                                       *s1 = '+';
-                                                       s = s1;
-                                                       continue;
-                                               } else if (strchr("goli0123456789", s1[-2]) && s1[-3] == '%' && s1[-4] == '+') {
-                                                       s1 -= 4;
-                                                       *s1 = '\0';
-                                                       (void) getExpression(s);
-                                                       *s1 = '+';
-                                                       s = s1;
-                                                       continue;
-                                               }
-                                       }
-                               }
-                               (void)getExpression(s);
-                               s = expr_end;
-                               continue;
-                               
-                       case 'a':
-                               if (*s++ == 'a') {
-                                       opcode |= ANNUL;
-                                       continue;
-                               }
-                               break;
-                               
-                       case 'A': {
-                               char *push = input_line_pointer;
-                               expressionS e;
-                               
-                               input_line_pointer = s;
-
-                               if (expression(&e) == SEG_ABSOLUTE) {
-                                       opcode |= e.X_add_number << 5;
-                                       s = input_line_pointer;
-                                       input_line_pointer = push;
-                                       continue;
-                               } /* if absolute */
-                               
-                               break;
-                       } /* alternate space */
-
-                       case 'p':
-                               if (strncmp(s, "%psr", 4) == 0) {
-                                       s += 4;
-                                       continue;
-                               }
-                               break;
-                               
-                       case 'q':   /* floating point queue */
-                               if (strncmp(s, "%fq", 3) == 0) {
-                                       s += 3;
-                                       continue;
-                               }
-                               break;
-                               
-                       case 'Q':   /* coprocessor queue */
-                               if (strncmp(s, "%cq", 3) == 0) {
-                                       s += 3;
-                                       continue;
-                               }
-                               break;
-                               
-                       case 'S':
-                               if (strcmp(str, "set") == 0) {
-                                       special_case = SPECIAL_CASE_SET;
-                                       continue;
-                               } else if (strncmp(str, "fdiv", 4) == 0) {
-                                       special_case = SPECIAL_CASE_FDIV;
-                                       continue;
-                               }
-                               break;
-                               
-                       case 't':
-                               if (strncmp(s, "%tbr", 4) != 0)
-                                   break;
-                               s += 4;
-                               continue;
-                               
-                       case 'w':
-                               if (strncmp(s, "%wim", 4) != 0)
-                                   break;
-                               s += 4;
-                               continue;
-                               
-                       case 'y':
-                               if (strncmp(s, "%y", 2) != 0)
-                                   break;
-                               s += 2;
-                               continue;
-                               
-                       default:
-                               as_fatal("failed sanity check.");
-                       } /* switch on arg code */
-                       break;
-               } /* for each arg that we expect */
-       error:
-               if (match == 0) {
-                       /* Args don't match. */
-                       if (((unsigned) (&insn[1] - sparc_opcodes)) < NUMOPCODES
-                           && !strcmp(insn->name, insn[1].name)) {
-                               ++insn;
-                               s = argsStart;
-                               continue;
-                       } else {
-                               as_bad("Illegal operands%s", error_message);
-                               return;
-                       }
-               } else {
-                       if (insn->architecture > current_architecture) {
-                               if (current_architecture != cypress
-                                   && (!architecture_requested || warn_on_bump)) {
-
-                                       if (warn_on_bump) {
-                                               as_warn("architecture bumped from \"%s\" to \"%s\" on \"%s\"",
-                                                       architecture_pname[current_architecture],
-                                                       architecture_pname[insn->architecture],
-                                                       str);
-                                       } /* if warning */
-
-                                       current_architecture = insn->architecture;
-                               } else {
-                                       as_bad("architecture mismatch on \"%s\" (\"%s\").  current architecture is \"%s\"",
-                                              str,
-                                              architecture_pname[insn->architecture],
-                                              architecture_pname[current_architecture]);
-                                       return;
-                               } /* if bump ok else error */
-                       } /* if architecture higher */
-               } /* if no match */
+             /* end-sanitize-v9 */
 
+           case 't':
+             if (strncmp (s, "%tbr", 4) != 0)
                break;
-       } /* forever looking for a match */
+             s += 4;
+             continue;
 
-       the_insn.opcode = opcode;
-       return;
-} /* sparc_ip() */
+           case 'w':
+             if (strncmp (s, "%wim", 4) != 0)
+               break;
+             s += 4;
+             continue;
 
-static int getExpression(str)
-char *str;
-{
-       char *save_in;
-       segT seg;
-       
-       save_in = input_line_pointer;
-       input_line_pointer = str;
-       switch (seg = expression(&the_insn.exp)) {
-               
-       case SEG_ABSOLUTE:
-       case SEG_TEXT:
-       case SEG_DATA:
-       case SEG_BSS:
-       case SEG_UNKNOWN:
-       case SEG_DIFFERENCE:
-       case SEG_BIG:
-       case SEG_ABSENT:
+           case 'y':
+             if (strncmp (s, "%y", 2) != 0)
                break;
-               
-       default:
-               the_insn.error = "bad segment";
-               expr_end = input_line_pointer;
-               input_line_pointer=save_in;
-               return 1;
+             s += 2;
+             continue;
+
+           default:
+             as_fatal ("failed sanity check.");
+           }                   /* switch on arg code */
+         break;
+       }                       /* for each arg that we expect */
+    error:
+      if (match == 0)
+       {
+         /* Args don't match. */
+         if (((unsigned) (&insn[1] - sparc_opcodes)) < NUMOPCODES
+             && !strcmp (insn->name, insn[1].name))
+           {
+             ++insn;
+             s = argsStart;
+             continue;
+           }
+         else
+           {
+             as_bad ("Illegal operands%s", error_message);
+             return;
+           }
        }
-       expr_end = input_line_pointer;
-       input_line_pointer = save_in;
-       return 0;
-} /* getExpression() */
+      else
+       {
+         if (insn->architecture > current_architecture)
+           {
+             if ((!architecture_requested || warn_on_bump)
+                 &&
+             /* start-sanitize-v9 */
+#ifndef NO_V9
+                 !ARCHITECTURES_CONFLICT_P (current_architecture,
+                                            insn->architecture)
+#else
+             /* end-sanitize-v9 */
+                 1
+             /* start-sanitize-v9 */
+#endif
+             /* end-sanitize-v9 */
+               )
+               {
+                 if (warn_on_bump)
+                   {
+                     as_warn ("architecture bumped from \"%s\" to \"%s\" on \"%s\"",
+                              architecture_pname[current_architecture],
+                              architecture_pname[insn->architecture],
+                              str);
+                   }           /* if warning */
+
+                 current_architecture = insn->architecture;
+               }
+             else
+               {
+                 as_bad ("architecture mismatch on \"%s\" (\"%s\").  current architecture is \"%s\"",
+                         str,
+                         architecture_pname[insn->architecture],
+                         architecture_pname[current_architecture]);
+                 return;
+               }               /* if bump ok else error */
+           }                   /* if architecture higher */
+       }                       /* if no match */
+
+      break;
+    }                          /* forever looking for a match */
+
+  the_insn.opcode = opcode;
+  return;
+}                              /* sparc_ip() */
+
+static int
+getExpression (str)
+     char *str;
+{
+  char *save_in;
+  segT seg;
+
+  save_in = input_line_pointer;
+  input_line_pointer = str;
+  seg = expression (&the_insn.exp);
+  if (seg == absolute_section
+      || seg == text_section
+      || seg == data_section
+      || seg == bss_section
+      || seg == undefined_section)
+    /* ok */;
+  else
+    {
+      the_insn.error = "bad segment";
+      expr_end = input_line_pointer;
+      input_line_pointer = save_in;
+      return 1;
+    }
+  expr_end = input_line_pointer;
+  input_line_pointer = save_in;
+  return 0;
+}                              /* getExpression() */
 
 
 /*
   This is identical to the md_atof in m68k.c.  I think this is right,
   but I'm not sure.
-  
+
   Turn a string in input_line_pointer into a floating point constant of type
   type, and store the appropriate bytes in *litP.  The number of LITTLENUMS
   emitted is stored in *sizeP .  An error message is returned, or NULL on OK.
@@ -1226,459 +1816,517 @@ char *str;
 /* Equal to MAX_PRECISION in atof-ieee.c */
 #define MAX_LITTLENUMS 6
 
-char *md_atof(type,litP,sizeP)
-char type;
-char *litP;
-int *sizeP;
+char *
+md_atof (type, litP, sizeP)
+     char type;
+     char *litP;
+     int *sizeP;
 {
-       int prec;
-       LITTLENUM_TYPE words[MAX_LITTLENUMS];
-       LITTLENUM_TYPE *wordP;
-       char *t;
-       char *atof_ieee();
-       
-       switch(type) {
-               
-       case 'f':
-       case 'F':
-       case 's':
-       case 'S':
-               prec = 2;
-               break;
-               
-       case 'd':
-       case 'D':
-       case 'r':
-       case 'R':
-               prec = 4;
-               break;
-               
-       case 'x':
-       case 'X':
-               prec = 6;
-               break;
-               
-       case 'p':
-       case 'P':
-               prec = 6;
-               break;
-               
-       default:
-               *sizeP=0;
-               return "Bad call to MD_ATOF()";
-       }
-       t=atof_ieee(input_line_pointer,type,words);
-       if(t)
-           input_line_pointer=t;
-       *sizeP=prec * sizeof(LITTLENUM_TYPE);
-       for(wordP=words;prec--;) {
-               md_number_to_chars(litP,(long)(*wordP++),sizeof(LITTLENUM_TYPE));
-               litP+=sizeof(LITTLENUM_TYPE);
-       }
-       return "";      /* Someone should teach Dean about null pointers */
-} /* md_atof() */
+  int prec;
+  LITTLENUM_TYPE words[MAX_LITTLENUMS];
+  LITTLENUM_TYPE *wordP;
+  char *t;
+  char *atof_ieee ();
+
+  switch (type)
+    {
+
+    case 'f':
+    case 'F':
+    case 's':
+    case 'S':
+      prec = 2;
+      break;
+
+    case 'd':
+    case 'D':
+    case 'r':
+    case 'R':
+      prec = 4;
+      break;
+
+    case 'x':
+    case 'X':
+      prec = 6;
+      break;
+
+    case 'p':
+    case 'P':
+      prec = 6;
+      break;
+
+    default:
+      *sizeP = 0;
+      return "Bad call to MD_ATOF()";
+    }
+  t = atof_ieee (input_line_pointer, type, words);
+  if (t)
+    input_line_pointer = t;
+  *sizeP = prec * sizeof (LITTLENUM_TYPE);
+  for (wordP = words; prec--;)
+    {
+      md_number_to_chars (litP, (valueT) (*wordP++), sizeof (LITTLENUM_TYPE));
+      litP += sizeof (LITTLENUM_TYPE);
+    }
+  return 0;
+}
 
 /*
  * Write out big-endian.
  */
-void md_number_to_chars(buf,val,n)
-char *buf;
-long val;
-int n;
+void
+md_number_to_chars (buf, val, n)
+     char *buf;
+     valueT val;
+     int n;
 {
-       
-       switch(n) {
-               
-       case 4:
-               *buf++ = val >> 24;
-               *buf++ = val >> 16;
-       case 2:
-               *buf++ = val >> 8;
-       case 1:
-               *buf = val;
-               break;
-               
-       default:
-               as_fatal("failed sanity check.");
-       }
-       return;
-} /* md_number_to_chars() */
+
+  switch (n)
+    {
+      /* start-sanitize-v9 */
+    case 8:
+      *buf++ = val >> 56;
+      *buf++ = val >> 48;
+      *buf++ = val >> 40;
+      *buf++ = val >> 32;
+      /* end-sanitize-v9 */
+    case 4:
+      *buf++ = val >> 24;
+      *buf++ = val >> 16;
+    case 2:
+      *buf++ = val >> 8;
+    case 1:
+      *buf = val;
+      break;
+
+    default:
+      as_fatal ("failed sanity check.");
+    }
+  return;
+}                              /* md_number_to_chars() */
 
 /* Apply a fixS to the frags, now that we know the value it ought to
    hold. */
 
-void md_apply_fix(fixP, val)
-fixS *fixP;
-long val;
-{
-       char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
-       
-       assert(fixP->fx_size == 4);
-       assert(fixP->fx_r_type < NO_RELOC);
-       
-       fixP->fx_addnumber = val;       /* Remember value for emit_reloc */
-       
-       /*
-        * This is a hack.  There should be a better way to
-        * handle this.
-        */
-       if (fixP->fx_r_type == RELOC_WDISP30 && fixP->fx_addsy) {
-               val += fixP->fx_where + fixP->fx_frag->fr_address;
-       }
-       
-       switch (fixP->fx_r_type) {
-               
-       case RELOC_32:
-               buf[0] = 0; /* val >> 24; */
-               buf[1] = 0; /* val >> 16; */
-               buf[2] = 0; /* val >> 8; */
-               buf[3] = 0; /* val; */
-               break;
-               
-#if 0
-       case RELOC_8:         /* These don't seem to ever be needed. */
-       case RELOC_16:
-       case RELOC_DISP8:
-       case RELOC_DISP16:
-       case RELOC_DISP32:
+#ifdef BFD_ASSEMBLER
+int
+#else
+void
 #endif
-       case RELOC_WDISP30:
-               val = (val >>= 2) + 1;
-               buf[0] |= (val >> 24) & 0x3f;
-               buf[1]= (val >> 16);
-               buf[2] = val >> 8;
-               buf[3] = val;
-               break;
-
- /* start-sanitize-v9 */
-#ifndef NO_V9
-       case RELOC_11:
-               if (((val > 0) && (val & ~0x7ff))
-                   || ((val < 0) && (~(val - 1) & ~0x7ff))) {
-                       as_bad("relocation overflow.");
-               } /* on overflow */
-
-               buf[2] = (val >> 8) & 0x7;
-               buf[3] = val & 0xff;
-               break;
-
-       case RELOC_WDISP2_14:
-               if (((val > 0) && (val & ~0x3fffc))
-                   || ((val < 0) && (~(val - 1) & ~0x3fffc))) {
-                       as_bad("relocation overflow.");
-               } /* on overflow */
+md_apply_fix (fixP, value)
+     fixS *fixP;
+#ifdef BFD_ASSEMBLER
+     valueT *value;
+#else
+     long value;
+#endif
+{
+  char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
+  offsetT val;
 
-               val = (val >>= 2) + 1;
-               buf[1] |= ((val >> 14) & 0x3) << 3;
-               buf[2] |= (val >> 8) & 0x3f ;
-               buf[3] = val & 0xff;
-               break;
+#ifdef BFD_ASSEMBLER
+  val = *value;
+#else
+  val = value;
+#endif
 
-       case RELOC_WDISP19:
-               if (((val > 0) && (val & ~0x1ffffc))
-                   || ((val < 0) && (~(val - 1) & ~0x1ffffc))) {
-                       as_bad("relocation overflow.");
-               } /* on overflow */
+#ifdef BFD_ASSEMBLER
+  assert (fixP->fx_r_type < BFD_RELOC_UNUSED);
+#else
+  assert (fixP->fx_r_type < NO_RELOC);
+#endif
 
-               val = (val >>= 2) + 1;
-               buf[1] |= (val >> 16) & 0x7;
-               buf[2] = (val >> 8) & 0xff;
-               buf[3] = val & 0xff;
-               break;
+  fixP->fx_addnumber = val;    /* Remember value for emit_reloc */
 
-       case RELOC_HHI22:
-               val >>= 32;
- /* intentional fallthrough */
+  /*
+   * This is a hack.  There should be a better way to
+   * handle this.
+   */
+  if (fixP->fx_r_type == BFD_RELOC_32_PCREL_S2 && fixP->fx_addsy)
+    {
+      val += fixP->fx_where + fixP->fx_frag->fr_address;
+    }
+
+  switch (fixP->fx_r_type)
+    {
+
+    case BFD_RELOC_32:
+      buf[0] = 0;              /* val >> 24; */
+      buf[1] = 0;              /* val >> 16; */
+      buf[2] = 0;              /* val >> 8; */
+      buf[3] = 0;              /* val; */
+      break;
+
+    case BFD_RELOC_32_PCREL_S2:
+      val = (val >>= 2) + 1;
+      buf[0] |= (val >> 24) & 0x3f;
+      buf[1] = (val >> 16);
+      buf[2] = val >> 8;
+      buf[3] = val;
+      break;
+
+      /* start-sanitize-v9 */
+#ifndef NO_V9
+    case BFD_RELOC_SPARC_11:
+      if (((val > 0) && (val & ~0x7ff))
+         || ((val < 0) && (~(val - 1) & ~0x7ff)))
+       {
+         as_bad ("relocation overflow.");
+       }                       /* on overflow */
+
+      buf[2] |= (val >> 8) & 0x7;
+      buf[3] = val & 0xff;
+      break;
+
+    case BFD_RELOC_SPARC_10:
+      if (((val > 0) && (val & ~0x3ff))
+         || ((val < 0) && (~(val - 1) & ~0x3ff)))
+       {
+         as_bad ("relocation overflow.");
+       }                       /* on overflow */
+
+      buf[2] |= (val >> 8) & 0x3;
+      buf[3] = val & 0xff;
+      break;
+
+    case BFD_RELOC_SPARC_WDISP16:
+      if (((val > 0) && (val & ~0x3fffc))
+         || ((val < 0) && (~(val - 1) & ~0x3fffc)))
+       {
+         as_bad ("relocation overflow.");
+       }                       /* on overflow */
+
+      val = (val >>= 2) + 1;
+      buf[1] |= ((val >> 14) & 0x3) << 4;
+      buf[2] |= (val >> 8) & 0x3f;
+      buf[3] = val & 0xff;
+      break;
+
+    case BFD_RELOC_SPARC_WDISP19:
+      if (((val > 0) && (val & ~0x1ffffc))
+         || ((val < 0) && (~(val - 1) & ~0x1ffffc)))
+       {
+         as_bad ("relocation overflow.");
+       }                       /* on overflow */
+
+      val = (val >>= 2) + 1;
+      buf[1] |= (val >> 16) & 0x7;
+      buf[2] = (val >> 8) & 0xff;
+      buf[3] = val & 0xff;
+      break;
+
+    case BFD_RELOC_SPARC_HH22:
+      val >>= 32;
+      /* intentional fallthrough */
 #endif /* NO_V9 */
- /* end-sanitize-v9 */
-
-       case RELOC_HI22:
-               if(!fixP->fx_addsy) {
-                       buf[1] |= (val >> 26) & 0x3f;
-                       buf[2] = val >> 18;
-                       buf[3] = val >> 10;
-               } else {
-                       buf[2]=0;
-                       buf[3]=0;
-               }
-               break;
+      /* end-sanitize-v9 */
 
-       case RELOC_22:
-               if (val & ~0x003fffff) {
-                 as_bad("relocation overflow");
-               } /* on overflow */
-               buf[1] |= (val >> 16) & 0x3f;
-               buf[2] = val >> 8;
-               buf[3] = val & 0xff;
-               break;
-               
-       case RELOC_13:
-               if (val & ~0x00001fff) {
-                 as_bad("relocation overflow");
-               } /* on overflow */
-               buf[2] = (val >> 8) & 0x1f;
-               buf[3] = val & 0xff;
-               break;
-
- /* start-sanitize-v9 */
+      /* start-sanitize-v9 */
 #ifndef NO_V9
-       case RELOC_HLO10:
-               val >>= 32;
- /* intentional fallthrough */
-#endif /* NO_V9 */
- /* end-sanitize-v9 */
-
-       case RELOC_LO10:
-               if(!fixP->fx_addsy) {
-                       buf[2] |= (val >> 8) & 0x03;
-                       buf[3] = val;
-               } else
-                   buf[3]=0;
-               break;
-#if 0
-       case RELOC_SFA_BASE:
-       case RELOC_SFA_OFF13:
-       case RELOC_BASE10:
-#endif
-       case RELOC_BASE13:
-               buf[2] |= (val >> 8) & 0x1f;
-               buf[3] = val;
-               break;
-               
-       case RELOC_WDISP22:
-               val = (val >>= 2) + 1;
-               /* FALLTHROUGH */
-       case RELOC_BASE22:
-               buf[1] |= (val >> 16) & 0x3f;
-               buf[2] = val >> 8;
-               buf[3] = val;
-               break;
-               
-#if 0
-       case RELOC_PC10:
-       case RELOC_PC22:
-       case RELOC_JMP_TBL:
-       case RELOC_SEGOFF16:
-       case RELOC_GLOB_DAT:
-       case RELOC_JMP_SLOT:
-       case RELOC_RELATIVE:
+    case BFD_RELOC_SPARC_LM22:
 #endif
-               
-       case NO_RELOC:
-       default:
-               as_bad("bad relocation type: 0x%02x", fixP->fx_r_type);
-               break;
+      /* end-sanitize-v9 */
+    case BFD_RELOC_HI22:
+      if (!fixP->fx_addsy)
+       {
+         buf[1] |= (val >> 26) & 0x3f;
+         buf[2] = val >> 18;
+         buf[3] = val >> 10;
+       }
+      else
+       {
+         buf[2] = 0;
+         buf[3] = 0;
+       }
+      break;
+
+    case BFD_RELOC_SPARC22:
+      if (val & ~0x003fffff)
+       {
+         as_bad ("relocation overflow");
+       }                       /* on overflow */
+      buf[1] |= (val >> 16) & 0x3f;
+      buf[2] = val >> 8;
+      buf[3] = val & 0xff;
+      break;
+
+    case BFD_RELOC_SPARC13:
+      if (val & ~0x00001fff)
+       {
+         as_bad ("relocation overflow");
+       }                       /* on overflow */
+      buf[2] |= (val >> 8) & 0x1f;
+      buf[3] = val & 0xff;
+      break;
+
+      /* start-sanitize-v9 */
+#ifndef NO_V9
+    case BFD_RELOC_SPARC_HM10:
+      val >>= 32;
+      /* intentional fallthrough */
+#endif /* NO_V9 */
+      /* end-sanitize-v9 */
+
+    case BFD_RELOC_LO10:
+      if (!fixP->fx_addsy)
+       {
+         buf[2] |= (val >> 8) & 0x03;
+         buf[3] = val;
+       }
+      else
+       buf[3] = 0;
+      break;
+    case BFD_RELOC_SPARC_BASE13:
+      if (((val > 0) && (val & ~(offsetT)0x00001fff))
+         || ((val < 0) && (~(val - 1) & ~(offsetT)0x00001fff)))
+       {
+         as_bad ("relocation overflow");
        }
-} /* md_apply_fix() */
+      buf[2] |= (val >> 8) & 0x1f;
+      buf[3] = val;
+      break;
+
+    case BFD_RELOC_SPARC_WDISP22:
+      val = (val >>= 2) + 1;
+      /* FALLTHROUGH */
+    case BFD_RELOC_SPARC_BASE22:
+      buf[1] |= (val >> 16) & 0x3f;
+      buf[2] = val >> 8;
+      buf[3] = val;
+      break;
+
+    case BFD_RELOC_NONE:
+    default:
+      as_bad ("bad or unhandled relocation type: 0x%02x", fixP->fx_r_type);
+      break;
+    }
+
+#ifdef BFD_ASSEMBLER
+  return 1;
+#endif
+}
 
 /* should never be called for sparc */
-void md_create_short_jump(ptr, from_addr, to_addr, frag, to_symbol)
-char *ptr;
-long from_addr;
-long to_addr;
-fragS *frag;
-symbolS *to_symbol;
+void
+md_create_short_jump (ptr, from_addr, to_addr, frag, to_symbol)
+     char *ptr;
+     addressT from_addr;
+     addressT to_addr;
+     fragS *frag;
+     symbolS *to_symbol;
 {
-       as_fatal("sparc_create_short_jmp\n");
-} /* md_create_short_jump() */
+  as_fatal ("sparc_create_short_jmp\n");
+}
+
+#ifdef BFD_ASSEMBLER
+
+/* Translate internal representation of relocation info to BFD target
+   format.  */
+arelent *
+tc_gen_reloc (section, fixp)
+     asection *section;
+     fixS *fixp;
+{
+  arelent *reloc;
+  bfd_reloc_code_real_type code;
+
+  reloc = (arelent *) bfd_alloc_by_size_t (stdoutput, sizeof (arelent));
+  assert (reloc != 0);
+
+  reloc->sym_ptr_ptr = &fixp->fx_addsy->bsym;
+  reloc->address = fixp->fx_frag->fr_address + fixp->fx_where;
+  if (fixp->fx_pcrel == 0)
+    reloc->addend = fixp->fx_addnumber;
+  else
+    switch (OUTPUT_FLAVOR)
+      {
+      case bfd_target_elf_flavour:
+       reloc->addend = 0;
+       break;
+      case bfd_target_aout_flavour:
+       reloc->addend = - reloc->address;
+       break;
+      default:
+       /* What's a good default here?  Is there any??  */
+       abort ();
+      }
+
+  switch (fixp->fx_r_type)
+    {
+    case BFD_RELOC_32:
+    case BFD_RELOC_HI22:
+    case BFD_RELOC_LO10:
+    case BFD_RELOC_32_PCREL_S2:
+    case BFD_RELOC_SPARC_BASE13:
+    case BFD_RELOC_SPARC_WDISP22:
+      /* start-sanitize-v9 */
+    case BFD_RELOC_SPARC_10:
+    case BFD_RELOC_SPARC_11:
+    case BFD_RELOC_SPARC_HH22:
+    case BFD_RELOC_SPARC_HM10:
+    case BFD_RELOC_SPARC_LM22:
+    case BFD_RELOC_SPARC_PC_HH22:
+    case BFD_RELOC_SPARC_PC_HM10:
+    case BFD_RELOC_SPARC_PC_LM22:
+      /* end-sanitize-v9 */
+      code = fixp->fx_r_type;
+      break;
+    default:
+      abort ();
+    }
+  reloc->howto = bfd_reloc_type_lookup (stdoutput, code);
+  assert (reloc->howto != 0);
+
+  return reloc;
+}
+
+#else
 
 /* Translate internal representation of relocation info to target format.
-   
+
    On sparc: first 4 bytes are normal unsigned long address, next three
    bytes are index, most sig. byte first.  Byte 7 is broken up with
    bit 7 as external, bits 6 & 5 unused, and the lower
    five bits as relocation type.  Next 4 bytes are long addend. */
 /* Thanx and a tip of the hat to Michael Bloom, mb@ttidca.tti.com */
-void tc_aout_fix_to_chars(where, fixP, segment_address_in_file)
-char *where;
-fixS *fixP;
-relax_addressT segment_address_in_file;
-{
-       long r_index;
-       long r_extern;
-       long r_addend;
-       long r_address;
-
-       know(fixP->fx_addsy);
-
-       if ((S_GET_TYPE(fixP->fx_addsy)) == N_UNDF) {
-               r_extern = 1;
-               r_index = fixP->fx_addsy->sy_number;
-       } else {
-               r_extern = 0;
-               r_index = S_GET_TYPE(fixP->fx_addsy);
-       }
-                       
-       /* this is easy */
-       md_number_to_chars(where,
-                          r_address = fixP->fx_frag->fr_address + fixP->fx_where - segment_address_in_file,
-                          4);
-
-       /* now the fun stuff */
-       where[4] = (r_index >> 16) & 0x0ff;
-       where[5] = (r_index >> 8) & 0x0ff;
-       where[6] = r_index & 0x0ff;
-       where[7] = ((r_extern << 7)  & 0x80) | (0 & 0x60) | (fixP->fx_r_type & 0x1F);
-
-       /* Also easy */
-       if (fixP->fx_addsy->sy_frag) {
-               r_addend = fixP->fx_addsy->sy_frag->fr_address;
-       }
-       
-       if (fixP->fx_pcrel) {
-               r_addend -= r_address;
-       } else {
-               r_addend = fixP->fx_addnumber;
-       }
-       
-       md_number_to_chars(&where[8], r_addend, 4);
-
-       return;
-} /* tc_aout_fix_to_chars() */
-
-/* should never be called for sparc */
-void md_convert_frag(headers, fragP)
-object_headers *headers;
-register fragS *fragP;
+void
+tc_aout_fix_to_chars (where, fixP, segment_address_in_file)
+     char *where;
+     fixS *fixP;
+     relax_addressT segment_address_in_file;
 {
-       as_fatal("sparc_convert_frag\n");
-} /* md_convert_frag() */
+  long r_index;
+  long r_extern;
+  long r_addend = 0;
+  long r_address;
+
+  know (fixP->fx_addsy);
+
+  if (!S_IS_DEFINED (fixP->fx_addsy))
+    {
+      r_extern = 1;
+      r_index = fixP->fx_addsy->sy_number;
+    }
+  else
+    {
+      r_extern = 0;
+      r_index = S_GET_TYPE (fixP->fx_addsy);
+    }
+
+  /* this is easy */
+  md_number_to_chars (where,
+                     r_address = fixP->fx_frag->fr_address + fixP->fx_where - segment_address_in_file,
+                     4);
+
+  /* now the fun stuff */
+  where[4] = (r_index >> 16) & 0x0ff;
+  where[5] = (r_index >> 8) & 0x0ff;
+  where[6] = r_index & 0x0ff;
+  where[7] = ((r_extern << 7) & 0x80) | (0 & 0x60) | (fixP->fx_r_type & 0x1F);
+
+  /* Also easy */
+  if (fixP->fx_addsy->sy_frag)
+    {
+      r_addend = fixP->fx_addsy->sy_frag->fr_address;
+    }
+
+  if (fixP->fx_pcrel)
+    {
+      r_addend += fixP->fx_offset - r_address;
+    }
+  else
+    {
+      r_addend = fixP->fx_addnumber;
+    }
+
+  md_number_to_chars (&where[8], r_addend, 4);
+
+  return;
+}                              /* tc_aout_fix_to_chars() */
+#endif
 
 /* should never be called for sparc */
-void md_create_long_jump(ptr, from_addr, to_addr, frag, to_symbol)
-char *ptr;
-long from_addr, to_addr;
-fragS  *frag;
-symbolS        *to_symbol;
+void
+md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
+     char *ptr;
+     addressT from_addr, to_addr;
+     fragS *frag;
+     symbolS *to_symbol;
 {
-       as_fatal("sparc_create_long_jump\n");
-} /* md_create_long_jump() */
+  as_fatal ("sparc_create_long_jump\n");
+}                              /* md_create_long_jump() */
 
 /* should never be called for sparc */
-int md_estimate_size_before_relax(fragP, segtype)
-fragS *fragP;
-segT segtype;
+int
+md_estimate_size_before_relax (fragP, segtype)
+     fragS *fragP;
+     segT segtype;
 {
-       as_fatal("sparc_estimate_size_before_relax\n");
-       return(1);
-} /* md_estimate_size_before_relax() */
+  as_fatal ("sparc_estimate_size_before_relax\n");
+  return (1);
+}                              /* md_estimate_size_before_relax() */
 
 #if 0
 /* for debugging only */
-static void print_insn(insn)
-struct sparc_it *insn;
+static void
+print_insn (insn)
+     struct sparc_it *insn;
 {
-       char *Reloc[] = {
-               "RELOC_8",
-               "RELOC_16",
-               "RELOC_32",
-               "RELOC_DISP8",
-               "RELOC_DISP16",
-               "RELOC_DISP32",
-               "RELOC_WDISP30",
-               "RELOC_WDISP22",
-               "RELOC_HI22",
-               "RELOC_22",
-               "RELOC_13",
-               "RELOC_LO10",
-               "RELOC_SFA_BASE",
-               "RELOC_SFA_OFF13",
-               "RELOC_BASE10",
-               "RELOC_BASE13",
-               "RELOC_BASE22",
-               "RELOC_PC10",
-               "RELOC_PC22",
-               "RELOC_JMP_TBL",
-               "RELOC_SEGOFF16",
-               "RELOC_GLOB_DAT",
-               "RELOC_JMP_SLOT",
-               "RELOC_RELATIVE",
-               "NO_RELOC"
-           };
-       
-       if (insn->error) {
-               fprintf(stderr, "ERROR: %s\n");
-       }
-       fprintf(stderr, "opcode=0x%08x\n", insn->opcode);
-       fprintf(stderr, "reloc = %s\n", Reloc[insn->reloc]);
-       fprintf(stderr, "exp = {
-\n");
-       fprintf(stderr, "\t\tX_add_symbol = %s\n",
-               ((insn->exp.X_add_symbol != NULL)
-                ? ((S_GET_NAME(insn->exp.X_add_symbol) != NULL)
-                   ? S_GET_NAME(insn->exp.X_add_symbol)
-                   : "???")
-                : "0"));
-       fprintf(stderr, "\t\tX_sub_symbol = %s\n",
-               ((insn->exp.X_subtract_symbol != NULL)
-                ? (S_GET_NAME(insn->exp.X_subtract_symbol)
-                   ? S_GET_NAME(insn->exp.X_subtract_symbol)
-                   : "???")
-                : "0"));
-       fprintf(stderr, "\t\tX_add_number = %d\n",
-               insn->exp.X_add_number);
-       fprintf(stderr, "}\n");
-       return;
-} /* print_insn() */
-#endif
-
-/* Set the hook... */
-
-/* void emit_sparc_reloc();
-void (*md_emit_relocations)() = emit_sparc_reloc; */
+  char *Reloc[] =
+  {
+    "RELOC_8",
+    "RELOC_16",
+    "RELOC_32",
+    "RELOC_DISP8",
+    "RELOC_DISP16",
+    "RELOC_DISP32",
+    "RELOC_WDISP30",
+    "RELOC_WDISP22",
+    "RELOC_HI22",
+    "RELOC_22",
+    "RELOC_13",
+    "RELOC_LO10",
+    "RELOC_SFA_BASE",
+    "RELOC_SFA_OFF13",
+    "RELOC_BASE10",
+    "RELOC_BASE13",
+    "RELOC_BASE22",
+    "RELOC_PC10",
+    "RELOC_PC22",
+    "RELOC_JMP_TBL",
+    "RELOC_SEGOFF16",
+    "RELOC_GLOB_DAT",
+    "RELOC_JMP_SLOT",
+    "RELOC_RELATIVE",
+    "NO_RELOC"
+  };
+
+  if (insn->error)
+    {
+      fprintf (stderr, "ERROR: %s\n");
+    }
+  fprintf (stderr, "opcode=0x%08x\n", insn->opcode);
+  fprintf (stderr, "reloc = %s\n", Reloc[insn->reloc]);
+  fprintf (stderr, "exp = {\n");
+  fprintf (stderr, "\t\tX_add_symbol = %s\n",
+          ((insn->exp.X_add_symbol != NULL)
+           ? ((S_GET_NAME (insn->exp.X_add_symbol) != NULL)
+              ? S_GET_NAME (insn->exp.X_add_symbol)
+              : "???")
+           : "0"));
+  fprintf (stderr, "\t\tX_sub_symbol = %s\n",
+          ((insn->exp.X_op_symbol != NULL)
+           ? (S_GET_NAME (insn->exp.X_op_symbol)
+              ? S_GET_NAME (insn->exp.X_op_symbol)
+              : "???")
+           : "0"));
+  fprintf (stderr, "\t\tX_add_number = %d\n",
+          insn->exp.X_add_number);
+  fprintf (stderr, "}\n");
+  return;
+}                              /* print_insn() */
 
-#ifdef comment
-
-/*
- * Sparc/AM29K relocations are completely different, so it needs
- * this machine dependent routine to emit them.
- */
-#if defined(OBJ_AOUT) || defined(OBJ_BOUT)
-void emit_sparc_reloc(fixP, segment_address_in_file)
-register fixS *fixP;
-relax_addressT segment_address_in_file;
-{
-       struct reloc_info_generic ri;
-       register symbolS *symbolP;
-       extern char *next_object_file_charP;
-       /*    long add_number; */
-       
-       bzero((char *) &ri, sizeof(ri));
-       for (; fixP; fixP = fixP->fx_next) {
-               
-               if (fixP->fx_r_type >= NO_RELOC) {
-                       as_fatal("fixP->fx_r_type = %d\n", fixP->fx_r_type);
-               }
-               
-               if ((symbolP = fixP->fx_addsy) != NULL) {
-                       ri.r_address = fixP->fx_frag->fr_address +
-                           fixP->fx_where - segment_address_in_file;
-                       if ((S_GET_TYPE(symbolP)) == N_UNDF) {
-                               ri.r_extern = 1;
-                               ri.r_index = symbolP->sy_number;
-                       } else {
-                               ri.r_extern = 0;
-                               ri.r_index = S_GET_TYPE(symbolP);
-                       }
-                       if (symbolP && symbolP->sy_frag) {
-                               ri.r_addend = symbolP->sy_frag->fr_address;
-                       }
-                       ri.r_type = fixP->fx_r_type;
-                       if (fixP->fx_pcrel) {
-                               /*              ri.r_addend -= fixP->fx_where; */
-                               ri.r_addend -= ri.r_address;
-                       } else {
-                               ri.r_addend = fixP->fx_addnumber;
-                       }
-                       
-                       md_ri_to_chars(next_object_file_charP, &ri);
-                       next_object_file_charP += md_reloc_size;
-               }
-       }
-       return;
-} /* emit_sparc_reloc() */
-#endif /* aout or bout */
-#endif /* comment */
+#endif
 
 /*
  * md_parse_option
@@ -1688,7 +2336,7 @@ relax_addressT segment_address_in_file;
  *     -bump
  *             Warn on architecture bumps.  See also -A.
  *
- *     -Av6, -Av7, -Acypress, -Av8
+ *     -Av6, -Av7, -Av8, -Asparclite
  *             Select the architecture.  Instructions or features not
  *             supported by the selected architecture cause fatal errors.
  *
@@ -1700,105 +2348,133 @@ relax_addressT segment_address_in_file;
  *
  *             If an architecture is specified, all instructions must match
  *             that architecture.  Any higher level instructions are flagged
- *             as errors. 
+ *             as errors.
  *
  *             if both an architecture and -bump are specified, the
  *             architecture starts at the specified level, but bumps are
  *             warnings.
  *
- *             Note that where cypress specific instructions conflict with
- *             other instructions, the other instruction is assumed.  Nothing
- *             is upward compatible with cypress.  Thus, to get the cypress
- *             instruction set you MUST -Acypress.
+ * start-sanitize-v9
+ *     -Av9
+ *             Another architecture switch.
  *
+ * Note:
+ *             Bumping between incompatible architectures is always an
+ *             error.  For example, from sparclite to v9.
+ * end-sanitize-v9
  */
- /* start-sanitize-v9 */
- /* There is also a -Av9 architecture option.  xoxorich. */
- /* end-sanitize-v9 */
-int md_parse_option(argP, cntP, vecP)
-char **argP;
-int *cntP;
-char ***vecP;
+
+int 
+md_parse_option (argP, cntP, vecP)
+     char **argP;
+     int *cntP;
+     char ***vecP;
 {
-       char *p;
-       const char **arch;
-       
-       if (!strcmp(*argP,"bump")){
-               warn_on_bump = 1;
-               
-       } else if (**argP == 'A'){
-               p = (*argP) + 1;
-               
-               for (arch = architecture_pname; *arch != NULL; ++arch){
-                       if (strcmp(p, *arch) == 0){
-                               break;
-                       } /* found a match */
-               } /* walk the pname table */
-               
-               if (*arch == NULL){
-                       as_bad("unknown architecture: %s", p);
-               } else {
-                       current_architecture = (enum sparc_architecture) (arch - architecture_pname);
-                       architecture_requested = 1;
-               }
-       } else {
-               /* Unknown option */
-               (*argP)++;
-               return 0;
+  char *p;
+  const char **arch;
+
+  if (!strcmp (*argP, "bump"))
+    {
+      warn_on_bump = 1;
+
+    }
+  else if (**argP == 'A')
+    {
+      p = (*argP) + 1;
+
+      for (arch = architecture_pname; *arch != NULL; ++arch)
+       {
+         if (strcmp (p, *arch) == 0)
+           {
+             break;
+           }                   /* found a match */
+       }                       /* walk the pname table */
+
+      if (*arch == NULL)
+       {
+         as_bad ("unknown architecture: %s", p);
+       }
+      else
+       {
+         current_architecture = (enum sparc_architecture) (arch - architecture_pname);
+         architecture_requested = 1;
        }
-       **argP = '\0';  /* Done parsing this switch */
-       return 1;
-} /* md_parse_option() */
+    }
+#ifdef OBJ_ELF
+  else if (**argP == 'V')
+    {
+      extern void print_version_id ();
+      print_version_id ();
+    }
+  else if (**argP == 'Q')
+    {
+      /* Qy - do emit .comment
+        Qn - do not emit .comment */
+    }
+  else if (**argP == 's')
+    {
+      /* use .stab instead of .stab.excl */
+    }
+#endif
+  else
+    {
+      /* Unknown option */
+      (*argP)++;
+      return 0;
+    }
+  **argP = '\0';               /* Done parsing this switch */
+  return 1;
+}                              /* md_parse_option() */
 
 /* We have no need to default values of symbols. */
 
 /* ARGSUSED */
-symbolS *md_undefined_symbol(name)
-char *name;
+symbolS *
+md_undefined_symbol (name)
+     char *name;
 {
-       return 0;
-} /* md_undefined_symbol() */
+  return 0;
+}                              /* md_undefined_symbol() */
 
 /* Parse an operand that is machine-specific.
    We just return without modifying the expression if we have nothing
    to do. */
 
 /* ARGSUSED */
-void md_operand(expressionP)
-expressionS *expressionP;
+void 
+md_operand (expressionP)
+     expressionS *expressionP;
 {
-} /* md_operand() */
+}
 
 /* Round up a section size to the appropriate boundary. */
-long md_section_align (segment, size)
-segT segment;
-long size;
+valueT
+md_section_align (segment, size)
+     segT segment;
+     valueT size;
 {
-       return (size + 7) & ~7; /* Round all sects to multiple of 8 */
-} /* md_section_align() */
+  /* Round all sects to multiple of 8 */
+  return (size + 7) & ~7;
+}
 
 /* Exactly what point is a PC-relative offset relative TO?
    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 md_pcrel_from(fixP)
-fixS *fixP;
+long 
+md_pcrel_from (fixP)
+     fixS *fixP;
 {
-       return fixP->fx_size + fixP->fx_where + fixP->fx_frag->fr_address;
-} /* md_pcrel_from() */
+  return fixP->fx_size + fixP->fx_where + fixP->fx_frag->fr_address;
+}
 
-void tc_aout_pre_write_hook(headers)
-object_headers *headers;
+#ifndef BFD_ASSEMBLER
+void 
+tc_aout_pre_write_hook (headers)
+     object_headers *headers;
 {
-       H_SET_VERSION(headers, 1);
-       return;
-} /* tc_aout_pre_write_hook() */
-
-/*
- * Local Variables:
- * comment-column: 0
- * fill-column: 131
- * End:
- */
+  H_SET_VERSION (headers, 1);
+}
+#endif
 
-/* end of tp-sparc.c */
+/* end of tc-sparc.c */
This page took 0.06927 seconds and 4 git commands to generate.