X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Flisting.c;h=359dc090dc0df6115bfebae0b63eb6a1827aca03;hb=0e1d094e96739f71f5041731a1769021421a71ca;hp=bc6af712a0e798baa350fdf0988da36d6f1c6fa4;hpb=87975d2a60adf249212c1c031abb4dd0dbb800ac;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/listing.c b/gas/listing.c index bc6af712a0..359dc090dc 100644 --- a/gas/listing.c +++ b/gas/listing.c @@ -1,7 +1,5 @@ /* listing.c - maintain assembly listings - Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 - Free Software Foundation, Inc. + Copyright (C) 1991-2020 Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -43,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 @@ -90,7 +88,7 @@ on a line. */ #include "as.h" -#include "obstack.h" +#include "filenames.h" #include "safe-ctype.h" #include "input-file.h" #include "subsegs.h" @@ -142,6 +140,12 @@ enum edict_enum }; +struct list_message +{ + char *message; + struct list_message *next; +}; + /* This structure remembers which line from which file goes into which frag. */ struct list_info_struct @@ -169,8 +173,8 @@ struct list_info_struct /* High level language source line. */ unsigned int hll_line; - /* Pointer to any error message associated with this line. */ - char *message; + /* Pointers to linked list of messages associated with this line. */ + struct list_message *messages, *last_message; enum edict_enum edict; char *edict_arg; @@ -219,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 *); @@ -229,24 +234,29 @@ 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); - strcpy (n, name); - strcat (n, message); - listing_tail->message = n; + char *n = concat (name, message, (char *) NULL); + struct list_message *lm = XNEW (struct list_message); + lm->message = n; + lm->next = NULL; + + if (listing_tail->last_message) + listing_tail->last_message->next = lm; + else + listing_tail->messages = lm; + listing_tail->last_message = lm; } } 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 * @@ -257,13 +267,13 @@ file_info (const char *file_name) while (p != (file_info_type *) NULL) { - if (strcmp (p->filename, file_name) == 0) + if (filename_cmp (p->filename, file_name) == 0) return p; p = p->next; } /* 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); @@ -284,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) @@ -314,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 && strcmp (file, last_file))) + && !(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(). @@ -337,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; @@ -357,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 @@ -383,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; } @@ -403,7 +416,8 @@ listing_newline (char *ps) new_i->line = line; new_i->file = file_info (file); new_i->next = (list_info_type *) NULL; - new_i->message = (char *) NULL; + new_i->messages = NULL; + new_i->last_message = NULL; new_i->edict = EDICT_NONE; new_i->hll_file = (file_info_type *) NULL; new_i->hll_line = 0; @@ -459,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; @@ -539,21 +553,23 @@ buffer_line (file_info_type *file, char *line, unsigned int size) reads it in again into the buffer provided and then restores the file back to its original location. */ -static char * +static void rebuffer_line (file_info_type * file, unsigned int linenum, char * buffer, unsigned int size) { unsigned int count = 0; - unsigned int current_line = 1; + unsigned int current_line; char * p = buffer; long pos; + long pos2; int c; + bfd_boolean found = FALSE; /* Sanity checks. */ - if (file == NULL || buffer == NULL || size == 0 || file->linenum <= linenum) - return ""; + if (file == NULL || buffer == NULL || size <= 1 || file->linenum <= linenum) + return; /* Check the cache and see if we last used this file. */ if (last_open_file_info == NULL || file != last_open_file_info) @@ -571,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. */ @@ -580,39 +596,72 @@ rebuffer_line (file_info_type * file, } /* Remember where we are in the current file. */ - pos = ftell (last_open_file); + pos2 = pos = ftell (last_open_file); + if (pos < 3) + return; + current_line = file->linenum; - /* Go back to the beginning. */ - fseek (last_open_file, 0, SEEK_SET); + /* Leave room for the nul at the end of the buffer. */ + size -= 1; + buffer[size] = 0; - /* Skip lines prior to the one we are interested in. */ - while (current_line < linenum) + /* Increment the current line count by one. + This is to allow for the fact that we are searching for the + start of a previous line, but we do this by detecting end-of-line + character(s) not start-of-line characters. */ + ++ current_line; + + while (pos2 > 0 && ! found) { - /* fgets only stops on newlines and has a size limit, - so we read one character at a time instead. */ - do + char * ptr; + + /* Move backwards through the file, looking for earlier lines. */ + pos2 = (long) size > pos2 ? 0 : pos2 - size; + fseek (last_open_file, pos2, SEEK_SET); + + /* Our caller has kindly provided us with a buffer, so we use it. */ + if (fread (buffer, 1, size, last_open_file) != size) { - c = fgetc (last_open_file); + as_warn (_("unable to rebuffer file: %s\n"), file->filename); + return; } - while (c != EOF && c != '\n' && c != '\r'); - - ++ current_line; - if (c == '\r' || c == '\n') + for (ptr = buffer + size; ptr >= buffer; -- ptr) { - int next = fgetc (last_open_file); + if (*ptr == '\n') + { + -- current_line; - /* If '\r' is followed by '\n', swallow that. Likewise, if '\n' - is followed by '\r', swallow that as well. */ - if ((c == '\r' && next != '\n') - || (c == '\n' && next != '\r')) - ungetc (next, last_open_file); + if (current_line == linenum) + { + /* We have found the start of the line we seek. */ + found = TRUE; + + /* FIXME: We could skip the read-in-the-line code + below if we know that we already have the whole + line in the buffer. */ + + /* Advance pos2 to the newline character we have just located. */ + pos2 += (ptr - buffer); + + /* Skip the newline and, if present, the carriage return. */ + if (ptr + 1 == buffer + size) + { + ++pos2; + if (fgetc (last_open_file) == '\r') + ++ pos2; + } + else + pos2 += (ptr[1] == '\r' ? 2 : 1); + + /* Move the file pointer to this location. */ + fseek (last_open_file, pos2, SEEK_SET); + break; + } + } } } - /* Leave room for the nul at the end of the buffer. */ - size -= 1; - /* Read in the line. */ c = fgetc (last_open_file); @@ -641,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) @@ -737,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) @@ -755,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) @@ -770,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; } } @@ -783,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; @@ -791,6 +837,7 @@ print_lines (list_info_type *list, unsigned int lineno, unsigned int octet_in_word = 0; char *src = data_buffer; int cur; + struct list_message *msg; /* Print the stuff on the first line. */ listing_page (list); @@ -838,8 +885,8 @@ print_lines (list_info_type *list, unsigned int lineno, emit_line (list, "\t%s\n", string ? string : ""); - if (list->message) - emit_line (list, "**** %s\n", list->message); + for (msg = list->messages; msg; msg = msg->next) + emit_line (list, "**** %s\n", msg->message); for (lines = 0; lines < (unsigned int) listing_lhs_cont_lines @@ -1045,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; @@ -1152,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; @@ -1508,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; }