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

[deliverable/binutils-gdb.git] / gas / listing.c

diff --git a/gas/listing.c b/gas/listing.c
index e5fb3a0a9dd4c5405cdf439642b728da1e4ce2fa..c6ec7f3542d484f34206067a9fdf7406014537c9 100644 (file)
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -347,7 +347,7 @@ listing_newline (char *ps)
       if (strcmp (file, _("{standard input}")) == 0
          && input_line_pointer != NULL)
        {
-         char *copy;
+         char *copy, *src, *dest;
          int len;
          int seen_quote = 0;
          int seen_slash = 0;
@@ -367,25 +367,22 @@ listing_newline (char *ps)
 
          len = copy - input_line_pointer + 1;
 
-         copy = (char *) xmalloc (len);
+         copy = XNEWVEC (char, len);
 
-         if (copy != NULL)
-           {
-             char *src = input_line_pointer;
-             char *dest = copy;
-
-             while (--len)
-               {
-                 unsigned char c = *src++;
+         src = input_line_pointer;
+         dest = copy;
 
-                 /* Omit control characters in the listing.  */
-                 if (!ISCNTRL (c))
-                   *dest++ = c;
-               }
+         while (--len)
+           {
+             unsigned char c = *src++;
 
-             *dest = 0;
+             /* Omit control characters in the listing.  */
+             if (!ISCNTRL (c))
+               *dest++ = c;
            }
 
+         *dest = 0;
+
          new_i->line_contents = copy;
        }
       else
@@ -1200,8 +1197,8 @@ listing_listing (char *name ATTRIBUTE_UNUSED)
   int show_listing = 1;
   unsigned int width;
 
-  buffer = (char *) xmalloc (listing_rhs_width);
-  data_buffer = (char *) xmalloc (MAX_BYTES);
+  buffer = XNEWVEC (char, listing_rhs_width);
+  data_buffer = XNEWVEC (char, MAX_BYTES);
   eject = 1;
   list = head->next;