projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gdbserver/linux-low: turn 'fetch_register' into a method
[deliverable/binutils-gdb.git]
/
gas
/
listing.c
diff --git
a/gas/listing.c
b/gas/listing.c
index ee878b92f8dee524faaf153ace966b12b6621378..359dc090dc0df6115bfebae0b63eb6a1827aca03 100644
(file)
--- a/
gas/listing.c
+++ b/
gas/listing.c
@@
-1,5
+1,5
@@
/* listing.c - maintain assembly listings
/* listing.c - maintain assembly listings
- Copyright (C) 1991-20
16
Free Software Foundation, Inc.
+ Copyright (C) 1991-20
20
Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
This file is part of GAS, the GNU Assembler.
@@
-41,7
+41,7
@@
will affect the page they are on, as well as any subsequent page
.eject
will affect the page they are on, as well as any subsequent page
.eject
- Thow a page
+ Th
r
ow a page
.list
Increment the enable listing counter
.nolist
.list
Increment the enable listing counter
.nolist
@@
-234,11
+234,8
@@
listing_message (const char *name, const char *message)
{
if (listing_tail != (list_info_type *) NULL)
{
{
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;
lm->message = n;
lm->next = NULL;
@@
-276,7
+273,7
@@
file_info (const char *file_name)
}
/* Make new entry. */
}
/* 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);
p->next = file_info_head;
file_info_head = p;
p->filename = xstrdup (file_name);
@@
-297,10
+294,10
@@
new_frag (void)
void
listing_newline (char *ps)
{
void
listing_newline (char *ps)
{
- char *file;
+ c
onst c
har *file;
unsigned int line;
static unsigned int last_line = 0xffff;
unsigned int line;
static unsigned int last_line = 0xffff;
- static char *last_file = NULL;
+ static c
onst c
har *last_file = NULL;
list_info_type *new_i = NULL;
if (listing == 0)
list_info_type *new_i = NULL;
if (listing == 0)
@@
-327,14
+324,20
@@
listing_newline (char *ps)
}
#endif
}
#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;
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().
/* Detect if we are reading from stdin by examining the file
name returned by as_where().
@@
-350,7
+353,7
@@
listing_newline (char *ps)
if (strcmp (file, _("{standard input}")) == 0
&& input_line_pointer != NULL)
{
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;
int len;
int seen_quote = 0;
int seen_slash = 0;
@@
-370,25
+373,22
@@
listing_newline (char *ps)
len = copy - input_line_pointer + 1;
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
new_i->line_contents = copy;
}
else
@@
-396,7
+396,7
@@
listing_newline (char *ps)
}
else
{
}
else
{
- new_i =
(list_info_type *) xmalloc (sizeof (list_info_type)
);
+ new_i =
XNEW (list_info_type
);
new_i->line_contents = ps;
}
new_i->line_contents = ps;
}
@@
-551,10
+551,9
@@
buffer_line (file_info_type *file, char *line, unsigned int size)
/* This function rewinds the requested file back to the line requested,
reads it in again into the buffer provided and then restores the file
/* This function rewinds the requested file back to the line requested,
reads it in again into the buffer provided and then restores the file
- back to its original location. Returns the buffer pointer upon success
- or an empty string if an error occurs. */
+ back to its original location. */
-static
char *
+static
void
rebuffer_line (file_info_type * file,
unsigned int linenum,
char * buffer,
rebuffer_line (file_info_type * file,
unsigned int linenum,
char * buffer,
@@
-570,7
+569,7
@@
rebuffer_line (file_info_type * file,
/* Sanity checks. */
if (file == NULL || buffer == NULL || size <= 1 || file->linenum <= linenum)
/* Sanity checks. */
if (file == NULL || buffer == NULL || size <= 1 || file->linenum <= linenum)
- return
""
;
+ return;
/* Check the cache and see if we last used this file. */
if (last_open_file_info == NULL || file != last_open_file_info)
/* Check the cache and see if we last used this file. */
if (last_open_file_info == NULL || file != last_open_file_info)
@@
-588,7
+587,7
@@
rebuffer_line (file_info_type * file,
if (last_open_file == NULL)
{
file->at_end = 1;
if (last_open_file == NULL)
{
file->at_end = 1;
- return
""
;
+ return;
}
/* Seek to where we were last time this file was open. */
}
/* Seek to where we were last time this file was open. */
@@
-599,7
+598,7
@@
rebuffer_line (file_info_type * file,
/* Remember where we are in the current file. */
pos2 = pos = ftell (last_open_file);
if (pos < 3)
/* Remember where we are in the current file. */
pos2 = pos = ftell (last_open_file);
if (pos < 3)
- return
""
;
+ return;
current_line = file->linenum;
/* Leave room for the nul at the end of the buffer. */
current_line = file->linenum;
/* Leave room for the nul at the end of the buffer. */
@@
-624,7
+623,7
@@
rebuffer_line (file_info_type * file,
if (fread (buffer, 1, size, last_open_file) != size)
{
as_warn (_("unable to rebuffer file: %s\n"), file->filename);
if (fread (buffer, 1, size, last_open_file) != size)
{
as_warn (_("unable to rebuffer file: %s\n"), file->filename);
- return
""
;
+ return;
}
for (ptr = buffer + size; ptr >= buffer; -- ptr)
}
for (ptr = buffer + size; ptr >= buffer; -- ptr)
@@
-691,8
+690,6
@@
rebuffer_line (file_info_type * file,
/* Reset the file position. */
fseek (last_open_file, pos, SEEK_SET);
/* Reset the file position. */
fseek (last_open_file, pos, SEEK_SET);
-
- return buffer;
}
static const char *fn;
}
static const char *fn;
@@
-786,7
+783,7
@@
calc_hex (list_info_type *list)
{
/* Print as many bytes from the fixed part as is sensible. */
octet_in_frag = 0;
{
/* 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)
&& data_buffer_size < MAX_BYTES - 3)
{
if (address == ~(unsigned int) 0)
@@
-804,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. */
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)
&& data_buffer_size < MAX_BYTES - 3)
{
if (address == ~(unsigned int) 0)
@@
-819,7
+816,7
@@
calc_hex (list_info_type *list)
var_rep_idx++;
octet_in_frag++;
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;
}
}
var_rep_idx = var_rep_max;
}
}
@@
-1206,8
+1203,8
@@
listing_listing (char *name ATTRIBUTE_UNUSED)
int show_listing = 1;
unsigned int width;
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;
eject = 1;
list = head->next;
@@
-1558,9
+1555,7
@@
listing_title (int depth)
if (listing)
{
length = input_line_pointer - start;
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;
}
listing_tail->edict = depth ? EDICT_SBTTL : EDICT_TITLE;
listing_tail->edict_arg = ttl;
}
This page took
0.02754 seconds
and
4
git commands to generate.