Tweak handling of remote errors in response to resumption packet

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

diff --git a/gas/listing.c b/gas/listing.c
index c90c575a5aff3aec6c8d136b43897ba25367c23c..359dc090dc0df6115bfebae0b63eb6a1827aca03 100644 (file)
--- a/gas/listing.c
+++ b/gas/listing.c
@@ -1,5 +1,5 @@
 /* listing.c - maintain assembly listings
-   Copyright (C) 1991-2016 Free Software Foundation, Inc.
+   Copyright (C) 1991-2020 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -41,7 +41,7 @@
   will affect the page they are on, as well as any subsequent page
 
  .eject
-       Thow a page
+       Throw a page
  .list
        Increment the enable listing counter
  .nolist
@@ -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);
+      char *n = concat (name, message, (char *) NULL);
       struct list_message *lm = XNEW (struct list_message);
-      strcpy (n, name);
-      strcat (n, message);
       lm->message = n;
       lm->next = NULL;
 
@@ -327,7 +324,13 @@ listing_newline (char *ps)
     }
 #endif
 
-  file = as_where (&line);
+  /* PR 21977 - use the physical file name not the logical one unless high
+     level source files are being included in the listing.  */
+  if (listing & LISTING_HLL)
+    file = as_where (&line);
+  else
+    file = as_where_physical (&line);
+
   if (ps == NULL)
     {
       if (line == last_line
@@ -350,7 +353,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 +373,22 @@ listing_newline (char *ps)
 
          len = copy - input_line_pointer + 1;
 
-         copy = (char *) xmalloc (len);
-
-         if (copy != NULL)
-           {
-             char *src = input_line_pointer;
-             char *dest = copy;
+         copy = XNEWVEC (char, len);
 
-             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
@@ -783,7 +783,7 @@ calc_hex (list_info_type *list)
     {
       /* Print as many bytes from the fixed part as is sensible.  */
       octet_in_frag = 0;
-      while ((offsetT) octet_in_frag < frag_ptr->fr_fix
+      while (octet_in_frag < frag_ptr->fr_fix
             && data_buffer_size < MAX_BYTES - 3)
        {
          if (address == ~(unsigned int) 0)
@@ -801,8 +801,8 @@ calc_hex (list_info_type *list)
          unsigned int var_rep_idx = octet_in_frag;
 
          /* Print as many bytes from the variable part as is sensible.  */
-         while (((offsetT) octet_in_frag
-                 < (frag_ptr->fr_fix + frag_ptr->fr_var * frag_ptr->fr_offset))
+         while ((octet_in_frag
+                 < frag_ptr->fr_fix + frag_ptr->fr_var * frag_ptr->fr_offset)
                 && data_buffer_size < MAX_BYTES - 3)
            {
              if (address == ~(unsigned int) 0)
@@ -816,7 +816,7 @@ calc_hex (list_info_type *list)
              var_rep_idx++;
              octet_in_frag++;
 
-             if ((offsetT) var_rep_idx >= frag_ptr->fr_fix + frag_ptr->fr_var)
+             if (var_rep_idx >= frag_ptr->fr_fix + frag_ptr->fr_var)
                var_rep_idx = var_rep_max;
            }
        }
@@ -1203,8 +1203,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 +1555,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;
            }