* config/tc-sparc.c (sparc_ip): Clean up ASI support.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 989f601b1cff29f05b387d66aaaece38b8c1059f..f8b7c10ea7cb98d12f4eb384d54f4438c328bb36 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+Tue Aug 29 15:45:37 1995  Doug Evans  <dje@canuck.cygnus.com>
+
+       * config/tc-sparc.c (sparc_ip): Clean up ASI support.
+
 Tue Aug 29 13:20:27 1995  steve chamberlain  <sac@slash.cygnus.com>
 
        * read.c (potable): Rva is new entry.

diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index 522d928a61052ed143efd4751ff3cb10ce1c2b78..2ed4267f85d8993e85f8e07cebbe76e52786178b 100644 (file)
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -1548,24 +1548,20 @@ sparc_ip (str)
                /* 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
+                   char c, *p;
+
+                   for (p = s + 1; isalpha (*p) || *p == '_'; ++p)
+                     continue;
+                   c = *p;
+                   *p = 0;
+                   asi = sparc_encode_asi (s);
+                   *p = c;
+                   if (asi == -1)
                      {
                        error_message = ": invalid asi name";
                        goto error;
                      }
+                   s = p;
                  }
                else
                  {