X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gas%2Flisting.c;h=1b55cbf63989ef18fab6aa8b4043268eb7b40bb1;hb=6e29ef6d2828415f5ee2d6e1690d13bc40a8d5d4;hp=1ab0ddef1804c31ec4e5536dfdee8a83089bd8c5;hpb=30727aa6d12fb866494020c0b62ab265a2bdcdfe;p=deliverable%2Fbinutils-gdb.git diff --git a/gas/listing.c b/gas/listing.c index 1ab0ddef18..1b55cbf639 100644 --- a/gas/listing.c +++ b/gas/listing.c @@ -1,28 +1,26 @@ -/* listing.c - mainting assembly listings - Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 1999 +/* listing.c - maintain assembly listings + Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2005, 2006 Free Software Foundation, Inc. -This file is part of GAS, the GNU Assembler. + This file is part of GAS, the GNU Assembler. -GAS is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. + GAS is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. -GAS is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + GAS is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + 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. */ - -/* - Contributed by Steve Chamberlain - sac@cygnus.com + 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, 51 Franklin Street - Fifth Floor, Boston, MA + 02110-1301, USA. */ +/* Contributed by Steve Chamberlain A listing page looks like: @@ -57,7 +55,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 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 @@ -67,7 +64,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA The function listing_newline remembers the frag associated with the newline, and creates a new frag - note that this is wasteful, but not a big deal, since listing slows things down a lot anyway. The - function also rememebers when the filename changes. + function also remembers when the filename changes. When all the input has finished, and gas has had a chance to settle down, the listing is output. This is done by running down the list of @@ -88,15 +85,13 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA LISTING_LHS_WIDTH_SECOND Number of words for the data on the lhs for the second line - LISTING_LHS_CONT_LINES Max number of lines to use up for a continutation + LISTING_LHS_CONT_LINES Max number of lines to use up for a continuation LISTING_RHS_WIDTH Number of chars from the input file to print - on a line -*/ - -#include + on a line. */ #include "as.h" -#include +#include "obstack.h" +#include "safe-ctype.h" #include "input-file.h" #include "subsegs.h" @@ -109,10 +104,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #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 @@ -121,7 +116,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #define LISTING_LHS_CONT_LINES 4 #endif -/* This structure remembers which .s were used */ +/* This structure remembers which .s were used. */ typedef struct file_info_struct { struct file_info_struct * next; @@ -129,36 +124,37 @@ typedef struct file_info_struct long pos; unsigned int linenum; int at_end; -} -file_info_type; +} file_info_type; -/* This structure rememebrs which line from which file goes into which - frag */ +/* This structure remembers which line from which file goes into which + frag. */ struct list_info_struct { - /* Frag which this line of source is nearest to */ - fragS * frag; + /* 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 */ - file_info_type * file; + belongs to. */ + file_info_type *file; /* The expanded text of any macro that may have been executing. */ - char * line_contents; + char *line_contents; - /* Next in list */ - struct list_info_struct * next; + /* Next in list. */ + struct list_info_struct *next; /* Pointer to the file info struct for the high level language - source line that belongs here */ - file_info_type * hll_file; - /* High level language source line */ + source line that belongs here. */ + file_info_type *hll_file; + + /* High level language source line. */ unsigned int hll_line; - /* Pointer to any error message associated with this line */ - char * message; + /* Pointer to any error message associated with this line. */ + char *message; enum { @@ -170,7 +166,7 @@ struct list_info_struct EDICT_NOLIST_NEXT, EDICT_EJECT } edict; - char * edict_arg; + 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 @@ -180,7 +176,6 @@ struct list_info_struct 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; @@ -198,7 +193,7 @@ static int paper_height = 60; extern int listing; /* File to output listings to. */ -static FILE * list_file; +static FILE *list_file; /* This static array is used to keep the text of data to be printed before the start of the line. */ @@ -209,61 +204,50 @@ static FILE * list_file; * listing_lhs_cont_lines) \ + 20) -static char * data_buffer; +static char *data_buffer; /* Prototypes. */ -static void listing_message PARAMS ((const char *name, const char *message)); -static file_info_type * file_info PARAMS ((const char *file_name)); -static void new_frag PARAMS ((void)); -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 *, 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 ((list_info_type *, const char *)); -static void listing_listing PARAMS ((char *name)); - +static void listing_message (const char *, const char *); +static file_info_type *file_info (const char *); +static void new_frag (void); +static char *buffer_line (file_info_type *, char *, unsigned int); +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 list_symbol_table (void); +static void print_source (file_info_type *, list_info_type *, char *, unsigned int); +static int debugging_pseudo (list_info_type *, const char *); +static void listing_listing (char *); static void -listing_message (name, message) - const char *name; - const char *message; +listing_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; } } void -listing_warning (message) - const char *message; +listing_warning (const char *message) { listing_message (_("Warning:"), message); } void -listing_error (message) - const char *message; +listing_error (const char *message) { listing_message (_("Error:"), message); } static file_info_type * -file_info (file_name) - const char *file_name; +file_info (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) @@ -273,13 +257,11 @@ file_info (file_name) p = p->next; } - /* Make new entry */ - - p = (file_info_type *) xmalloc (sizeof (file_info_type)); + /* Make new entry. */ + p = 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->filename = xstrdup (file_name); p->pos = 0; p->linenum = 0; p->at_end = 0; @@ -287,19 +269,15 @@ file_info (file_name) return p; } - static void -new_frag () +new_frag (void) { - frag_wane (frag_now); frag_new (0); - } void -listing_newline (ps) - char *ps; +listing_newline (char *ps) { char *file; unsigned int line; @@ -334,7 +312,8 @@ listing_newline (ps) as_where (&file, &line); if (ps == NULL) { - if (line == last_line && !(last_file && file && strcmp (file, last_file))) + if (line == last_line + && !(last_file && file && strcmp (file, last_file))) return; new = (list_info_type *) xmalloc (sizeof (list_info_type)); @@ -346,22 +325,22 @@ listing_newline (ps) 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 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) { - char * copy; + 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] != '\\') + *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; @@ -370,21 +349,21 @@ listing_newline (ps) if (copy != NULL) { - char * src = input_line_pointer - 1; - char * dest = copy; - + char *src = input_line_pointer - 1; + char *dest = copy; + while (--len) { - unsigned char c = * src ++; + unsigned char c = *src++; /* Omit control characters in the listing. */ - if (isascii (c) && ! iscntrl (c)) - * dest ++ = c; + if (!ISCNTRL (c)) + *dest++ = c; } - + *dest = 0; } - + new->line_contents = copy; } else @@ -392,20 +371,20 @@ listing_newline (ps) } else { - new = (list_info_type *) xmalloc (sizeof (list_info_type)); + new = 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; @@ -417,7 +396,7 @@ listing_newline (ps) new->hll_file = (file_info_type *) NULL; new->hll_line = 0; new->debugging = 0; - + new_frag (); #ifdef OBJ_ELF @@ -442,7 +421,7 @@ listing_newline (ps) with the new instruction. */ void -listing_prev_line () +listing_prev_line (void) { list_info_type *l; fragS *f; @@ -464,24 +443,19 @@ 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; - char *line; - unsigned int size; +buffer_line (file_info_type *file, char *line, unsigned int size) { unsigned int count = 0; int c; char *p = line; - /* If we couldn't open the file, return an empty line */ + /* If we couldn't open the file, return an empty line. */ if (file->at_end) return ""; @@ -495,21 +469,22 @@ buffer_line (file, line, size) } last_open_file_info = file; - last_open_file = fopen (file->filename, "r"); + last_open_file = fopen (file->filename, FOPEN_RT); if (last_open_file == NULL) { file->at_end = 1; return ""; } - + /* Seek to where we were last time this file was open. */ if (file->pos) - fseek(last_open_file, file->pos, SEEK_SET); + fseek (last_open_file, file->pos, SEEK_SET); } c = fgetc (last_open_file); - size -= 1; /* leave room for null */ + /* Leave room for null. */ + size -= 1; while (c != EOF && c != '\n') { @@ -523,32 +498,33 @@ buffer_line (file, line, size) if (c == EOF) { file->at_end = 1; - *p++ = '.'; - *p++ = '.'; - *p++ = '.'; + if (count + 2 < size) + { + *p++ = '.'; + *p++ = '.'; + *p++ = '.'; + } } file->linenum++; *p++ = 0; 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; +listing_page (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 >= (unsigned int) 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; @@ -572,7 +548,6 @@ listing_page (list) c--; } - if (page > 1) { fprintf (list_file, "\f"); @@ -586,19 +561,17 @@ listing_page (list) } } - static unsigned int -calc_hex (list) - list_info_type * list; +calc_hex (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 byte_in_frag; + unsigned int octet_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; @@ -607,54 +580,48 @@ 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 ((offsetT) byte_in_frag < frag_ptr->fr_fix + /* 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 == ~ (unsigned int) 0) - { - address = frag_ptr->fr_address; - } + if (address == ~(unsigned int) 0) + 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++; } - { - unsigned int var_rep_max = byte_in_frag; - unsigned int var_rep_idx = byte_in_frag; - - /* Print as many bytes from the variable part as is sensible */ - while (((offsetT) byte_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) - { - address = frag_ptr->fr_address; - } - sprintf (data_buffer + data_buffer_size, - "%02X", - (frag_ptr->fr_literal[var_rep_idx]) & 0xff); -#if 0 - data_buffer[data_buffer_size++] = '*'; - data_buffer[data_buffer_size++] = '*'; -#endif - data_buffer_size += 2; + if (frag_ptr->fr_type == rs_fill) + { + 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 (((offsetT) 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) + address = frag_ptr->fr_address / OCTETS_PER_BYTE; - var_rep_idx++; - byte_in_frag++; + sprintf (data_buffer + data_buffer_size, + "%02X", + (frag_ptr->fr_literal[var_rep_idx]) & 0xff); + data_buffer_size += 2; - if ((offsetT) var_rep_idx >= frag_ptr->fr_fix + frag_ptr->fr_var) - var_rep_idx = var_rep_max; - } - } + var_rep_idx++; + octet_in_frag++; + + 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; } @@ -662,39 +629,32 @@ calc_hex (list) return address; } - - - - - static void -print_lines (list, lineno, string, address) - list_info_type *list; - unsigned int lineno; - char *string; - unsigned int address; +print_lines (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 == ~ (unsigned int) 0) + + /* Print the hex for the first line. */ + if (address == ~(unsigned int) 0) { fprintf (list_file, "% 4d ", lineno); for (idx = 0; idx < nchars; idx++) fprintf (list_file, " "); fprintf (list_file, "\t%s\n", string ? string : ""); - - on_page ++; - + + on_page++; + listing_page (0); return; @@ -705,75 +665,77 @@ print_lines (list, lineno, string, address) else fprintf (list_file, "% 4d %04x ", lineno, address); - /* And the data to go along with it */ + /* And the data to go along with it. */ idx = 0; - - while (*src && idx < nchars) + cur = 0; + while (src[cur] && idx < nchars) { - fprintf (list_file, "%c%c", src[0], src[1]); - src += 2; - byte_in_word++; - - if (byte_in_word == LISTING_WORD_SIZE) + 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, " "); idx++; - byte_in_word = 0; + octet_in_word = 0; } - + idx += 2; } - + for (; idx < nchars; idx++) fprintf (list_file, " "); - + fprintf (list_file, "\t%s\n", string ? string : ""); on_page++; listing_page (list); - + if (list->message) { fprintf (list_file, "**** %s\n", list->message); listing_page (list); on_page++; } - + for (lines = 0; lines < (unsigned int) listing_lhs_cont_lines - && *src; - lines ++) + && src[cur]; + lines++) { - nchars = ((LISTING_WORD_SIZE * 2) + 1) - * listing_lhs_width_second - 1; + nchars = ((LISTING_WORD_SIZE * 2) + 1) * listing_lhs_width_second - 1; idx = 0; - - /* Print any more lines of data, but more compactly */ + + /* Print any more lines of data, but more compactly. */ fprintf (list_file, "% 4d ", lineno); - - while (*src && idx < nchars) + + while (src[cur] && idx < nchars) { - fprintf (list_file, "%c%c", src[0], src[1]); - src += 2; + int offset; + offset = cur; + fprintf (list_file, "%c%c", src[offset], src[offset + 1]); + cur += 2; idx += 2; - byte_in_word++; - - if (byte_in_word == LISTING_WORD_SIZE) + octet_in_word++; + + if (octet_in_word == LISTING_WORD_SIZE) { fprintf (list_file, " "); idx++; - byte_in_word = 0; + octet_in_word = 0; } } - + fprintf (list_file, "\n"); - on_page ++; + on_page++; listing_page (list); } } - static void -list_symbol_table () +list_symbol_table (void) { extern symbolS *symbol_rootP; int got_some = 0; @@ -787,11 +749,10 @@ list_symbol_table () 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]; @@ -836,7 +797,7 @@ list_symbol_table () buf, S_GET_NAME (ptr)); } - on_page ++; + on_page++; listing_page (0); } } @@ -881,11 +842,8 @@ list_symbol_table () } static void -print_source (current_file, list, buffer, width) - file_info_type *current_file; - list_info_type *list; - char *buffer; - unsigned int width; +print_source (file_info_type *current_file, list_info_type *list, + char *buffer, unsigned int width) { if (!current_file->at_end) { @@ -893,6 +851,7 @@ print_source (current_file, list, buffer, width) && !current_file->at_end) { char *p = buffer_line (current_file, buffer, width); + fprintf (list_file, "%4u:%-13s **** %s\n", current_file->linenum, current_file->filename, p); on_page++; @@ -905,9 +864,7 @@ print_source (current_file, list, buffer, width) records inserted by the compiler, see if the line is suspicious. */ static int -debugging_pseudo (list, line) - list_info_type *list; - const char *line; +debugging_pseudo (list_info_type *list, const char *line) { static int in_debug; int was_debug; @@ -921,7 +878,7 @@ debugging_pseudo (list, line) was_debug = in_debug; in_debug = 0; - while (isspace ((unsigned char) *line)) + while (ISSPACE (*line)) line++; if (*line != '.') @@ -967,7 +924,6 @@ debugging_pseudo (list, line) return 1; if (strncmp (line, "tag", 3) == 0) return 1; - if (strncmp (line, "stabs", 5) == 0) return 1; if (strncmp (line, "stabn", 5) == 0) @@ -977,8 +933,7 @@ debugging_pseudo (list, line) } static void -listing_listing (name) - char *name ATTRIBUTE_UNUSED; +listing_listing (char *name ATTRIBUTE_UNUSED) { list_info_type *list = head; file_info_type *current_hll_file = (file_info_type *) NULL; @@ -991,19 +946,8 @@ listing_listing (name) buffer = xmalloc (listing_rhs_width); data_buffer = xmalloc (MAX_BYTES); eject = 1; - list = head; - - while (list != (list_info_type *) NULL && 0) - { - if (list->next) - list->frag = list->next->frag; - list = list->next; - - } - list = head->next; - while (list) { unsigned int list_line; @@ -1022,6 +966,8 @@ listing_listing (name) show_listing--; break; case EDICT_NOLIST_NEXT: + if (show_listing == 0) + list_line--; break; case EDICT_EJECT: break; @@ -1044,7 +990,8 @@ listing_listing (name) p = buffer_line (list->file, buffer, width); } - if (list->edict == EDICT_LIST) + 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++; @@ -1058,24 +1005,19 @@ listing_listing (name) message = 0; if (list->hll_file) - { - current_hll_file = list->hll_file; - } + current_hll_file = list->hll_file; if (current_hll_file && list->hll_line && (listing & LISTING_HLL)) - { - print_source (current_hll_file, list, buffer, width); - } + print_source (current_hll_file, list, buffer, width); if (list->line_contents) { if (!((listing & LISTING_NODEBUG) && debugging_pseudo (list, list->line_contents))) - { - print_lines (list, - list->file->linenum == 0 ? list->line : list->file->linenum, - list->line_contents, 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; } @@ -1089,7 +1031,7 @@ listing_listing (name) p = buffer_line (list->file, buffer, width); if (list->file->linenum < list_line) - address = ~ (unsigned int) 0; + address = ~(unsigned int) 0; else address = calc_hex (list); @@ -1100,12 +1042,10 @@ listing_listing (name) } if (list->edict == EDICT_EJECT) - { - eject = 1; - } + eject = 1; } - if (list->edict == EDICT_NOLIST_NEXT) + if (list->edict == EDICT_NOLIST_NEXT && show_listing == 1) --show_listing; list = list->next; @@ -1117,11 +1057,10 @@ listing_listing (name) } void -listing_print (name) - char *name; +listing_print (char *name) { int using_stdout; - + title = ""; subtitle = ""; @@ -1132,63 +1071,51 @@ listing_print (name) } else { - list_file = fopen (name, "w"); + list_file = fopen (name, FOPEN_WT); if (list_file != NULL) using_stdout = 0; else { - as_perror (_("can't open list file: %s"), name); + as_warn (_("can't open %s: %s"), name, xstrerror (errno)); list_file = stdout; using_stdout = 1; } } if (listing & LISTING_NOFORM) - { - paper_height = 0; - } + paper_height = 0; if (listing & LISTING_LISTING) - { - listing_listing (name); - } + listing_listing (name); if (listing & LISTING_SYMBOLS) - { - list_symbol_table (); - } + list_symbol_table (); if (! using_stdout) { if (fclose (list_file) == EOF) - as_perror (_("error closing list file: %s"), name); + as_warn (_("can't close %s: %s"), name, xstrerror (errno)); } if (last_open_file) - { - fclose (last_open_file); - } + fclose (last_open_file); } - void -listing_file (name) - const char *name; +listing_file (const char *name) { fn = name; } void -listing_eject (ignore) - int ignore ATTRIBUTE_UNUSED; +listing_eject (int ignore ATTRIBUTE_UNUSED) { if (listing) listing_tail->edict = EDICT_EJECT; } void -listing_flags (ignore) - int ignore ATTRIBUTE_UNUSED; +listing_flags (int ignore ATTRIBUTE_UNUSED) { while ((*input_line_pointer++) && (*input_line_pointer != '\n')) input_line_pointer++; @@ -1201,8 +1128,7 @@ listing_flags (ignore) the current line should be listed, but the next line should not. */ void -listing_list (on) - int on; +listing_list (int on) { if (listing) { @@ -1230,10 +1156,8 @@ listing_list (on) } } - void -listing_psize (width_only) - int width_only; +listing_psize (int width_only) { if (! width_only) { @@ -1260,15 +1184,13 @@ listing_psize (width_only) } void -listing_nopage (ignore) - int ignore ATTRIBUTE_UNUSED; +listing_nopage (int ignore ATTRIBUTE_UNUSED) { paper_height = 0; } void -listing_title (depth) - int depth; +listing_title (int depth) { int quoted; char *start; @@ -1308,7 +1230,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; } @@ -1319,11 +1241,8 @@ listing_title (depth) } } - - void -listing_source_line (line) - unsigned int line; +listing_source_line (unsigned int line) { if (listing) { @@ -1334,87 +1253,70 @@ listing_source_line (line) } void -listing_source_file (file) - const char *file; +listing_source_file (const char *file) { if (listing) 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) - int ignore; +listing_flags (int ignore) { s_ignore (0); } -void -listing_list (on) - int on; +void +listing_list (int on) { s_ignore (0); } -void -listing_eject (ignore) - int ignore; +void +listing_eject (int ignore) { s_ignore (0); } -void -listing_psize (ignore) - int ignore; +void +listing_psize (int ignore) { s_ignore (0); } void -listing_nopage (ignore) - int ignore; +listing_nopage (int ignore) { s_ignore (0); } -void -listing_title (depth) - int depth; +void +listing_title (int depth) { s_ignore (0); } void -listing_file (name) - const char *name; +listing_file (const char *name) { - } -void -listing_newline (name) - char *name; +void +listing_newline (char *name) { - } -void -listing_source_line (n) - unsigned int n; +void +listing_source_line (unsigned int n) { - } -void -listing_source_file (n) - const char *n; -{ +void +listing_source_file (const char *n) +{ } #endif