X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Flisting.c;h=359dc090dc0df6115bfebae0b63eb6a1827aca03;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=24450cfe1e34e86360a211b913cd1d7ee5f48dac;hpb=4b95cf5c0c75d6efc1b2f96af72317aecca079f1;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/listing.c b/gas/listing.c index 24450cfe1e..359dc090dc 100644 --- a/gas/listing.c +++ b/gas/listing.c @@ -1,5 +1,5 @@ /* listing.c - maintain assembly listings - Copyright (C) 1991-2014 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 @@ -89,7 +89,6 @@ #include "as.h" #include "filenames.h" -#include "obstack.h" #include "safe-ctype.h" #include "input-file.h" #include "subsegs.h" @@ -224,7 +223,8 @@ static file_info_type *file_info (const char *); static void new_frag (void); static void listing_page (list_info_type *); static unsigned int calc_hex (list_info_type *); -static void print_lines (list_info_type *, unsigned int, char *, unsigned int); +static void print_lines (list_info_type *, unsigned int, const char *, + unsigned int); static void list_symbol_table (void); static int debugging_pseudo (list_info_type *, const char *); static void listing_listing (char *); @@ -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; @@ -253,13 +250,13 @@ listing_message (const char *name, const char *message) void listing_warning (const char *message) { - listing_message (_("Warning:"), message); + listing_message (_("Warning: "), message); } void listing_error (const char *message) { - listing_message (_("Error:"), message); + listing_message (_("Error: "), message); } static file_info_type * @@ -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); @@ -297,10 +294,10 @@ new_frag (void) void listing_newline (char *ps) { - char *file; + const char *file; unsigned int line; static unsigned int last_line = 0xffff; - static char *last_file = NULL; + static const char *last_file = NULL; list_info_type *new_i = NULL; if (listing == 0) @@ -327,14 +324,20 @@ listing_newline (char *ps) } #endif - as_where (&file, &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 && !(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 +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); + 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 +396,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; } @@ -473,7 +473,7 @@ listing_prev_line (void) truncated to size. It appends a fake line to the end of each input file to make using the returned buffer simpler. */ -static char * +static const char * buffer_line (file_info_type *file, char *line, unsigned int size) { unsigned int count = 0; @@ -551,10 +551,9 @@ buffer_line (file_info_type *file, char *line, unsigned int size) /* This function rewinds the requested file back to the line requested, reads it in again into the buffer provided and then restores the file - back to its original location. Returns the buffer pointer upon success - or an empty string if an error occurs. */ + back to its original location. */ -static char * +static void rebuffer_line (file_info_type * file, unsigned int linenum, char * buffer, @@ -570,7 +569,7 @@ rebuffer_line (file_info_type * file, /* Sanity checks. */ if (file == NULL || buffer == NULL || size <= 1 || file->linenum <= linenum) - return ""; + return; /* Check the cache and see if we last used this file. */ if (last_open_file_info == NULL || file != last_open_file_info) @@ -588,7 +587,7 @@ rebuffer_line (file_info_type * file, if (last_open_file == NULL) { file->at_end = 1; - return ""; + return; } /* Seek to where we were last time this file was open. */ @@ -599,7 +598,7 @@ rebuffer_line (file_info_type * file, /* Remember where we are in the current file. */ pos2 = pos = ftell (last_open_file); if (pos < 3) - return ""; + return; current_line = file->linenum; /* Leave room for the nul at the end of the buffer. */ @@ -624,7 +623,7 @@ rebuffer_line (file_info_type * file, if (fread (buffer, 1, size, last_open_file) != size) { as_warn (_("unable to rebuffer file: %s\n"), file->filename); - return ""; + return; } for (ptr = buffer + size; ptr >= buffer; -- ptr) @@ -691,17 +690,14 @@ rebuffer_line (file_info_type * file, /* Reset the file position. */ fseek (last_open_file, pos, SEEK_SET); - - return buffer; } static const char *fn; - -static unsigned int eject; /* Eject pending */ -static unsigned int page; /* Current page number */ -static char *title; /* Current title */ -static char *subtitle; /* Current subtitle */ -static unsigned int on_page; /* Number of lines printed on current page */ +static unsigned int eject; /* Eject pending. */ +static unsigned int page; /* Current page number. */ +static const char *title; /* Current title. */ +static const char *subtitle; /* Current subtitle. */ +static unsigned int on_page; /* Number of lines printed on current page. */ static void listing_page (list_info_type *list) @@ -787,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) @@ -805,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) @@ -820,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; } } @@ -833,7 +829,7 @@ calc_hex (list_info_type *list) static void print_lines (list_info_type *list, unsigned int lineno, - char *string, unsigned int address) + const char *string, unsigned int address) { unsigned int idx; unsigned int nchars; @@ -1096,7 +1092,7 @@ print_source (file_info_type * current_file, while (current_file->linenum < list->hll_line && !current_file->at_end) { - char *p; + const char *p; cache = cached_lines + next_free_line; cache->file = current_file; @@ -1203,12 +1199,12 @@ listing_listing (char *name ATTRIBUTE_UNUSED) list_info_type *list = head; file_info_type *current_hll_file = (file_info_type *) NULL; char *buffer; - char *p; + const char *p; 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; @@ -1559,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; }