X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gas%2Flisting.c;h=7aeb3fc28da8b7844cc03c13b853a1eace4fcce3;hb=0e389e770d54185d8107db1972d3ae0576d0fa1d;hp=b42f146de59ff42d254425ac792903487cf7986f;hpb=f9b990cd5d1dfc1b737f1924642c158fc65b1bf2;p=external%2Fbinutils.git diff --git a/gas/listing.c b/gas/listing.c index b42f146..7aeb3fc 100644 --- a/gas/listing.c +++ b/gas/listing.c @@ -1,5 +1,7 @@ /* listing.c - mainting assembly listings - Copyright (C) 1991, 1992 Free Software Foundation, Inc. + Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001 + Free Software Foundation, Inc. This file is part of GAS, the GNU Assembler. @@ -14,13 +16,12 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with GAS; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +along with GAS; see the file COPYING. If not, write to the Free +Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. */ /* - Contributed by Steve Chamberlain - sac@cygnus.com - + Contributed by Steve Chamberlain A listing page looks like: @@ -55,7 +56,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307 If the counter goes below zero, listing is suppressed. - Listings are a maintained by read calling various listing_ functions. What happens most is that the macro NO_LISTING is not defined (from the Makefile), then the macro LISTING_NEWLINE expands @@ -99,6 +99,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307 #include "subsegs.h" #ifndef NO_LISTING + #ifndef LISTING_HEADER #define LISTING_HEADER "GAS LISTING" #endif @@ -106,10 +107,10 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307 #define LISTING_WORD_SIZE 4 #endif #ifndef LISTING_LHS_WIDTH -#define LISTING_LHS_WIDTH 1 +#define LISTING_LHS_WIDTH ((LISTING_WORD_SIZE) > 4 ? 1 : 4 / (LISTING_WORD_SIZE)) #endif #ifndef LISTING_LHS_WIDTH_SECOND -#define LISTING_LHS_WIDTH_SECOND 1 +#define LISTING_LHS_WIDTH_SECOND LISTING_LHS_WIDTH #endif #ifndef LISTING_RHS_WIDTH #define LISTING_RHS_WIDTH 100 @@ -118,84 +119,90 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307 #define LISTING_LHS_CONT_LINES 4 #endif - - - -/* This structure remembers which .s were used */ -typedef struct file_info_struct -{ - char *filename; - int linenum; - FILE *file; - struct file_info_struct *next; - int at_end; -} - -file_info_type; - - -/* this structure rememebrs which line from which file goes into which - frag */ -typedef struct list_info_struct -{ - /* Frag which this line of source is nearest to */ +/* This structure remembers which .s were used. */ +typedef struct file_info_struct { + struct file_info_struct * next; + char * filename; + long pos; + unsigned int linenum; + int at_end; +} file_info_type; + +/* This structure rememebrs which line from which file goes into which + frag. */ +struct list_info_struct { + /* Frag which this line of source is nearest to. */ fragS *frag; - /* The actual line in the source file */ + + /* The actual line in the source file. */ unsigned int line; /* Pointer to the file info struct for the file which this line - belongs to */ + belongs to. */ file_info_type *file; - /* Next in list */ - struct list_info_struct *next; + /* The expanded text of any macro that may have been executing. */ + char *line_contents; + /* Next in list. */ + struct list_info_struct *next; /* Pointer to the file info struct for the high level language - source line that belongs here */ + source line that belongs here. */ file_info_type *hll_file; + /* High level language source line. */ + unsigned int hll_line; - /* High level language source line */ - int hll_line; - - - /* Pointer to any error message associated with this line */ + /* Pointer to any error message associated with this line. */ char *message; - enum - { - EDICT_NONE, - EDICT_SBTTL, - EDICT_TITLE, - EDICT_NOLIST, - EDICT_LIST, - EDICT_EJECT - } edict; + enum { + EDICT_NONE, + EDICT_SBTTL, + EDICT_TITLE, + EDICT_NOLIST, + EDICT_LIST, + EDICT_NOLIST_NEXT, + EDICT_EJECT + } edict; char *edict_arg; -} + /* Nonzero if this line is to be omitted because it contains + debugging information. This can become a flags field if we come + up with more information to store here. */ + int debugging; +}; -list_info_type; +typedef struct list_info_struct list_info_type; +int listing_lhs_width = LISTING_LHS_WIDTH; +int listing_lhs_width_second = LISTING_LHS_WIDTH_SECOND; +int listing_lhs_cont_lines = LISTING_LHS_CONT_LINES; +int listing_rhs_width = LISTING_RHS_WIDTH; -static struct list_info_struct *head; -struct list_info_struct *listing_tail; -extern int listing; +struct list_info_struct * listing_tail; -static int paper_width = 200; -static int paper_height = 60; +static file_info_type * file_info_head; +static file_info_type * last_open_file_info; +static FILE * last_open_file; +static struct list_info_struct * head; +static int paper_width = 200; +static int paper_height = 60; + +extern int listing; /* File to output listings to. */ static FILE *list_file; -/* this static array is used to keep the text of data to be printed - before the start of the line. - It is stored so we can give a bit more info on the next line. To much, and large - initialized arrays will use up lots of paper. - */ +/* This static array is used to keep the text of data to be printed + before the start of the line. */ -static char data_buffer[100]; -static unsigned int data_buffer_size; +#define MAX_BYTES \ + (((LISTING_WORD_SIZE * 2) + 1) * listing_lhs_width \ + + ((((LISTING_WORD_SIZE * 2) + 1) * listing_lhs_width_second) \ + * listing_lhs_cont_lines) \ + + 20) +static char *data_buffer; /* Prototypes. */ static void listing_message PARAMS ((const char *name, const char *message)); @@ -205,29 +212,27 @@ static char *buffer_line PARAMS ((file_info_type *file, char *line, unsigned int size)); static void listing_page PARAMS ((list_info_type *list)); static unsigned int calc_hex PARAMS ((list_info_type *list)); -static void print_lines PARAMS ((list_info_type *list, - char *string, - unsigned int address)); +static void print_lines PARAMS ((list_info_type *, unsigned int, + char *, unsigned int)); static void list_symbol_table PARAMS ((void)); static void print_source PARAMS ((file_info_type *current_file, list_info_type *list, char *buffer, unsigned int width)); -static int debugging_pseudo PARAMS ((char *line)); +static int debugging_pseudo PARAMS ((list_info_type *, const char *)); static void listing_listing PARAMS ((char *name)); - static void listing_message (name, message) const char *name; const char *message; { - unsigned int l = strlen (name) + strlen (message) + 1; - char *n = (char *) xmalloc (l); - strcpy (n, name); - strcat (n, 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; } } @@ -236,26 +241,21 @@ void listing_warning (message) const char *message; { - listing_message ("Warning:", message); + listing_message (_("Warning:"), message); } void listing_error (message) const char *message; { - listing_message ("Error:", message); + listing_message (_("Error:"), message); } - - - -static file_info_type *file_info_head; - static file_info_type * file_info (file_name) const char *file_name; { - /* Find an entry with this file name */ + /* Find an entry with this file name. */ file_info_type *p = file_info_head; while (p != (file_info_type *) NULL) @@ -265,24 +265,20 @@ file_info (file_name) p = p->next; } - /* Make new entry */ + /* Make new entry. */ p = (file_info_type *) xmalloc (sizeof (file_info_type)); p->next = file_info_head; file_info_head = p; p->filename = xmalloc ((unsigned long) strlen (file_name) + 1); strcpy (p->filename, file_name); + p->pos = 0; p->linenum = 0; p->at_end = 0; - p->file = fopen (p->filename, "r"); - if (p->file) - fgetc (p->file); - return p; } - static void new_frag () { @@ -300,7 +296,7 @@ listing_newline (ps) unsigned int line; static unsigned int last_line = 0xffff; static char *last_file = NULL; - list_info_type *new; + list_info_type *new = NULL; if (listing == 0) return; @@ -308,34 +304,127 @@ listing_newline (ps) if (now_seg == absolute_section) return; +#ifdef OBJ_ELF + /* In ELF, anything in a section beginning with .debug or .line is + considered to be debugging information. This includes the + statement which switches us into the debugging section, which we + can only set after we are already in the debugging section. */ + if ((listing & LISTING_NODEBUG) != 0 + && listing_tail != NULL + && ! listing_tail->debugging) + { + const char *segname; + + segname = segment_name (now_seg); + if (strncmp (segname, ".debug", sizeof ".debug" - 1) == 0 + || strncmp (segname, ".line", sizeof ".line" - 1) == 0) + listing_tail->debugging = 1; + } +#endif + as_where (&file, &line); - if (line != last_line || (last_file && file && strcmp(file, last_file))) + if (ps == NULL) { - last_line = line; - last_file = file; - new_frag (); + if (line == last_line + && !(last_file && file && strcmp (file, last_file))) + return; new = (list_info_type *) xmalloc (sizeof (list_info_type)); - new->frag = frag_now; - new->line = line; - new->file = file_info (file); - if (listing_tail) + /* Detect if we are reading from stdin by examining the file + name returned by as_where(). + + [FIXME: We rely upon the name in the strcmp below being the + same as the one used by input_scrub_new_file(), if that is + not true, then this code will fail]. + + If we are reading from stdin, then we need to save each input + line here (assuming of course that we actually have a line of + input to read), so that it can be displayed in the listing + that is produced at the end of the assembly. */ + if (strcmp (file, _("{standard input}")) == 0 + && input_line_pointer != NULL) { - listing_tail->next = new; + char *copy; + int len; + int seen_quote = 0; + + for (copy = input_line_pointer - 1; + *copy && (seen_quote + || (! is_end_of_line [(unsigned char) *copy])); + copy++) + if (*copy == '"' && copy[-1] != '\\') + seen_quote = ! seen_quote; + + len = (copy - input_line_pointer) + 2; + + copy = xmalloc (len); + + if (copy != NULL) + { + char *src = input_line_pointer - 1; + char *dest = copy; + + while (--len) + { + unsigned char c = *src++; + + /* Omit control characters in the listing. */ + if (isascii (c) && ! iscntrl (c)) + *dest++ = c; + } + + *dest = 0; + } + + new->line_contents = copy; } else - { - head = new; - } - listing_tail = new; - new->next = (list_info_type *) NULL; - new->message = (char *) NULL; - new->edict = EDICT_NONE; - new->hll_file = (file_info_type *) NULL; - new->hll_line = 0; - new_frag (); + new->line_contents = NULL; + } + else + { + new = (list_info_type *) xmalloc (sizeof (list_info_type)); + new->line_contents = ps; + } + + last_line = line; + last_file = file; + + new_frag (); + + if (listing_tail) + listing_tail->next = new; + else + head = new; + + listing_tail = new; + + new->frag = frag_now; + new->line = line; + new->file = file_info (file); + new->next = (list_info_type *) NULL; + new->message = (char *) NULL; + new->edict = EDICT_NONE; + new->hll_file = (file_info_type *) NULL; + new->hll_line = 0; + new->debugging = 0; + + new_frag (); + +#ifdef OBJ_ELF + /* In ELF, anything in a section beginning with .debug or .line is + considered to be debugging information. */ + if ((listing & LISTING_NODEBUG) != 0) + { + const char *segname; + + segname = segment_name (now_seg); + if (strncmp (segname, ".debug", sizeof ".debug" - 1) == 0 + || strncmp (segname, ".line", sizeof ".line" - 1) == 0) + new->debugging = 1; } +#endif } /* Attach all current frags to the previous line instead of the @@ -367,15 +456,13 @@ listing_prev_line () new_frag (); } -/* - This function returns the next source line from the file supplied, - truncated to size. It appends a fake line to the end of each input - file to make -*/ +/* This function returns the next source line from the file supplied, + truncated to size. It appends a fake line to the end of each input + file to make. */ static char * buffer_line (file, line, size) - file_info_type * file; + file_info_type *file; char *line; unsigned int size; { @@ -384,18 +471,36 @@ buffer_line (file, line, size) char *p = line; - /* If we couldn't open the file, return an empty line */ - if (file->file == (FILE *) NULL || file->at_end) + /* If we couldn't open the file, return an empty line. */ + if (file->at_end) + return ""; + + /* Check the cache and see if we last used this file. */ + if (!last_open_file_info || file != last_open_file_info) { - return ""; - } + if (last_open_file) + { + last_open_file_info->pos = ftell (last_open_file); + fclose (last_open_file); + } - if (file->linenum == 0) - rewind (file->file); + last_open_file_info = file; + last_open_file = fopen (file->filename, FOPEN_RT); + if (last_open_file == NULL) + { + file->at_end = 1; + return ""; + } - c = fgetc (file->file); + /* Seek to where we were last time this file was open. */ + if (file->pos) + fseek (last_open_file, file->pos, SEEK_SET); + } - size -= 1; /* leave room for null */ + c = fgetc (last_open_file); + + /* Leave room for null. */ + size -= 1; while (c != EOF && c != '\n') { @@ -403,7 +508,7 @@ buffer_line (file, line, size) *p++ = c; count++; - c = fgetc (file->file); + c = fgetc (last_open_file); } if (c == EOF) @@ -418,23 +523,22 @@ buffer_line (file, line, size) return line; } - 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 char *title; /* Current title */ +static char *subtitle; /* Current subtitle */ +static unsigned int on_page; /* Number of lines printed on current page */ static void listing_page (list) list_info_type *list; { /* Grope around, see if we can see a title or subtitle edict coming up - soon (we look down 10 lines of the page and see if it's there)*/ - if ((eject || (on_page >= paper_height)) && paper_height != 0) + soon. (we look down 10 lines of the page and see if it's there) */ + if ((eject || (on_page >= (unsigned int) paper_height)) + && paper_height != 0) { unsigned int c = 10; int had_title = 0; @@ -458,7 +562,6 @@ listing_page (list) c--; } - if (page > 1) { fprintf (list_file, "\f"); @@ -472,21 +575,18 @@ listing_page (list) } } - static unsigned int calc_hex (list) - list_info_type * list; + list_info_type *list; { + int data_buffer_size; list_info_type *first = list; - unsigned int address = (unsigned int) ~0; - + unsigned int address = ~(unsigned int) 0; fragS *frag; fragS *frag_ptr; + unsigned int octet_in_frag; - unsigned int byte_in_frag; - - - /* Find first frag which says it belongs to this line */ + /* Find first frag which says it belongs to this line. */ frag = list->frag; while (frag && frag->line != list) frag = frag->fr_next; @@ -495,36 +595,38 @@ calc_hex (list) data_buffer_size = 0; - /* Dump all the frags which belong to this line */ + /* Dump all the frags which belong to this line. */ while (frag_ptr != (fragS *) NULL && frag_ptr->line == first) { - /* Print as many bytes from the fixed part as is sensible */ - byte_in_frag = 0; - while (byte_in_frag < frag_ptr->fr_fix && data_buffer_size < sizeof (data_buffer) - 10) + /* Print as many bytes from the fixed part as is sensible. */ + octet_in_frag = 0; + while ((offsetT) octet_in_frag < frag_ptr->fr_fix + && data_buffer_size < MAX_BYTES - 3) { - if (address == ~0) + if (address == ~(unsigned int) 0) { - address = frag_ptr->fr_address; + address = frag_ptr->fr_address / OCTETS_PER_BYTE; } sprintf (data_buffer + data_buffer_size, "%02X", - (frag_ptr->fr_literal[byte_in_frag]) & 0xff); + (frag_ptr->fr_literal[octet_in_frag]) & 0xff); data_buffer_size += 2; - byte_in_frag++; + octet_in_frag++; } + if (frag_ptr->fr_type == rs_fill) { - unsigned int var_rep_max = byte_in_frag; - unsigned int var_rep_idx = byte_in_frag; + unsigned int var_rep_max = octet_in_frag; + unsigned int var_rep_idx = octet_in_frag; - /* Print as many bytes from the variable part as is sensible */ - while ((byte_in_frag - < frag_ptr->fr_fix + frag_ptr->fr_var * frag_ptr->fr_offset) - && data_buffer_size < sizeof (data_buffer) - 10) + /* 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)) + && data_buffer_size < MAX_BYTES - 3) { - if (address == ~0) + if (address == ~(unsigned int) 0) { - address = frag_ptr->fr_address; + address = frag_ptr->fr_address / OCTETS_PER_BYTE; } sprintf (data_buffer + data_buffer_size, "%02X", @@ -536,127 +638,127 @@ calc_hex (list) data_buffer_size += 2; var_rep_idx++; - byte_in_frag++; + octet_in_frag++; - if (var_rep_idx >= frag_ptr->fr_fix + frag_ptr->fr_var) + if ((offsetT) var_rep_idx >= frag_ptr->fr_fix + frag_ptr->fr_var) var_rep_idx = var_rep_max; } } frag_ptr = frag_ptr->fr_next; } - data_buffer[data_buffer_size++] = 0; + data_buffer[data_buffer_size] = '\0'; return address; } - - - - - static void -print_lines (list, string, address) +print_lines (list, lineno, string, address) list_info_type *list; + unsigned int lineno; char *string; unsigned int address; { unsigned int idx; unsigned int nchars; unsigned int lines; - unsigned int byte_in_word = 0; + unsigned int octet_in_word = 0; char *src = data_buffer; + int cur; - /* Print the stuff on the first line */ + /* Print the stuff on the first line. */ listing_page (list); - nchars = (LISTING_WORD_SIZE * 2 + 1) * LISTING_LHS_WIDTH; - /* Print the hex for the first line */ - if (address == ~0) + nchars = (LISTING_WORD_SIZE * 2 + 1) * listing_lhs_width; + + /* Print the hex for the first line. */ + if (address == ~(unsigned int) 0) { - fprintf (list_file, "% 4d ", list->line); + fprintf (list_file, "% 4d ", lineno); for (idx = 0; idx < nchars; idx++) fprintf (list_file, " "); fprintf (list_file, "\t%s\n", string ? string : ""); + on_page++; + listing_page (0); + return; } + + if (had_errors ()) + fprintf (list_file, "% 4d ???? ", lineno); else + fprintf (list_file, "% 4d %04x ", lineno, address); + + /* And the data to go along with it. */ + idx = 0; + cur = 0; + while (src[cur] && idx < nchars) { - if (had_errors ()) - { - fprintf (list_file, "% 4d ???? ", list->line); - } - else + int offset; + offset = cur; + fprintf (list_file, "%c%c", src[offset], src[offset + 1]); + cur += 2; + octet_in_word++; + + if (octet_in_word == LISTING_WORD_SIZE) { - fprintf (list_file, "% 4d %04x ", list->line, address); + fprintf (list_file, " "); + idx++; + octet_in_word = 0; } - /* And the data to go along with it */ - idx = 0; + idx += 2; + } - while (*src && idx < nchars) - { - fprintf (list_file, "%c%c", src[0], src[1]); - src += 2; - byte_in_word++; - if (byte_in_word == LISTING_WORD_SIZE) - { - fprintf (list_file, " "); - idx++; - byte_in_word = 0; - } - idx += 2; - } + for (; idx < nchars; idx++) + fprintf (list_file, " "); - for (; idx < nchars; idx++) - fprintf (list_file, " "); + fprintf (list_file, "\t%s\n", string ? string : ""); + on_page++; + listing_page (list); - fprintf (list_file, "\t%s\n", string ? string : ""); - on_page++; + if (list->message) + { + fprintf (list_file, "**** %s\n", list->message); listing_page (list); - if (list->message) - { - fprintf (list_file, "**** %s\n", list->message); - listing_page (list); - on_page++; - } + on_page++; + } + + for (lines = 0; + lines < (unsigned int) listing_lhs_cont_lines + && src[cur]; + lines++) + { + nchars = ((LISTING_WORD_SIZE * 2) + 1) * listing_lhs_width_second - 1; + idx = 0; - for (lines = 0; - lines < LISTING_LHS_CONT_LINES - && *src; - lines++) + /* Print any more lines of data, but more compactly. */ + fprintf (list_file, "% 4d ", lineno); + + while (src[cur] && idx < nchars) { - nchars = ((LISTING_WORD_SIZE * 2) + 1) * LISTING_LHS_WIDTH_SECOND - 1; - idx = 0; - /* Print any more lines of data, but more compactly */ - fprintf (list_file, "% 4d ", list->line); + int offset; + offset = cur; + fprintf (list_file, "%c%c", src[offset], src[offset + 1]); + cur += 2; + idx += 2; + octet_in_word++; - while (*src && idx < nchars) + if (octet_in_word == LISTING_WORD_SIZE) { - fprintf (list_file, "%c%c", src[0], src[1]); - src += 2; - idx += 2; - byte_in_word++; - if (byte_in_word == LISTING_WORD_SIZE) - { - fprintf (list_file, " "); - idx++; - byte_in_word = 0; - } + fprintf (list_file, " "); + idx++; + octet_in_word = 0; } - - fprintf (list_file, "\n"); - on_page++; - listing_page (list); - } - + fprintf (list_file, "\n"); + on_page++; + listing_page (list); } } - static void list_symbol_table () { @@ -669,8 +771,14 @@ list_symbol_table () for (ptr = symbol_rootP; ptr != (symbolS *) NULL; ptr = symbol_next (ptr)) { - if (ptr->sy_frag->line) + if (SEG_NORMAL (S_GET_SEGMENT (ptr)) + || S_GET_SEGMENT (ptr) == absolute_section) { +#ifdef BFD_ASSEMBLER + /* Don't report section symbols. They are not interesting. */ + if (symbol_section_p (ptr)) + continue; +#endif if (S_GET_NAME (ptr)) { char buf[30], fmt[8]; @@ -688,12 +796,7 @@ list_symbol_table () } #if defined (BFD64) else if (sizeof (val) > 4) - { - char buf1[30]; - sprintf_vma (buf1, val); - strcpy (buf, "00000000"); - strcpy (buf + 8 - strlen (buf1), buf1); - } + sprintf_vma (buf, val); #endif else abort (); @@ -705,11 +808,20 @@ list_symbol_table () got_some = 1; } - fprintf (list_file, "%20s:%-5d %s:%s %s\n", - ptr->sy_frag->line->file->filename, - ptr->sy_frag->line->line, - segment_name (S_GET_SEGMENT (ptr)), - buf, S_GET_NAME (ptr)); + if (symbol_get_frag (ptr) && symbol_get_frag (ptr)->line) + { + fprintf (list_file, "%20s:%-5d %s:%s %s\n", + symbol_get_frag (ptr)->line->file->filename, + symbol_get_frag (ptr)->line->line, + segment_name (S_GET_SEGMENT (ptr)), + buf, S_GET_NAME (ptr)); + } + else + { + fprintf (list_file, "%33s:%s %s\n", + segment_name (S_GET_SEGMENT (ptr)), + buf, S_GET_NAME (ptr)); + } on_page++; listing_page (0); @@ -732,11 +844,7 @@ list_symbol_table () { if (S_GET_NAME (ptr) && strlen (S_GET_NAME (ptr)) != 0) { - if (ptr->sy_frag->line == 0 -#ifdef S_IS_REGISTER - && !S_IS_REGISTER (ptr) -#endif - && S_GET_SEGMENT (ptr) != reg_section) + if (S_GET_SEGMENT (ptr) == undefined_section) { if (!got_some) { @@ -766,13 +874,13 @@ print_source (current_file, list, buffer, width) char *buffer; unsigned int width; { - if (current_file->file) + if (!current_file->at_end) { while (current_file->linenum < list->hll_line && !current_file->at_end) { char *p = buffer_line (current_file, buffer, width); - fprintf (list_file, "%4d:%-13s **** %s\n", current_file->linenum, + fprintf (list_file, "%4u:%-13s **** %s\n", current_file->linenum, current_file->filename, p); on_page++; listing_page (list); @@ -781,17 +889,48 @@ print_source (current_file, list, buffer, width) } /* Sometimes the user doesn't want to be bothered by the debugging - records inserted by the compiler, see if the line is suspicious */ + records inserted by the compiler, see if the line is suspicious. */ static int -debugging_pseudo (line) - char *line; +debugging_pseudo (list, line) + list_info_type *list; + const char *line; { - while (isspace (*line)) + static int in_debug; + int was_debug; + + if (list->debugging) + { + in_debug = 1; + return 1; + } + + was_debug = in_debug; + in_debug = 0; + + while (isspace ((unsigned char) *line)) line++; if (*line != '.') - return 0; + { +#ifdef OBJ_ELF + /* The ELF compiler sometimes emits blank lines after switching + out of a debugging section. If the next line drops us back + into debugging information, then don't print the blank line. + This is a hack for a particular compiler behaviour, not a + general case. */ + if (was_debug + && *line == '\0' + && list->next != NULL + && list->next->debugging) + { + in_debug = 1; + return 1; + } +#endif + + return 0; + } line++; @@ -822,12 +961,11 @@ debugging_pseudo (line) return 1; return 0; - } static void listing_listing (name) - char *name; + char *name ATTRIBUTE_UNUSED; { list_info_type *list = head; file_info_type *current_hll_file = (file_info_type *) NULL; @@ -837,7 +975,8 @@ listing_listing (name) int show_listing = 1; unsigned int width; - buffer = xmalloc (LISTING_RHS_WIDTH); + buffer = xmalloc (listing_rhs_width); + data_buffer = xmalloc (MAX_BYTES); eject = 1; list = head; @@ -851,20 +990,27 @@ listing_listing (name) list = head->next; - while (list) { - width = LISTING_RHS_WIDTH > paper_width ? paper_width : - LISTING_RHS_WIDTH; + unsigned int list_line; + + width = listing_rhs_width > paper_width ? paper_width : + listing_rhs_width; + list_line = list->line; switch (list->edict) { case EDICT_LIST: - show_listing++; + /* Skip all lines up to the current. */ + list_line--; break; case EDICT_NOLIST: show_listing--; break; + case EDICT_NOLIST_NEXT: + if (show_listing == 0) + list_line--; + break; case EDICT_EJECT: break; case EDICT_NONE: @@ -879,6 +1025,21 @@ listing_listing (name) abort (); } + if (show_listing <= 0) + { + while (list->file->linenum < list_line + && !list->file->at_end) + p = buffer_line (list->file, buffer, width); + } + + if (list->edict == EDICT_LIST + || (list->edict == EDICT_NOLIST_NEXT && show_listing == 0)) + { + /* Enable listing for the single line that caused the enable. */ + list_line++; + show_listing++; + } + if (show_listing > 0) { /* Scan down the list and print all the stuff which can be done @@ -890,20 +1051,40 @@ listing_listing (name) current_hll_file = list->hll_file; } - if (current_hll_file && list->hll_line && listing & LISTING_HLL) + if (current_hll_file && list->hll_line && (listing & LISTING_HLL)) { print_source (current_hll_file, list, buffer, width); } - while (list->file->file - && list->file->linenum < list->line - && !list->file->at_end) + if (list->line_contents) { - p = buffer_line (list->file, buffer, width); - - if (!((listing & LISTING_NODEBUG) && debugging_pseudo (p))) + if (!((listing & LISTING_NODEBUG) + && debugging_pseudo (list, list->line_contents))) { - print_lines (list, p, calc_hex (list)); + print_lines (list, + list->file->linenum == 0 ? list->line : list->file->linenum, + list->line_contents, calc_hex (list)); + } + free (list->line_contents); + list->line_contents = NULL; + } + else + { + while (list->file->linenum < list_line + && !list->file->at_end) + { + unsigned int address; + + p = buffer_line (list->file, buffer, width); + + if (list->file->linenum < list_line) + address = ~(unsigned int) 0; + else + address = calc_hex (list); + + if (!((listing & LISTING_NODEBUG) + && debugging_pseudo (list, p))) + print_lines (list, list->file->linenum, p, address); } } @@ -912,35 +1093,42 @@ listing_listing (name) eject = 1; } } - else - { - while (list->file->file - && list->file->linenum < list->line - && !list->file->at_end) - p = buffer_line (list->file, buffer, width); - } + + if (list->edict == EDICT_NOLIST_NEXT && show_listing == 1) + --show_listing; list = list->next; } + free (buffer); + free (data_buffer); + data_buffer = NULL; } void listing_print (name) char *name; { + int using_stdout; + title = ""; subtitle = ""; if (name == NULL) - list_file = stdout; + { + list_file = stdout; + using_stdout = 1; + } else { - list_file = fopen (name, "w"); - if (list_file == NULL) + list_file = fopen (name, FOPEN_WT); + if (list_file != NULL) + using_stdout = 0; + else { - as_perror ("can't open list file: %s", name); + as_perror (_("can't open list file: %s"), name); list_file = stdout; + using_stdout = 1; } } @@ -952,14 +1140,24 @@ listing_print (name) if (listing & LISTING_LISTING) { listing_listing (name); - } + if (listing & LISTING_SYMBOLS) { list_symbol_table (); } -} + if (! using_stdout) + { + if (fclose (list_file) == EOF) + as_perror (_("error closing list file: %s"), name); + } + + if (last_open_file) + { + fclose (last_open_file); + } +} void listing_file (name) @@ -970,7 +1168,7 @@ listing_file (name) void listing_eject (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { if (listing) listing_tail->edict = EDICT_EJECT; @@ -978,22 +1176,48 @@ listing_eject (ignore) void listing_flags (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { while ((*input_line_pointer++) && (*input_line_pointer != '\n')) input_line_pointer++; } +/* Turn listing on or off. An argument of 0 means to turn off + listing. An argument of 1 means to turn on listing. An argument + of 2 means to turn off listing, but as of the next line; that is, + the current line should be listed, but the next line should not. */ + void listing_list (on) int on; { if (listing) - listing_tail->edict = on ? EDICT_LIST : EDICT_NOLIST; + { + switch (on) + { + case 0: + if (listing_tail->edict == EDICT_LIST) + listing_tail->edict = EDICT_NONE; + else + listing_tail->edict = EDICT_NOLIST; + break; + case 1: + if (listing_tail->edict == EDICT_NOLIST + || listing_tail->edict == EDICT_NOLIST_NEXT) + listing_tail->edict = EDICT_NONE; + else + listing_tail->edict = EDICT_LIST; + break; + case 2: + listing_tail->edict = EDICT_NOLIST_NEXT; + break; + default: + abort (); + } + } } - void listing_psize (width_only) int width_only; @@ -1005,7 +1229,7 @@ listing_psize (width_only) if (paper_height < 0 || paper_height > 1000) { paper_height = 0; - as_warn ("strange paper height, set to no form"); + as_warn (_("strange paper height, set to no form")); } if (*input_line_pointer != ',') @@ -1024,7 +1248,7 @@ listing_psize (width_only) void listing_nopage (ignore) - int ignore; + int ignore ATTRIBUTE_UNUSED; { paper_height = 0; } @@ -1071,7 +1295,7 @@ listing_title (depth) } else if (*input_line_pointer == '\n') { - as_bad ("New line in title"); + as_bad (_("new line in title")); demand_empty_rest_of_line (); return; } @@ -1082,8 +1306,6 @@ listing_title (depth) } } - - void listing_source_line (line) unsigned int line; @@ -1104,12 +1326,9 @@ listing_source_file (file) listing_tail->hll_file = file_info (file); } - - #else - -/* Dummy functions for when compiled without listing enabled */ +/* Dummy functions for when compiled without listing enabled. */ void listing_flags (ignore) @@ -1118,21 +1337,21 @@ listing_flags (ignore) s_ignore (0); } -void +void listing_list (on) int on; { s_ignore (0); } -void +void listing_eject (ignore) int ignore; { s_ignore (0); } -void +void listing_psize (ignore) int ignore; { @@ -1146,7 +1365,7 @@ listing_nopage (ignore) s_ignore (0); } -void +void listing_title (depth) int depth; { @@ -1160,20 +1379,21 @@ listing_file (name) } -void +void listing_newline (name) char *name; { } -void +void listing_source_line (n) unsigned int n; { } -void + +void listing_source_file (n) const char *n; {