[AArch64][SVE 26/32] Add SVE MUL VL addressing modes

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

diff --git a/gas/listing.c b/gas/listing.c
index 4b5fd34cf8c41216f49de0f1121766342925b910..c6ec7f3542d484f34206067a9fdf7406014537c9 100644 (file)
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -234,11 +234,8 @@ listing_message (const char *name, const char *message)
 {
   if (listing_tail != (list_info_type *) NULL)
     {
-      unsigned int l = strlen (name) + strlen (message) + 1;
-      char *n = (char *) xmalloc (l);
-      struct list_message *lm = xmalloc (sizeof *lm);
-      strcpy (n, name);
-      strcat (n, message);
+      char *n = concat (name, message, (char *) NULL);
+      struct list_message *lm = XNEW (struct list_message);
       lm->message = n;
       lm->next = NULL;
 
@@ -276,7 +273,7 @@ file_info (const char *file_name)
     }
 
   /* Make new entry.  */
-  p = (file_info_type *) xmalloc (sizeof (file_info_type));
+  p = XNEW (file_info_type);
   p->next = file_info_head;
   file_info_head = p;
   p->filename = xstrdup (file_name);
@@ -334,7 +331,7 @@ listing_newline (char *ps)
          && !(last_file && file && filename_cmp (file, last_file)))
        return;
 
-      new_i = (list_info_type *) xmalloc (sizeof (list_info_type));
+      new_i = XNEW (list_info_type);
 
       /* Detect if we are reading from stdin by examining the file
         name returned by as_where().
@@ -350,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;
@@ -370,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
@@ -396,7 +390,7 @@ listing_newline (char *ps)
     }
   else
     {
-      new_i = (list_info_type *) xmalloc (sizeof (list_info_type));
+      new_i = XNEW (list_info_type);
       new_i->line_contents = ps;
     }
 
@@ -1203,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;
 
@@ -1555,9 +1549,7 @@ listing_title (int depth)
          if (listing)
            {
              length = input_line_pointer - start;
-             ttl = (char *) xmalloc (length + 1);
-             memcpy (ttl, start, length);
-             ttl[length] = 0;
+             ttl = xmemdup0 (start, length);
              listing_tail->edict = depth ? EDICT_SBTTL : EDICT_TITLE;
              listing_tail->edict_arg = ttl;
            }