binutils-gdb/gas/listing.c

1426 lines
30 KiB
C
Raw Normal View History

1999-05-03 09:29:11 +02:00
/* listing.c - mainting assembly listings
Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 1999
Free Software Foundation, Inc.
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 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
A listing page looks like:
LISTING_HEADER sourcefilename pagenumber
TITLE LINE
SUBTITLE LINE
linenumber address data source
linenumber address data source
linenumber address data source
linenumber address data source
If not overridden, the listing commands are:
.title "stuff"
Put "stuff" onto the title line
.sbttl "stuff"
Put stuff onto the subtitle line
If these commands come within 10 lines of the top of the page, they
will affect the page they are on, as well as any subsequent page
.eject
Thow a page
.list
Increment the enable listing counter
.nolist
Decrement the enable listing counter
.psize Y[,X]
Set the paper size to X wide and Y high. Setting a psize Y of
zero will suppress form feeds except where demanded by .eject
If the counter goes below zero, listing is suppressed.
Listings are a maintained by read calling various listing_<foo>
functions. What happens most is that the macro NO_LISTING is not
defined (from the Makefile), then the macro LISTING_NEWLINE expands
into a call to listing_newline. The call is done from read.c, every
time it sees a newline, and -l is on the command line.
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.
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
frag/source file records, and opening the files as needed and printing
out the bytes and chars associated with them.
The only things which the architecture can change about the listing
are defined in these macros:
LISTING_HEADER The name of the architecture
LISTING_WORD_SIZE The make of the number of bytes in a word, this determines
the clumping of the output data. eg a value of
2 makes words look like 1234 5678, whilst 1
would make the same value look like 12 34 56
78
LISTING_LHS_WIDTH Number of words of above size for the lhs
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_RHS_WIDTH Number of chars from the input file to print
on a line
*/
#include <ctype.h>
#include "as.h"
#include <obstack.h>
#include "input-file.h"
#include "subsegs.h"
#ifndef NO_LISTING
#ifndef LISTING_HEADER
#define LISTING_HEADER "GAS LISTING"
#endif
#ifndef LISTING_WORD_SIZE
#define LISTING_WORD_SIZE 4
#endif
#ifndef LISTING_LHS_WIDTH
#define LISTING_LHS_WIDTH 1
#endif
#ifndef LISTING_LHS_WIDTH_SECOND
#define LISTING_LHS_WIDTH_SECOND 1
#endif
#ifndef LISTING_RHS_WIDTH
#define LISTING_RHS_WIDTH 100
#endif
#ifndef LISTING_LHS_CONT_LINES
#define LISTING_LHS_CONT_LINES 4
#endif
/* This structure remembers which .s were used */
typedef struct file_info_struct
{
struct file_info_struct * next;
char * filename;
long pos;
unsigned int linenum;
int at_end;
}
file_info_type;
/* This structure rememebrs which line from which file goes into which
frag */
struct list_info_struct
{
/* Frag which this line of source is nearest to */
fragS * frag;
/* 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;
/* The expanded text of any macro that may have been executing. */
char * line_contents;
/* 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 */
unsigned int hll_line;
/* 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;
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
up with more information to store here. */
int debugging;
};
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;
int listing_rhs_width = LISTING_RHS_WIDTH;
struct list_info_struct * listing_tail;
static file_info_type * file_info_head;
static file_info_type * last_open_file_info;
static FILE * last_open_file;
static struct list_info_struct * head;
static int paper_width = 200;
static int paper_height = 60;
extern int listing;
/* File to output listings to. */
static FILE * list_file;
/* This static array is used to keep the text of data to be printed
before the start of the line. */
#define MAX_BYTES \
(((LISTING_WORD_SIZE * 2) + 1) * listing_lhs_width \
+ ((((LISTING_WORD_SIZE * 2) + 1) * listing_lhs_width_second) \
* listing_lhs_cont_lines) \
+ 20)
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 (name, 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)
{
listing_tail->message = n;
}
}
void
listing_warning (message)
const char *message;
{
listing_message (_("Warning:"), message);
}
void
listing_error (message)
const char *message;
{
listing_message (_("Error:"), message);
}
static file_info_type *
file_info (file_name)
const char *file_name;
{
/* Find an entry with this file name */
file_info_type *p = file_info_head;
while (p != (file_info_type *) NULL)
{
if (strcmp (p->filename, file_name) == 0)
return p;
p = p->next;
}
/* Make new entry */
p = (file_info_type *) 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->pos = 0;
p->linenum = 0;
p->at_end = 0;
return p;
}
static void
new_frag ()
{
frag_wane (frag_now);
frag_new (0);
}
void
listing_newline (ps)
char *ps;
{
char *file;
unsigned int line;
static unsigned int last_line = 0xffff;
static char *last_file = NULL;
list_info_type *new = NULL;
if (listing == 0)
return;
if (now_seg == absolute_section)
return;
#ifdef OBJ_ELF
/* In ELF, anything in a section beginning with .debug or .line is
considered to be debugging information. This includes the
statement which switches us into the debugging section, which we
can only set after we are already in the debugging section. */
if ((listing & LISTING_NODEBUG) != 0
&& listing_tail != NULL
&& ! listing_tail->debugging)
{
const char *segname;
segname = segment_name (now_seg);
if (strncmp (segname, ".debug", sizeof ".debug" - 1) == 0
|| strncmp (segname, ".line", sizeof ".line" - 1) == 0)
listing_tail->debugging = 1;
}
#endif
as_where (&file, &line);
if (ps == NULL)
{
if (line == last_line && !(last_file && file && strcmp (file, last_file)))
return;
new = (list_info_type *) xmalloc (sizeof (list_info_type));
/* Detect if we are reading from stdin by examining the file
name returned by as_where().
[FIXME: We rely upon the name in the strcmp below being the
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 (strcmp (file, _("{standard input}")) == 0
&& input_line_pointer != NULL)
{
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] != '\\')
seen_quote = ! seen_quote;
len = (copy - input_line_pointer) + 2;
copy = xmalloc (len);
if (copy != NULL)
{
char * src = input_line_pointer - 1;
char * dest = copy;
while (--len)
{
unsigned char c = * src ++;
1999-05-03 09:29:11 +02:00
/* Omit control characters in the listing. */
if (isascii (c) && ! iscntrl (c))
* dest ++ = c;
}
*dest = 0;
}
new->line_contents = copy;
}
else
new->line_contents = NULL;
}
else
{
new = (list_info_type *) 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;
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_frag ();
#ifdef OBJ_ELF
/* In ELF, anything in a section beginning with .debug or .line is
considered to be debugging information. */
if ((listing & LISTING_NODEBUG) != 0)
{
const char *segname;
segname = segment_name (now_seg);
if (strncmp (segname, ".debug", sizeof ".debug" - 1) == 0
|| strncmp (segname, ".line", sizeof ".line" - 1) == 0)
new->debugging = 1;
}
#endif
}
/* Attach all current frags to the previous line instead of the
current line. This is called by the MIPS backend when it discovers
that it needs to add some NOP instructions; the added NOP
instructions should go with the instruction that has the delay, not
with the new instruction. */
void
listing_prev_line ()
{
list_info_type *l;
fragS *f;
if (head == (list_info_type *) NULL
|| head == listing_tail)
return;
new_frag ();
for (l = head; l->next != listing_tail; l = l->next)
;
for (f = frchain_now->frch_root; f != (fragS *) NULL; f = f->fr_next)
if (f->line == listing_tail)
f->line = l;
listing_tail->frag = frag_now;
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
*/
static char *
buffer_line (file, line, size)
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 (file->at_end)
return "";
/* Check the cache and see if we last used this file. */
if (!last_open_file_info || file != last_open_file_info)
{
if (last_open_file)
{
last_open_file_info->pos = ftell (last_open_file);
fclose (last_open_file);
}
last_open_file_info = file;
last_open_file = fopen (file->filename, "r");
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);
}
c = fgetc (last_open_file);
size -= 1; /* leave room for null */
while (c != EOF && c != '\n')
{
if (count < size)
*p++ = c;
count++;
c = fgetc (last_open_file);
}
if (c == EOF)
{
file->at_end = 1;
*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 void
listing_page (list)
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)
{
unsigned int c = 10;
int had_title = 0;
int had_subtitle = 0;
page++;
while (c != 0 && list)
{
if (list->edict == EDICT_SBTTL && !had_subtitle)
{
had_subtitle = 1;
subtitle = list->edict_arg;
}
if (list->edict == EDICT_TITLE && !had_title)
{
had_title = 1;
title = list->edict_arg;
}
list = list->next;
c--;
}
if (page > 1)
{
fprintf (list_file, "\f");
}
fprintf (list_file, "%s %s \t\t\tpage %d\n", LISTING_HEADER, fn, page);
fprintf (list_file, "%s\n", title);
fprintf (list_file, "%s\n", subtitle);
on_page = 3;
eject = 0;
}
}
static unsigned int
calc_hex (list)
list_info_type * list;
{
int data_buffer_size;
list_info_type *first = list;
unsigned int address = ~ (unsigned int) 0;
fragS *frag;
fragS *frag_ptr;
2000-02-03 19:20:23 +01:00
unsigned int octet_in_frag;
1999-05-03 09:29:11 +02:00
/* Find first frag which says it belongs to this line */
frag = list->frag;
while (frag && frag->line != list)
frag = frag->fr_next;
frag_ptr = frag;
data_buffer_size = 0;
/* 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 */
2000-02-03 19:20:23 +01:00
octet_in_frag = 0;
while ((offsetT) octet_in_frag < frag_ptr->fr_fix
1999-05-03 09:29:11 +02:00
&& data_buffer_size < MAX_BYTES - 3)
{
if (address == ~ (unsigned int) 0)
{
2000-02-03 19:20:23 +01:00
address = frag_ptr->fr_address / OCTETS_PER_BYTE;
1999-05-03 09:29:11 +02:00
}
sprintf (data_buffer + data_buffer_size,
"%02X",
2000-02-03 19:20:23 +01:00
(frag_ptr->fr_literal[octet_in_frag]) & 0xff);
1999-05-03 09:29:11 +02:00
data_buffer_size += 2;
2000-02-03 19:20:23 +01:00
octet_in_frag++;
1999-05-03 09:29:11 +02:00
}
{
2000-02-03 19:20:23 +01:00
unsigned int var_rep_max = octet_in_frag;
unsigned int var_rep_idx = octet_in_frag;
1999-05-03 09:29:11 +02:00
/* Print as many bytes from the variable part as is sensible */
2000-02-03 19:20:23 +01:00
while (((offsetT) octet_in_frag
< (frag_ptr->fr_fix + frag_ptr->fr_var * frag_ptr->fr_offset))
1999-05-03 09:29:11 +02:00
&& data_buffer_size < MAX_BYTES - 3)
{
if (address == ~ (unsigned int) 0)
{
2000-02-03 19:20:23 +01:00
address = frag_ptr->fr_address / OCTETS_PER_BYTE;
1999-05-03 09:29:11 +02:00
}
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;
var_rep_idx++;
2000-02-03 19:20:23 +01:00
octet_in_frag++;
1999-05-03 09:29:11 +02:00
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;
}
data_buffer[data_buffer_size] = '\0';
return address;
}
static void
print_lines (list, lineno, string, address)
list_info_type *list;
unsigned int lineno;
char *string;
unsigned int address;
{
unsigned int idx;
unsigned int nchars;
unsigned int lines;
2000-02-03 19:20:23 +01:00
unsigned int octet_in_word = 0;
1999-05-03 09:29:11 +02:00
char *src = data_buffer;
2000-02-03 19:20:23 +01:00
int cur;
1999-05-03 09:29:11 +02:00
/* 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)
{
fprintf (list_file, "% 4d ", lineno);
for (idx = 0; idx < nchars; idx++)
fprintf (list_file, " ");
fprintf (list_file, "\t%s\n", string ? string : "");
on_page ++;
listing_page (0);
return;
}
if (had_errors ())
fprintf (list_file, "% 4d ???? ", lineno);
else
fprintf (list_file, "% 4d %04x ", lineno, address);
/* And the data to go along with it */
idx = 0;
2000-02-03 19:20:23 +01:00
cur = 0;
while (src[cur] && idx < nchars)
1999-05-03 09:29:11 +02:00
{
2000-02-03 19:20:23 +01:00
int offset;
offset = cur;
fprintf (list_file, "%c%c", src[offset], src[offset+1]);
cur += 2;
octet_in_word++;
1999-05-03 09:29:11 +02:00
2000-02-03 19:20:23 +01:00
if (octet_in_word == LISTING_WORD_SIZE)
1999-05-03 09:29:11 +02:00
{
fprintf (list_file, " ");
idx++;
2000-02-03 19:20:23 +01:00
octet_in_word = 0;
1999-05-03 09:29:11 +02:00
}
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
2000-02-03 19:20:23 +01:00
&& src[cur];
1999-05-03 09:29:11 +02:00
lines ++)
{
nchars = ((LISTING_WORD_SIZE * 2) + 1)
* listing_lhs_width_second - 1;
idx = 0;
/* Print any more lines of data, but more compactly */
fprintf (list_file, "% 4d ", lineno);
2000-02-03 19:20:23 +01:00
while (src[cur] && idx < nchars)
1999-05-03 09:29:11 +02:00
{
2000-02-03 19:20:23 +01:00
int offset;
offset = cur;
fprintf (list_file, "%c%c", src[offset], src[offset+1]);
cur += 2;
1999-05-03 09:29:11 +02:00
idx += 2;
2000-02-03 19:20:23 +01:00
octet_in_word++;
1999-05-03 09:29:11 +02:00
2000-02-03 19:20:23 +01:00
if (octet_in_word == LISTING_WORD_SIZE)
1999-05-03 09:29:11 +02:00
{
fprintf (list_file, " ");
idx++;
2000-02-03 19:20:23 +01:00
octet_in_word = 0;
1999-05-03 09:29:11 +02:00
}
}
fprintf (list_file, "\n");
on_page ++;
listing_page (list);
}
}
static void
list_symbol_table ()
{
extern symbolS *symbol_rootP;
int got_some = 0;
symbolS *ptr;
eject = 1;
listing_page (0);
for (ptr = symbol_rootP; ptr != (symbolS *) NULL; ptr = symbol_next (ptr))
{
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. */
Add support for storing local symbols in a small structure to save memory when assembling large files. * as.h: Don't include struc-symbol.h. (symbolS): Add typedef. * symbols.c: Include struc-symbol.h. (local_hash): New static variable. (save_symbol_name): New static function, from symbol_create. (symbol_create): Call save_symbol_name. (local_symbol_count): New static variable. (local_symbol_conversion_count): Likewise. (LOCAL_SYMBOL_CHECK): Define. (local_symbol_make): New static function. (local_symbol_convert): New static function. (colon): Handle local symbols. Create local symbol for local label name. (symbol_table_insert): Handle local symbols. (symbol_find_or_make): Create local symbol for local label name. (symbol_find_base): Check for local symbol. (symbol_append, symbol_insert): Check for local symbols. (symbol_clear_list_pointers, symbol_remove): Likewise. (verify_symbol_chain): Likewise. (copy_symbol_attributes): Likewise. (resolve_symbol_value): Handle local symbols. (resolve_local_symbol): New static function. (resolve_local_symbol_values): New function. (S_GET_VALUE, S_SET_VALUE): Handle local symbols. (S_IS_FUNCTION, S_IS_EXTERNAL, S_IS_WEAK, S_IS_COMMON): Likewise. (S_IS_DEFINED, S_IS_DEBUG, S_IS_LOCAL, S_GET_NAME): Likewise. (S_GET_SEGMENT, S_SET_SEGMENT, S_SET_EXTERNAL): Likewise. (S_CLEAR_EXTERNAL, S_SET_WEAK, S_SET_NAME): Likewise. (symbol_previous, symbol_next): New functions. (symbol_get_value_expression): Likewise. (symbol_set_value_expression): Likewise. (symbol_set_frag, symbol_get_frag): Likewise. (symbol_mark_used, symbol_clear_used, symbol_used_p): Likewise. (symbol_mark_used_in_reloc): Likewise. (symbol_clear_used_in_reloc, symbol_used_in_reloc_p): Likewise. (symbol_mark_mri_common, symbol_clear_mri_common): Likewise. (symbol_mri_common_p): Likewise. (symbol_mark_written, symbol_clear_written): Likewise. (symbol_written_p): Likewise. (symbol_mark_resolved, symbol_resolved_p): Likewise. (symbol_section_p, symbol_equated_p): Likewise. (symbol_constant_p): Likewise. (symbol_get_bfdsym, symbol_set_bfdsym): Likewise. (symbol_get_obj, symbol_set_obj): Likewise. (symbol_get_tc, symbol_set_tc): Likewise. (symbol_begin): Initialize local_hash. (print_symbol_value_1): Handle local symbols. (symbol_print_statistics): Print local symbol statistics. * symbols.h: Include "struc-symbol.h" if not BFD_ASSEMBLER. Declare new symbols.c functions. Move many declarations here from struc-symbol.h. (SYMBOLS_NEED_BACKPOINTERS): Define if needed. * struc-symbol.h (SYMBOLS_NEED_BACKPOINTERS): Don't set. (struct symbol): Move bsym to make it clearly the first field. Remove TARGET_SYMBOL_FIELDS. (symbolS): Don't typedef. (struct broken_word): Remove. (N_TYPE_seg, seg_N_TYPE): Move to symbol.h. (SEGMENT_TO_SYMBOL_TYPE, N_REGISTER): Likewise. (symbol_clear_list_pointers): Likewise. (symbol_insert, symbol_remove): Likewise. (symbol_previous, symbol_append): Likewise. (verify_symbol_chain, verify_symbol_chain_2): Likewise. (struct local_symbol): Define. (local_symbol_converted_p, local_symbol_mark_converted): Define. (local_symbol_resolved_p, local_symbol_mark_resolved): Define. (local_symbol_get_frag, local_symbol_set_frag): Define. (local_symbol_get_real_symbol): Define. (local_symbol_set_real_symbol): Define. Define. * write.c (write_object_file): Call resolve_local_symbol_values. * config/obj-ecoff.h (OBJ_SYMFIELD_TYPE): Define. (TARGET_SYMBOL_FIELDS): Don't define. * config/obj-elf.h (OBJ_SYMFIELD_TYPE): Add local field. If ECOFF_DEBUGGING, add ECOFF fields. (ELF_TARGET_SYMBOL_FIELDS, TARGET_SYMBOL_FIELDS): Don't define. * config/obj-multi.h (struct elf_obj_sy): Add local field. If ECOFF_DEBUGGING, add ECOFF fields. (ELF_TARGET_SYMBOL_FIELDS, TARGET_SYMBOL_FIELDS): Don't define. (ECOFF_DEBUG_TARGET_SYMBOL_FIELDS): Don't define. * config/tc-mcore.h: Don't include struc-symbol.h. (TARGET_SYMBOL_FIELDS): Don't define. (struct mcore_tc_sy): Define. (TC_SYMFIELD_TYPE): Define. * Many files: Use symbolS instead of struct symbol. Use new accessor functions rather than referring to symbolS fields directly. * read.c (s_mri_common): Don't add in value of line_label. * config/tc-mips.c (md_apply_fix): Correct parenthesization when checking for SEC_LINK_ONCE. * config/tc-sh.h (sh_fix_adjustable): Declare.
1999-06-03 02:29:48 +02:00
if (symbol_section_p (ptr))
1999-05-03 09:29:11 +02:00
continue;
#endif
if (S_GET_NAME (ptr))
{
char buf[30], fmt[8];
valueT val = S_GET_VALUE (ptr);
/* @@ Note that this is dependent on the compilation options,
not solely on the target characteristics. */
if (sizeof (val) == 4 && sizeof (int) == 4)
sprintf (buf, "%08lx", (unsigned long) val);
else if (sizeof (val) <= sizeof (unsigned long))
{
sprintf (fmt, "%%0%lulx",
(unsigned long) (sizeof (val) * 2));
sprintf (buf, fmt, (unsigned long) val);
}
#if defined (BFD64)
else if (sizeof (val) > 4)
sprintf_vma (buf, val);
#endif
else
abort ();
if (!got_some)
{
fprintf (list_file, "DEFINED SYMBOLS\n");
on_page++;
got_some = 1;
}
Add support for storing local symbols in a small structure to save memory when assembling large files. * as.h: Don't include struc-symbol.h. (symbolS): Add typedef. * symbols.c: Include struc-symbol.h. (local_hash): New static variable. (save_symbol_name): New static function, from symbol_create. (symbol_create): Call save_symbol_name. (local_symbol_count): New static variable. (local_symbol_conversion_count): Likewise. (LOCAL_SYMBOL_CHECK): Define. (local_symbol_make): New static function. (local_symbol_convert): New static function. (colon): Handle local symbols. Create local symbol for local label name. (symbol_table_insert): Handle local symbols. (symbol_find_or_make): Create local symbol for local label name. (symbol_find_base): Check for local symbol. (symbol_append, symbol_insert): Check for local symbols. (symbol_clear_list_pointers, symbol_remove): Likewise. (verify_symbol_chain): Likewise. (copy_symbol_attributes): Likewise. (resolve_symbol_value): Handle local symbols. (resolve_local_symbol): New static function. (resolve_local_symbol_values): New function. (S_GET_VALUE, S_SET_VALUE): Handle local symbols. (S_IS_FUNCTION, S_IS_EXTERNAL, S_IS_WEAK, S_IS_COMMON): Likewise. (S_IS_DEFINED, S_IS_DEBUG, S_IS_LOCAL, S_GET_NAME): Likewise. (S_GET_SEGMENT, S_SET_SEGMENT, S_SET_EXTERNAL): Likewise. (S_CLEAR_EXTERNAL, S_SET_WEAK, S_SET_NAME): Likewise. (symbol_previous, symbol_next): New functions. (symbol_get_value_expression): Likewise. (symbol_set_value_expression): Likewise. (symbol_set_frag, symbol_get_frag): Likewise. (symbol_mark_used, symbol_clear_used, symbol_used_p): Likewise. (symbol_mark_used_in_reloc): Likewise. (symbol_clear_used_in_reloc, symbol_used_in_reloc_p): Likewise. (symbol_mark_mri_common, symbol_clear_mri_common): Likewise. (symbol_mri_common_p): Likewise. (symbol_mark_written, symbol_clear_written): Likewise. (symbol_written_p): Likewise. (symbol_mark_resolved, symbol_resolved_p): Likewise. (symbol_section_p, symbol_equated_p): Likewise. (symbol_constant_p): Likewise. (symbol_get_bfdsym, symbol_set_bfdsym): Likewise. (symbol_get_obj, symbol_set_obj): Likewise. (symbol_get_tc, symbol_set_tc): Likewise. (symbol_begin): Initialize local_hash. (print_symbol_value_1): Handle local symbols. (symbol_print_statistics): Print local symbol statistics. * symbols.h: Include "struc-symbol.h" if not BFD_ASSEMBLER. Declare new symbols.c functions. Move many declarations here from struc-symbol.h. (SYMBOLS_NEED_BACKPOINTERS): Define if needed. * struc-symbol.h (SYMBOLS_NEED_BACKPOINTERS): Don't set. (struct symbol): Move bsym to make it clearly the first field. Remove TARGET_SYMBOL_FIELDS. (symbolS): Don't typedef. (struct broken_word): Remove. (N_TYPE_seg, seg_N_TYPE): Move to symbol.h. (SEGMENT_TO_SYMBOL_TYPE, N_REGISTER): Likewise. (symbol_clear_list_pointers): Likewise. (symbol_insert, symbol_remove): Likewise. (symbol_previous, symbol_append): Likewise. (verify_symbol_chain, verify_symbol_chain_2): Likewise. (struct local_symbol): Define. (local_symbol_converted_p, local_symbol_mark_converted): Define. (local_symbol_resolved_p, local_symbol_mark_resolved): Define. (local_symbol_get_frag, local_symbol_set_frag): Define. (local_symbol_get_real_symbol): Define. (local_symbol_set_real_symbol): Define. Define. * write.c (write_object_file): Call resolve_local_symbol_values. * config/obj-ecoff.h (OBJ_SYMFIELD_TYPE): Define. (TARGET_SYMBOL_FIELDS): Don't define. * config/obj-elf.h (OBJ_SYMFIELD_TYPE): Add local field. If ECOFF_DEBUGGING, add ECOFF fields. (ELF_TARGET_SYMBOL_FIELDS, TARGET_SYMBOL_FIELDS): Don't define. * config/obj-multi.h (struct elf_obj_sy): Add local field. If ECOFF_DEBUGGING, add ECOFF fields. (ELF_TARGET_SYMBOL_FIELDS, TARGET_SYMBOL_FIELDS): Don't define. (ECOFF_DEBUG_TARGET_SYMBOL_FIELDS): Don't define. * config/tc-mcore.h: Don't include struc-symbol.h. (TARGET_SYMBOL_FIELDS): Don't define. (struct mcore_tc_sy): Define. (TC_SYMFIELD_TYPE): Define. * Many files: Use symbolS instead of struct symbol. Use new accessor functions rather than referring to symbolS fields directly. * read.c (s_mri_common): Don't add in value of line_label. * config/tc-mips.c (md_apply_fix): Correct parenthesization when checking for SEC_LINK_ONCE. * config/tc-sh.h (sh_fix_adjustable): Declare.
1999-06-03 02:29:48 +02:00
if (symbol_get_frag (ptr) && symbol_get_frag (ptr)->line)
1999-05-03 09:29:11 +02:00
{
fprintf (list_file, "%20s:%-5d %s:%s %s\n",
Add support for storing local symbols in a small structure to save memory when assembling large files. * as.h: Don't include struc-symbol.h. (symbolS): Add typedef. * symbols.c: Include struc-symbol.h. (local_hash): New static variable. (save_symbol_name): New static function, from symbol_create. (symbol_create): Call save_symbol_name. (local_symbol_count): New static variable. (local_symbol_conversion_count): Likewise. (LOCAL_SYMBOL_CHECK): Define. (local_symbol_make): New static function. (local_symbol_convert): New static function. (colon): Handle local symbols. Create local symbol for local label name. (symbol_table_insert): Handle local symbols. (symbol_find_or_make): Create local symbol for local label name. (symbol_find_base): Check for local symbol. (symbol_append, symbol_insert): Check for local symbols. (symbol_clear_list_pointers, symbol_remove): Likewise. (verify_symbol_chain): Likewise. (copy_symbol_attributes): Likewise. (resolve_symbol_value): Handle local symbols. (resolve_local_symbol): New static function. (resolve_local_symbol_values): New function. (S_GET_VALUE, S_SET_VALUE): Handle local symbols. (S_IS_FUNCTION, S_IS_EXTERNAL, S_IS_WEAK, S_IS_COMMON): Likewise. (S_IS_DEFINED, S_IS_DEBUG, S_IS_LOCAL, S_GET_NAME): Likewise. (S_GET_SEGMENT, S_SET_SEGMENT, S_SET_EXTERNAL): Likewise. (S_CLEAR_EXTERNAL, S_SET_WEAK, S_SET_NAME): Likewise. (symbol_previous, symbol_next): New functions. (symbol_get_value_expression): Likewise. (symbol_set_value_expression): Likewise. (symbol_set_frag, symbol_get_frag): Likewise. (symbol_mark_used, symbol_clear_used, symbol_used_p): Likewise. (symbol_mark_used_in_reloc): Likewise. (symbol_clear_used_in_reloc, symbol_used_in_reloc_p): Likewise. (symbol_mark_mri_common, symbol_clear_mri_common): Likewise. (symbol_mri_common_p): Likewise. (symbol_mark_written, symbol_clear_written): Likewise. (symbol_written_p): Likewise. (symbol_mark_resolved, symbol_resolved_p): Likewise. (symbol_section_p, symbol_equated_p): Likewise. (symbol_constant_p): Likewise. (symbol_get_bfdsym, symbol_set_bfdsym): Likewise. (symbol_get_obj, symbol_set_obj): Likewise. (symbol_get_tc, symbol_set_tc): Likewise. (symbol_begin): Initialize local_hash. (print_symbol_value_1): Handle local symbols. (symbol_print_statistics): Print local symbol statistics. * symbols.h: Include "struc-symbol.h" if not BFD_ASSEMBLER. Declare new symbols.c functions. Move many declarations here from struc-symbol.h. (SYMBOLS_NEED_BACKPOINTERS): Define if needed. * struc-symbol.h (SYMBOLS_NEED_BACKPOINTERS): Don't set. (struct symbol): Move bsym to make it clearly the first field. Remove TARGET_SYMBOL_FIELDS. (symbolS): Don't typedef. (struct broken_word): Remove. (N_TYPE_seg, seg_N_TYPE): Move to symbol.h. (SEGMENT_TO_SYMBOL_TYPE, N_REGISTER): Likewise. (symbol_clear_list_pointers): Likewise. (symbol_insert, symbol_remove): Likewise. (symbol_previous, symbol_append): Likewise. (verify_symbol_chain, verify_symbol_chain_2): Likewise. (struct local_symbol): Define. (local_symbol_converted_p, local_symbol_mark_converted): Define. (local_symbol_resolved_p, local_symbol_mark_resolved): Define. (local_symbol_get_frag, local_symbol_set_frag): Define. (local_symbol_get_real_symbol): Define. (local_symbol_set_real_symbol): Define. Define. * write.c (write_object_file): Call resolve_local_symbol_values. * config/obj-ecoff.h (OBJ_SYMFIELD_TYPE): Define. (TARGET_SYMBOL_FIELDS): Don't define. * config/obj-elf.h (OBJ_SYMFIELD_TYPE): Add local field. If ECOFF_DEBUGGING, add ECOFF fields. (ELF_TARGET_SYMBOL_FIELDS, TARGET_SYMBOL_FIELDS): Don't define. * config/obj-multi.h (struct elf_obj_sy): Add local field. If ECOFF_DEBUGGING, add ECOFF fields. (ELF_TARGET_SYMBOL_FIELDS, TARGET_SYMBOL_FIELDS): Don't define. (ECOFF_DEBUG_TARGET_SYMBOL_FIELDS): Don't define. * config/tc-mcore.h: Don't include struc-symbol.h. (TARGET_SYMBOL_FIELDS): Don't define. (struct mcore_tc_sy): Define. (TC_SYMFIELD_TYPE): Define. * Many files: Use symbolS instead of struct symbol. Use new accessor functions rather than referring to symbolS fields directly. * read.c (s_mri_common): Don't add in value of line_label. * config/tc-mips.c (md_apply_fix): Correct parenthesization when checking for SEC_LINK_ONCE. * config/tc-sh.h (sh_fix_adjustable): Declare.
1999-06-03 02:29:48 +02:00
symbol_get_frag (ptr)->line->file->filename,
symbol_get_frag (ptr)->line->line,
1999-05-03 09:29:11 +02:00
segment_name (S_GET_SEGMENT (ptr)),
buf, S_GET_NAME (ptr));
}
else
{
fprintf (list_file, "%33s:%s %s\n",
segment_name (S_GET_SEGMENT (ptr)),
buf, S_GET_NAME (ptr));
}
on_page ++;
listing_page (0);
}
}
}
if (!got_some)
{
fprintf (list_file, "NO DEFINED SYMBOLS\n");
on_page++;
}
fprintf (list_file, "\n");
on_page++;
listing_page (0);
got_some = 0;
for (ptr = symbol_rootP; ptr != (symbolS *) NULL; ptr = symbol_next (ptr))
{
if (S_GET_NAME (ptr) && strlen (S_GET_NAME (ptr)) != 0)
{
if (S_GET_SEGMENT (ptr) == undefined_section)
{
if (!got_some)
{
got_some = 1;
fprintf (list_file, "UNDEFINED SYMBOLS\n");
on_page++;
listing_page (0);
}
fprintf (list_file, "%s\n", S_GET_NAME (ptr));
on_page++;
listing_page (0);
}
}
}
if (!got_some)
{
fprintf (list_file, "NO UNDEFINED SYMBOLS\n");
on_page++;
listing_page (0);
}
}
static void
print_source (current_file, list, buffer, width)
file_info_type *current_file;
list_info_type *list;
char *buffer;
unsigned int width;
{
if (!current_file->at_end)
{
while (current_file->linenum < list->hll_line
&& !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++;
listing_page (list);
}
}
}
/* Sometimes the user doesn't want to be bothered by the debugging
records inserted by the compiler, see if the line is suspicious. */
static int
debugging_pseudo (list, line)
list_info_type *list;
const char *line;
{
static int in_debug;
int was_debug;
if (list->debugging)
{
in_debug = 1;
return 1;
}
was_debug = in_debug;
in_debug = 0;
while (isspace ((unsigned char) *line))
line++;
if (*line != '.')
{
#ifdef OBJ_ELF
/* The ELF compiler sometimes emits blank lines after switching
out of a debugging section. If the next line drops us back
into debugging information, then don't print the blank line.
This is a hack for a particular compiler behaviour, not a
general case. */
if (was_debug
&& *line == '\0'
&& list->next != NULL
&& list->next->debugging)
{
in_debug = 1;
return 1;
}
#endif
return 0;
}
line++;
if (strncmp (line, "def", 3) == 0)
return 1;
if (strncmp (line, "val", 3) == 0)
return 1;
if (strncmp (line, "scl", 3) == 0)
return 1;
if (strncmp (line, "line", 4) == 0)
return 1;
if (strncmp (line, "endef", 5) == 0)
return 1;
if (strncmp (line, "ln", 2) == 0)
return 1;
if (strncmp (line, "type", 4) == 0)
return 1;
if (strncmp (line, "size", 4) == 0)
return 1;
if (strncmp (line, "dim", 3) == 0)
return 1;
if (strncmp (line, "tag", 3) == 0)
return 1;
if (strncmp (line, "stabs", 5) == 0)
return 1;
if (strncmp (line, "stabn", 5) == 0)
return 1;
return 0;
}
static void
listing_listing (name)
char *name ATTRIBUTE_UNUSED;
1999-05-03 09:29:11 +02:00
{
list_info_type *list = head;
file_info_type *current_hll_file = (file_info_type *) NULL;
char *message;
char *buffer;
char *p;
int show_listing = 1;
unsigned int width;
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;
1999-05-03 09:29:11 +02:00
width = listing_rhs_width > paper_width ? paper_width :
listing_rhs_width;
list_line = list->line;
switch (list->edict)
{
case EDICT_LIST:
/* Skip all lines up to the current. */
list_line--;
break;
case EDICT_NOLIST:
show_listing--;
break;
case EDICT_NOLIST_NEXT:
break;
case EDICT_EJECT:
break;
case EDICT_NONE:
break;
case EDICT_TITLE:
title = list->edict_arg;
break;
case EDICT_SBTTL:
subtitle = list->edict_arg;
break;
default:
abort ();
}
if (show_listing <= 0)
{
while (list->file->linenum < list_line
&& !list->file->at_end)
p = buffer_line (list->file, buffer, width);
}
if (list->edict == EDICT_LIST)
{
/* Enable listing for the single line that caused the enable. */
list_line++;
show_listing++;
}
if (show_listing > 0)
{
/* 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 (current_hll_file && list->hll_line && (listing & LISTING_HLL))
{
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));
}
free (list->line_contents);
list->line_contents = NULL;
}
else
{
while (list->file->linenum < list_line
&& !list->file->at_end)
{
unsigned int address;
p = buffer_line (list->file, buffer, width);
if (list->file->linenum < list_line)
address = ~ (unsigned int) 0;
else
address = calc_hex (list);
if (!((listing & LISTING_NODEBUG)
&& debugging_pseudo (list, p)))
print_lines (list, list->file->linenum, p, address);
}
}
if (list->edict == EDICT_EJECT)
{
eject = 1;
}
}
if (list->edict == EDICT_NOLIST_NEXT)
--show_listing;
list = list->next;
}
free (buffer);
free (data_buffer);
data_buffer = NULL;
}
void
listing_print (name)
char *name;
{
int using_stdout;
title = "";
subtitle = "";
if (name == NULL)
{
list_file = stdout;
using_stdout = 1;
}
else
{
list_file = fopen (name, "w");
if (list_file != NULL)
using_stdout = 0;
else
{
as_perror (_("can't open list file: %s"), name);
list_file = stdout;
using_stdout = 1;
}
}
if (listing & LISTING_NOFORM)
{
paper_height = 0;
}
if (listing & LISTING_LISTING)
{
listing_listing (name);
}
if (listing & LISTING_SYMBOLS)
{
list_symbol_table ();
}
if (! using_stdout)
{
if (fclose (list_file) == EOF)
as_perror (_("error closing list file: %s"), name);
}
if (last_open_file)
{
fclose (last_open_file);
}
}
void
listing_file (name)
const char *name;
{
fn = name;
}
void
listing_eject (ignore)
int ignore ATTRIBUTE_UNUSED;
1999-05-03 09:29:11 +02:00
{
if (listing)
listing_tail->edict = EDICT_EJECT;
}
void
listing_flags (ignore)
int ignore ATTRIBUTE_UNUSED;
1999-05-03 09:29:11 +02:00
{
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,
the current line should be listed, but the next line should not. */
void
listing_list (on)
int on;
{
if (listing)
{
switch (on)
{
case 0:
if (listing_tail->edict == EDICT_LIST)
listing_tail->edict = EDICT_NONE;
else
listing_tail->edict = EDICT_NOLIST;
break;
case 1:
if (listing_tail->edict == EDICT_NOLIST
|| listing_tail->edict == EDICT_NOLIST_NEXT)
listing_tail->edict = EDICT_NONE;
else
listing_tail->edict = EDICT_LIST;
break;
case 2:
listing_tail->edict = EDICT_NOLIST_NEXT;
break;
default:
abort ();
}
}
}
void
listing_psize (width_only)
int width_only;
{
if (! width_only)
{
paper_height = get_absolute_expression ();
if (paper_height < 0 || paper_height > 1000)
{
paper_height = 0;
as_warn (_("strange paper height, set to no form"));
}
if (*input_line_pointer != ',')
{
demand_empty_rest_of_line ();
return;
}
++input_line_pointer;
}
paper_width = get_absolute_expression ();
demand_empty_rest_of_line ();
}
void
listing_nopage (ignore)
int ignore ATTRIBUTE_UNUSED;
1999-05-03 09:29:11 +02:00
{
paper_height = 0;
}
void
listing_title (depth)
int depth;
{
int quoted;
char *start;
char *ttl;
unsigned int length;
SKIP_WHITESPACE ();
if (*input_line_pointer != '\"')
quoted = 0;
else
{
quoted = 1;
++input_line_pointer;
}
start = input_line_pointer;
while (*input_line_pointer)
{
if (quoted
? *input_line_pointer == '\"'
: is_end_of_line[(unsigned char) *input_line_pointer])
{
if (listing)
{
length = input_line_pointer - start;
ttl = xmalloc (length + 1);
memcpy (ttl, start, length);
ttl[length] = 0;
listing_tail->edict = depth ? EDICT_SBTTL : EDICT_TITLE;
listing_tail->edict_arg = ttl;
}
if (quoted)
input_line_pointer++;
demand_empty_rest_of_line ();
return;
}
else if (*input_line_pointer == '\n')
{
as_bad (_("New line in title"));
demand_empty_rest_of_line ();
return;
}
else
{
input_line_pointer++;
}
}
}
void
listing_source_line (line)
unsigned int line;
{
if (listing)
{
new_frag ();
listing_tail->hll_line = line;
new_frag ();
}
}
void
listing_source_file (file)
const char *file;
{
if (listing)
listing_tail->hll_file = file_info (file);
}
#else
/* Dummy functions for when compiled without listing enabled */
void
listing_flags (ignore)
int ignore;
{
s_ignore (0);
}
void
listing_list (on)
int on;
{
s_ignore (0);
}
void
listing_eject (ignore)
int ignore;
{
s_ignore (0);
}
void
listing_psize (ignore)
int ignore;
{
s_ignore (0);
}
void
listing_nopage (ignore)
int ignore;
{
s_ignore (0);
}
void
listing_title (depth)
int depth;
{
s_ignore (0);
}
void
listing_file (name)
const char *name;
{
}
void
listing_newline (name)
char *name;
{
}
void
listing_source_line (n)
unsigned int n;
{
}
void
listing_source_file (n)
const char *n;
{
}
#endif