/* listing.c - maintain assembly listings
- Copyright (C) 1991-2016 Free Software Foundation, Inc.
+ Copyright (C) 1991-2021 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
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
{
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;
}
/* 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);
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)
const char *segname;
segname = segment_name (now_seg);
- if (strncmp (segname, ".debug", sizeof ".debug" - 1) == 0
- || strncmp (segname, ".line", sizeof ".line" - 1) == 0)
+ if (startswith (segname, ".debug")
+ || startswith (segname, ".line"))
listing_tail->debugging = 1;
}
#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().
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;
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
}
else
{
- new_i = (list_info_type *) xmalloc (sizeof (list_info_type));
+ new_i = XNEW (list_info_type);
new_i->line_contents = ps;
}
const char *segname;
segname = segment_name (now_seg);
- if (strncmp (segname, ".debug", sizeof ".debug" - 1) == 0
- || strncmp (segname, ".line", sizeof ".line" - 1) == 0)
+ if (startswith (segname, ".debug")
+ || startswith (segname, ".line"))
new_i->debugging = 1;
}
#endif
fseek (last_open_file, file->pos, SEEK_SET);
}
- /* Leave room for null. */
- size -= 1;
-
c = fgetc (last_open_file);
while (c != EOF && c != '\n' && c != '\r')
{
- if (count < size)
+ if (++count < size)
*p++ = c;
- count++;
-
c = fgetc (last_open_file);
}
if (c == EOF)
{
file->at_end = 1;
- if (count + 2 < size)
+ if (count + 3 < size)
{
*p++ = '.';
*p++ = '.';
long pos;
long pos2;
int c;
- bfd_boolean found = FALSE;
+ bool found = false;
/* Sanity checks. */
if (file == NULL || buffer == NULL || size <= 1 || file->linenum <= linenum)
if (current_line == linenum)
{
/* We have found the start of the line we seek. */
- found = TRUE;
+ found = true;
/* FIXME: We could skip the read-in-the-line code
below if we know that we already have the whole
{
/* 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)
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)
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;
}
}
line++;
- if (strncmp (line, "def", 3) == 0)
+ if (startswith (line, "def"))
return 1;
- if (strncmp (line, "val", 3) == 0)
+ if (startswith (line, "val"))
return 1;
- if (strncmp (line, "scl", 3) == 0)
+ if (startswith (line, "scl"))
return 1;
- if (strncmp (line, "line", 4) == 0)
+ if (startswith (line, "line"))
return 1;
- if (strncmp (line, "endef", 5) == 0)
+ if (startswith (line, "endef"))
return 1;
- if (strncmp (line, "ln", 2) == 0)
+ if (startswith (line, "ln"))
return 1;
- if (strncmp (line, "type", 4) == 0)
+ if (startswith (line, "type"))
return 1;
- if (strncmp (line, "size", 4) == 0)
+ if (startswith (line, "size"))
return 1;
- if (strncmp (line, "dim", 3) == 0)
+ if (startswith (line, "dim"))
return 1;
- if (strncmp (line, "tag", 3) == 0)
+ if (startswith (line, "tag"))
return 1;
- if (strncmp (line, "stabs", 5) == 0)
+ if (startswith (line, "stabs"))
return 1;
- if (strncmp (line, "stabn", 5) == 0)
+ if (startswith (line, "stabn"))
return 1;
return 0;
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;
++input_line_pointer;
}
- paper_width = get_absolute_expression ();
+ {
+ expressionS exp;
+
+ (void) expression_and_evaluate (& exp);
+
+ if (exp.X_op == O_constant)
+ {
+ offsetT new_width = exp.X_add_number;
+
+ if (new_width > 7)
+ paper_width = new_width;
+ else
+ as_bad (_("new paper width is too small"));
+ }
+ else if (exp.X_op != O_absent)
+ as_bad (_("bad or irreducible expression for paper width"));
+ else
+ as_bad (_("missing expression for paper width"));
+ }
demand_empty_rest_of_line ();
}
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;
}
projects / deliverable / binutils-gdb.git / blobdiff