projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak handling of remote errors in response to resumption packet
[deliverable/binutils-gdb.git]
/
gas
/
listing.c
diff --git
a/gas/listing.c
b/gas/listing.c
index 9a71c76354e51459b6843cf8e3c5be7eeb7b5fa4..359dc090dc0df6115bfebae0b63eb6a1827aca03 100644
(file)
--- a/
gas/listing.c
+++ b/
gas/listing.c
@@
-1,7
+1,5
@@
/* listing.c - maintain assembly listings
/* listing.c - maintain assembly listings
- Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
+ Copyright (C) 1991-2020 Free Software Foundation, Inc.
This file is part of GAS, the GNU Assembler.
This file is part of GAS, the GNU Assembler.
@@
-43,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
@@
-90,7
+88,7
@@
on a line. */
#include "as.h"
on a line. */
#include "as.h"
-#include "
obstack
.h"
+#include "
filenames
.h"
#include "safe-ctype.h"
#include "input-file.h"
#include "subsegs.h"
#include "safe-ctype.h"
#include "input-file.h"
#include "subsegs.h"
@@
-142,6
+140,12
@@
enum edict_enum
};
};
+struct list_message
+{
+ char *message;
+ struct list_message *next;
+};
+
/* This structure remembers which line from which file goes into which
frag. */
struct list_info_struct
/* This structure remembers which line from which file goes into which
frag. */
struct list_info_struct
@@
-169,8
+173,8
@@
struct list_info_struct
/* High level language source line. */
unsigned int hll_line;
/* High level language source line. */
unsigned int hll_line;
- /* Pointer
to any error message
associated with this line. */
-
char *
message;
+ /* Pointer
s to linked list of messages
associated with this line. */
+
struct list_message *messages, *last_
message;
enum edict_enum edict;
char *edict_arg;
enum edict_enum edict;
char *edict_arg;
@@
-219,7
+223,8
@@
static file_info_type *file_info (const char *);
static void new_frag (void);
static void listing_page (list_info_type *);
static unsigned int calc_hex (list_info_type *);
static void new_frag (void);
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 print_lines (list_info_type *, unsigned int, const char *,
+ unsigned int);
static void list_symbol_table (void);
static int debugging_pseudo (list_info_type *, const char *);
static void listing_listing (char *);
static void list_symbol_table (void);
static int debugging_pseudo (list_info_type *, const char *);
static void listing_listing (char *);
@@
-229,24
+234,29
@@
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);
- strcpy (n, name);
- strcat (n, message);
- listing_tail->message = n;
+ char *n = concat (name, message, (char *) NULL);
+ struct list_message *lm = XNEW (struct list_message);
+ lm->message = n;
+ lm->next = NULL;
+
+ if (listing_tail->last_message)
+ listing_tail->last_message->next = lm;
+ else
+ listing_tail->messages = lm;
+ listing_tail->last_message = lm;
}
}
void
listing_warning (const char *message)
{
}
}
void
listing_warning (const char *message)
{
- listing_message (_("Warning:"), message);
+ listing_message (_("Warning:
"), message);
}
void
listing_error (const char *message)
{
}
void
listing_error (const char *message)
{
- listing_message (_("Error:"), message);
+ listing_message (_("Error:
"), message);
}
static file_info_type *
}
static file_info_type *
@@
-257,13
+267,13
@@
file_info (const char *file_name)
while (p != (file_info_type *) NULL)
{
while (p != (file_info_type *) NULL)
{
- if (
str
cmp (p->filename, file_name) == 0)
+ if (
filename_
cmp (p->filename, file_name) == 0)
return p;
p = p->next;
}
/* Make new entry. */
return p;
p = p->next;
}
/* 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);
@@
-284,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)
@@
-314,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
if (ps == NULL)
{
if (line == last_line
- && !(last_file && file &&
str
cmp (file, last_file)))
+ && !(last_file && file &&
filename_
cmp (file, last_file)))
return;
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().
@@
-337,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;
@@
-347,33
+363,32
@@
listing_newline (char *ps)
|| is_end_of_line [(unsigned char) *copy] != 1);
copy++)
{
|| is_end_of_line [(unsigned char) *copy] != 1);
copy++)
{
- if (*copy == '\\')
- seen_slash = ! seen_slash;
- else if (*copy == '"' && seen_slash)
- seen_quote = ! seen_quote;
+ if (seen_slash)
+ seen_slash = 0;
+ else if (*copy == '\\')
+ seen_slash = 1;
+ else if (*copy == '"')
+ seen_quote = !seen_quote;
}
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
@@
-381,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;
}
@@
-401,7
+416,8
@@
listing_newline (char *ps)
new_i->line = line;
new_i->file = file_info (file);
new_i->next = (list_info_type *) NULL;
new_i->line = line;
new_i->file = file_info (file);
new_i->next = (list_info_type *) NULL;
- new_i->message = (char *) NULL;
+ new_i->messages = NULL;
+ new_i->last_message = NULL;
new_i->edict = EDICT_NONE;
new_i->hll_file = (file_info_type *) NULL;
new_i->hll_line = 0;
new_i->edict = EDICT_NONE;
new_i->hll_file = (file_info_type *) NULL;
new_i->hll_line = 0;
@@
-457,7
+473,7
@@
listing_prev_line (void)
truncated to size. It appends a fake line to the end of each input
file to make using the returned buffer simpler. */
truncated to size. It appends a fake line to the end of each input
file to make using the returned buffer simpler. */
-static char *
+static c
onst c
har *
buffer_line (file_info_type *file, char *line, unsigned int size)
{
unsigned int count = 0;
buffer_line (file_info_type *file, char *line, unsigned int size)
{
unsigned int count = 0;
@@
-537,21
+553,23
@@
buffer_line (file_info_type *file, char *line, unsigned int size)
reads it in again into the buffer provided and then restores the file
back to its original location. */
reads it in again into the buffer provided and then restores the file
back to its original location. */
-static
char *
+static
void
rebuffer_line (file_info_type * file,
unsigned int linenum,
char * buffer,
unsigned int size)
{
unsigned int count = 0;
rebuffer_line (file_info_type * file,
unsigned int linenum,
char * buffer,
unsigned int size)
{
unsigned int count = 0;
- unsigned int current_line
= 1
;
+ unsigned int current_line;
char * p = buffer;
long pos;
char * p = buffer;
long pos;
+ long pos2;
int c;
int c;
+ bfd_boolean found = FALSE;
/* Sanity checks. */
/* Sanity checks. */
- if (file == NULL || buffer == NULL || size
== 0
|| file->linenum <= linenum)
- return
""
;
+ if (file == NULL || buffer == NULL || size
<= 1
|| file->linenum <= linenum)
+ 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)
@@
-569,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. */
@@
-578,39
+596,72
@@
rebuffer_line (file_info_type * file,
}
/* Remember where we are in the current file. */
}
/* Remember where we are in the current file. */
- pos = ftell (last_open_file);
+ pos2 = pos = ftell (last_open_file);
+ if (pos < 3)
+ return;
+ current_line = file->linenum;
+
+ /* Leave room for the nul at the end of the buffer. */
+ size -= 1;
+ buffer[size] = 0;
- /* Go back to the beginning. */
- fseek (last_open_file, 0, SEEK_SET);
+ /* Increment the current line count by one.
+ This is to allow for the fact that we are searching for the
+ start of a previous line, but we do this by detecting end-of-line
+ character(s) not start-of-line characters. */
+ ++ current_line;
- /* Skip lines prior to the one we are interested in. */
- while (current_line < linenum)
+ while (pos2 > 0 && ! found)
{
{
- /* fgets only stops on newlines and has a size limit,
- so we read one character at a time instead. */
- do
+ char * ptr;
+
+ /* Move backwards through the file, looking for earlier lines. */
+ pos2 = (long) size > pos2 ? 0 : pos2 - size;
+ fseek (last_open_file, pos2, SEEK_SET);
+
+ /* Our caller has kindly provided us with a buffer, so we use it. */
+ if (fread (buffer, 1, size, last_open_file) != size)
{
{
- c = fgetc (last_open_file);
+ as_warn (_("unable to rebuffer file: %s\n"), file->filename);
+ return;
}
}
- while (c != EOF && c != '\n' && c != '\r');
- ++ current_line;
-
- if (c == '\r' || c == '\n')
+ for (ptr = buffer + size; ptr >= buffer; -- ptr)
{
{
- int next = fgetc (last_open_file);
+ if (*ptr == '\n')
+ {
+ -- current_line;
+
+ if (current_line == linenum)
+ {
+ /* We have found the start of the line we seek. */
+ found = TRUE;
+
+ /* FIXME: We could skip the read-in-the-line code
+ below if we know that we already have the whole
+ line in the buffer. */
+
+ /* Advance pos2 to the newline character we have just located. */
+ pos2 += (ptr - buffer);
+
+ /* Skip the newline and, if present, the carriage return. */
+ if (ptr + 1 == buffer + size)
+ {
+ ++pos2;
+ if (fgetc (last_open_file) == '\r')
+ ++ pos2;
+ }
+ else
+ pos2 += (ptr[1] == '\r' ? 2 : 1);
- /* If '\r' is followed by '\n', swallow that. Likewise, if '\n'
- is followed by '\r', swallow that as well. */
- if ((c == '\r' && next != '\n')
- || (c == '\n' && next != '\r'))
- ungetc (next, last_open_file);
+ /* Move the file pointer to this location. */
+ fseek (last_open_file, pos2, SEEK_SET);
+ break;
+ }
+ }
}
}
}
}
- /* Leave room for the nul at the end of the buffer. */
- size -= 1;
-
/* Read in the line. */
c = fgetc (last_open_file);
/* Read in the line. */
c = fgetc (last_open_file);
@@
-639,17
+690,14
@@
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;
-
-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 unsigned int eject; /* Eject pending. */
+static unsigned int page; /* Current page number. */
+static const char *title; /* Current title. */
+static const char *subtitle; /* Current subtitle. */
+static unsigned int on_page; /* Number of lines printed on current page. */
static void
listing_page (list_info_type *list)
static void
listing_page (list_info_type *list)
@@
-735,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)
@@
-753,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)
@@
-768,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;
}
}
@@
-781,7
+829,7
@@
calc_hex (list_info_type *list)
static void
print_lines (list_info_type *list, unsigned int lineno,
static void
print_lines (list_info_type *list, unsigned int lineno,
- char *string, unsigned int address)
+ c
onst c
har *string, unsigned int address)
{
unsigned int idx;
unsigned int nchars;
{
unsigned int idx;
unsigned int nchars;
@@
-789,6
+837,7
@@
print_lines (list_info_type *list, unsigned int lineno,
unsigned int octet_in_word = 0;
char *src = data_buffer;
int cur;
unsigned int octet_in_word = 0;
char *src = data_buffer;
int cur;
+ struct list_message *msg;
/* Print the stuff on the first line. */
listing_page (list);
/* Print the stuff on the first line. */
listing_page (list);
@@
-836,8
+885,8
@@
print_lines (list_info_type *list, unsigned int lineno,
emit_line (list, "\t%s\n", string ? string : "");
emit_line (list, "\t%s\n", string ? string : "");
-
if (list->message
)
- emit_line (list, "**** %s\n",
list
->message);
+
for (msg = list->messages; msg; msg = msg->next
)
+ emit_line (list, "**** %s\n",
msg
->message);
for (lines = 0;
lines < (unsigned int) listing_lhs_cont_lines
for (lines = 0;
lines < (unsigned int) listing_lhs_cont_lines
@@
-1043,7
+1092,7
@@
print_source (file_info_type * current_file,
while (current_file->linenum < list->hll_line
&& !current_file->at_end)
{
while (current_file->linenum < list->hll_line
&& !current_file->at_end)
{
- char *p;
+ c
onst c
har *p;
cache = cached_lines + next_free_line;
cache->file = current_file;
cache = cached_lines + next_free_line;
cache->file = current_file;
@@
-1073,17
+1122,22
@@
print_source (file_info_type * current_file,
static int
debugging_pseudo (list_info_type *list, const char *line)
{
static int
debugging_pseudo (list_info_type *list, const char *line)
{
+#ifdef OBJ_ELF
static int in_debug;
int was_debug;
static int in_debug;
int was_debug;
+#endif
if (list->debugging)
{
if (list->debugging)
{
+#ifdef OBJ_ELF
in_debug = 1;
in_debug = 1;
+#endif
return 1;
}
return 1;
}
-
+#ifdef OBJ_ELF
was_debug = in_debug;
in_debug = 0;
was_debug = in_debug;
in_debug = 0;
+#endif
while (ISSPACE (*line))
line++;
while (ISSPACE (*line))
line++;
@@
-1144,14
+1198,13
@@
listing_listing (char *name ATTRIBUTE_UNUSED)
{
list_info_type *list = head;
file_info_type *current_hll_file = (file_info_type *) NULL;
{
list_info_type *list = head;
file_info_type *current_hll_file = (file_info_type *) NULL;
- char *message;
char *buffer;
char *buffer;
- char *p;
+ c
onst c
har *p;
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;
@@
-1209,8
+1262,6
@@
listing_listing (char *name ATTRIBUTE_UNUSED)
{
/* Scan down the list and print all the stuff which can be done
with this line (or lines). */
{
/* Scan down the list and print all the stuff which can be done
with this line (or lines). */
- message = 0;
-
if (list->hll_file)
current_hll_file = list->hll_file;
if (list->hll_file)
current_hll_file = list->hll_file;
@@
-1504,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.092713 seconds
and
4
git commands to generate.