/* listing.c - maintain assembly listings
Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2005, 2006, 2007, 2008
+ 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
int at_end;
} file_info_type;
+enum edict_enum
+{
+ EDICT_NONE,
+ EDICT_SBTTL,
+ EDICT_TITLE,
+ EDICT_NOLIST,
+ EDICT_LIST,
+ EDICT_NOLIST_NEXT,
+ EDICT_EJECT
+};
+
+
/* This structure remembers which line from which file goes into which
frag. */
struct list_info_struct
/* Pointer to any error message associated with this line. */
char *message;
- enum
- {
- EDICT_NONE,
- EDICT_SBTTL,
- EDICT_TITLE,
- EDICT_NOLIST,
- EDICT_LIST,
- EDICT_NOLIST_NEXT,
- EDICT_EJECT
- } edict;
+ enum edict_enum edict;
char *edict_arg;
/* Nonzero if this line is to be omitted because it contains
}
/* Make new entry. */
- p = xmalloc (sizeof (file_info_type));
+ p = (file_info_type *) xmalloc (sizeof (file_info_type));
p->next = file_info_head;
file_info_head = p;
p->filename = xstrdup (file_name);
unsigned int line;
static unsigned int last_line = 0xffff;
static char *last_file = NULL;
- list_info_type *new = NULL;
+ list_info_type *new_i = NULL;
if (listing == 0)
return;
&& !(last_file && file && strcmp (file, last_file)))
return;
- new = (list_info_type *) xmalloc (sizeof (list_info_type));
+ new_i = (list_info_type *) xmalloc (sizeof (list_info_type));
/* Detect if we are reading from stdin by examining the file
name returned by as_where().
int seen_quote = 0;
int seen_slash = 0;
- for (copy = input_line_pointer - 1;
+ for (copy = input_line_pointer;
*copy && (seen_quote
|| is_end_of_line [(unsigned char) *copy] != 1);
copy++)
seen_quote = ! seen_quote;
}
- len = (copy - input_line_pointer) + 2;
+ len = copy - input_line_pointer + 1;
- copy = xmalloc (len);
+ copy = (char *) xmalloc (len);
if (copy != NULL)
{
- char *src = input_line_pointer - 1;
+ char *src = input_line_pointer;
char *dest = copy;
while (--len)
*dest = 0;
}
- new->line_contents = copy;
+ new_i->line_contents = copy;
}
else
- new->line_contents = NULL;
+ new_i->line_contents = NULL;
}
else
{
- new = xmalloc (sizeof (list_info_type));
- new->line_contents = ps;
+ new_i = (list_info_type *) xmalloc (sizeof (list_info_type));
+ new_i->line_contents = ps;
}
last_line = line;
new_frag ();
if (listing_tail)
- listing_tail->next = new;
+ listing_tail->next = new_i;
else
- head = new;
+ head = new_i;
- listing_tail = new;
+ listing_tail = new_i;
- 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_i->frag = frag_now;
+ new_i->line = line;
+ new_i->file = file_info (file);
+ new_i->next = (list_info_type *) NULL;
+ new_i->message = (char *) NULL;
+ new_i->edict = EDICT_NONE;
+ new_i->hll_file = (file_info_type *) NULL;
+ new_i->hll_line = 0;
+ new_i->debugging = 0;
new_frag ();
segname = segment_name (now_seg);
if (strncmp (segname, ".debug", sizeof ".debug" - 1) == 0
|| strncmp (segname, ".line", sizeof ".line" - 1) == 0)
- new->debugging = 1;
+ new_i->debugging = 1;
}
#endif
}
#define NUM_CACHE_LINES 3
static cached_line cached_lines[NUM_CACHE_LINES];
static int next_free_line = 0;
- cached_line * cache;
+ cached_line * cache = NULL;
if (current_file->linenum > list->hll_line
&& list->hll_line > 0)
while (current_file->linenum < list->hll_line
&& !current_file->at_end)
{
- cached_line * cache = cached_lines + next_free_line;
char *p;
+ cache = cached_lines + next_free_line;
cache->file = current_file;
- cache->line = current_file->linenum;
+ cache->line = current_file->linenum + 1;
cache->buffer[0] = 0;
p = buffer_line (current_file, cache->buffer, width);
int show_listing = 1;
unsigned int width;
- buffer = xmalloc (listing_rhs_width);
- data_buffer = xmalloc (MAX_BYTES);
+ buffer = (char *) xmalloc (listing_rhs_width);
+ data_buffer = (char *) xmalloc (MAX_BYTES);
eject = 1;
list = head->next;
listing_tail->edict = EDICT_EJECT;
}
-void
-listing_flags (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,
if (listing)
{
length = input_line_pointer - start;
- ttl = xmalloc (length + 1);
+ ttl = (char *) xmalloc (length + 1);
memcpy (ttl, start, length);
ttl[length] = 0;
listing_tail->edict = depth ? EDICT_SBTTL : EDICT_TITLE;
/* Dummy functions for when compiled without listing enabled. */
-void
-listing_flags (int ignore)
-{
- s_ignore (0);
-}
-
void
listing_list (int on)
{