2003-11-23 03:14:21 +01:00
|
|
|
/* listing.c - maintain assembly listings
|
2001-03-31 08:47:54 +02:00
|
|
|
Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
|
2010-01-12 02:10:55 +01:00
|
|
|
2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010
|
1999-05-03 09:29:11 +02:00
|
|
|
Free Software Foundation, Inc.
|
|
|
|
|
2003-12-19 16:23:41 +01:00
|
|
|
This file is part of GAS, the GNU Assembler.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2003-12-19 16:23:41 +01:00
|
|
|
GAS is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-07-03 13:01:12 +02:00
|
|
|
the Free Software Foundation; either version 3, or (at your option)
|
2003-12-19 16:23:41 +01:00
|
|
|
any later version.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2003-12-19 16:23:41 +01:00
|
|
|
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.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2003-12-19 16:23:41 +01:00
|
|
|
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
|
2005-05-05 11:13:19 +02:00
|
|
|
Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
|
|
|
|
02110-1301, USA. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2003-12-19 16:23:41 +01:00
|
|
|
/* Contributed by Steve Chamberlain <sac@cygnus.com>
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
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
|
2003-10-27 13:45:17 +01:00
|
|
|
function also remembers when the filename changes.
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
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
|
|
|
|
|
2003-10-27 13:45:17 +01:00
|
|
|
LISTING_LHS_CONT_LINES Max number of lines to use up for a continuation
|
1999-05-03 09:29:11 +02:00
|
|
|
LISTING_RHS_WIDTH Number of chars from the input file to print
|
2003-12-19 16:23:41 +01:00
|
|
|
on a line. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
#include "as.h"
|
2011-02-28 19:32:52 +01:00
|
|
|
#include "filenames.h"
|
2002-05-25 14:53:29 +02:00
|
|
|
#include "obstack.h"
|
2001-09-19 07:33:36 +02:00
|
|
|
#include "safe-ctype.h"
|
1999-05-03 09:29:11 +02:00
|
|
|
#include "input-file.h"
|
|
|
|
#include "subsegs.h"
|
2008-04-10 14:45:18 +02:00
|
|
|
#include "bfdver.h"
|
|
|
|
#include <time.h>
|
2009-07-14 14:54:47 +02:00
|
|
|
#include <stdarg.h>
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
#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
|
2000-03-28 01:47:09 +02:00
|
|
|
#define LISTING_LHS_WIDTH ((LISTING_WORD_SIZE) > 4 ? 1 : 4 / (LISTING_WORD_SIZE))
|
1999-05-03 09:29:11 +02:00
|
|
|
#endif
|
|
|
|
#ifndef LISTING_LHS_WIDTH_SECOND
|
2000-03-28 01:47:09 +02:00
|
|
|
#define LISTING_LHS_WIDTH_SECOND LISTING_LHS_WIDTH
|
1999-05-03 09:29:11 +02:00
|
|
|
#endif
|
|
|
|
#ifndef LISTING_RHS_WIDTH
|
|
|
|
#define LISTING_RHS_WIDTH 100
|
|
|
|
#endif
|
|
|
|
#ifndef LISTING_LHS_CONT_LINES
|
|
|
|
#define LISTING_LHS_CONT_LINES 4
|
|
|
|
#endif
|
2008-04-10 14:45:18 +02:00
|
|
|
#define MAX_DATELEN 30
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
/* This structure remembers which .s were used. */
|
2003-12-19 16:23:41 +01:00
|
|
|
typedef struct file_info_struct
|
|
|
|
{
|
1999-05-03 09:29:11 +02:00
|
|
|
struct file_info_struct * next;
|
|
|
|
char * filename;
|
|
|
|
long pos;
|
|
|
|
unsigned int linenum;
|
|
|
|
int at_end;
|
2000-11-07 02:18:45 +01:00
|
|
|
} file_info_type;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2009-09-11 17:27:38 +02:00
|
|
|
enum edict_enum
|
|
|
|
{
|
|
|
|
EDICT_NONE,
|
|
|
|
EDICT_SBTTL,
|
|
|
|
EDICT_TITLE,
|
|
|
|
EDICT_NOLIST,
|
|
|
|
EDICT_LIST,
|
|
|
|
EDICT_NOLIST_NEXT,
|
|
|
|
EDICT_EJECT
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2012-07-27 05:32:21 +02:00
|
|
|
struct list_message
|
|
|
|
{
|
|
|
|
char *message;
|
|
|
|
struct list_message *next;
|
|
|
|
};
|
|
|
|
|
2003-10-27 13:45:17 +01:00
|
|
|
/* This structure remembers which line from which file goes into which
|
2000-08-31 08:11:03 +02:00
|
|
|
frag. */
|
2003-12-19 16:23:41 +01:00
|
|
|
struct list_info_struct
|
|
|
|
{
|
2000-08-31 08:11:03 +02:00
|
|
|
/* Frag which this line of source is nearest to. */
|
|
|
|
fragS *frag;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
/* The actual line in the source file. */
|
1999-05-03 09:29:11 +02:00
|
|
|
unsigned int line;
|
2003-12-19 16:23:41 +01:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
/* Pointer to the file info struct for the file which this line
|
2000-08-31 08:11:03 +02:00
|
|
|
belongs to. */
|
|
|
|
file_info_type *file;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
/* The expanded text of any macro that may have been executing. */
|
2000-08-31 08:11:03 +02:00
|
|
|
char *line_contents;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
/* Next in list. */
|
|
|
|
struct list_info_struct *next;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
/* Pointer to the file info struct for the high level language
|
2000-08-31 08:11:03 +02:00
|
|
|
source line that belongs here. */
|
|
|
|
file_info_type *hll_file;
|
2003-12-19 16:23:41 +01:00
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
/* High level language source line. */
|
1999-05-03 09:29:11 +02:00
|
|
|
unsigned int hll_line;
|
|
|
|
|
2012-07-27 05:32:21 +02:00
|
|
|
/* Pointers to linked list of messages associated with this line. */
|
|
|
|
struct list_message *messages, *last_message;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2009-09-11 17:27:38 +02:00
|
|
|
enum edict_enum edict;
|
2000-08-31 08:11:03 +02:00
|
|
|
char *edict_arg;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
/* 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. */
|
2000-11-07 02:18:45 +01:00
|
|
|
static FILE *list_file;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
/* 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)
|
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
static char *data_buffer;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
/* Prototypes. */
|
2003-12-19 16:23:41 +01:00
|
|
|
static void listing_message (const char *, const char *);
|
|
|
|
static file_info_type *file_info (const char *);
|
2003-11-24 18:52:33 +01:00
|
|
|
static void new_frag (void);
|
2003-12-19 16:23:41 +01:00
|
|
|
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);
|
2003-11-24 18:52:33 +01:00
|
|
|
static void list_symbol_table (void);
|
|
|
|
static int debugging_pseudo (list_info_type *, const char *);
|
2003-12-19 16:23:41 +01:00
|
|
|
static void listing_listing (char *);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
static void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_message (const char *name, const char *message)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
if (listing_tail != (list_info_type *) NULL)
|
|
|
|
{
|
2001-01-01 02:51:17 +01:00
|
|
|
unsigned int l = strlen (name) + strlen (message) + 1;
|
|
|
|
char *n = (char *) xmalloc (l);
|
2012-07-27 05:32:21 +02:00
|
|
|
struct list_message *lm = xmalloc (sizeof *lm);
|
2001-01-01 02:51:17 +01:00
|
|
|
strcpy (n, name);
|
|
|
|
strcat (n, message);
|
2012-07-27 05:32:21 +02:00
|
|
|
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;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_warning (const char *message)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
listing_message (_("Warning:"), message);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_error (const char *message)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
listing_message (_("Error:"), message);
|
|
|
|
}
|
|
|
|
|
|
|
|
static file_info_type *
|
2003-11-24 18:52:33 +01:00
|
|
|
file_info (const char *file_name)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2000-08-31 08:11:03 +02:00
|
|
|
/* Find an entry with this file name. */
|
1999-05-03 09:29:11 +02:00
|
|
|
file_info_type *p = file_info_head;
|
|
|
|
|
|
|
|
while (p != (file_info_type *) NULL)
|
|
|
|
{
|
2011-02-28 19:32:52 +01:00
|
|
|
if (filename_cmp (p->filename, file_name) == 0)
|
1999-05-03 09:29:11 +02:00
|
|
|
return p;
|
|
|
|
p = p->next;
|
|
|
|
}
|
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
/* Make new entry. */
|
2009-09-11 17:27:38 +02:00
|
|
|
p = (file_info_type *) xmalloc (sizeof (file_info_type));
|
1999-05-03 09:29:11 +02:00
|
|
|
p->next = file_info_head;
|
|
|
|
file_info_head = p;
|
2002-06-26 03:18:42 +02:00
|
|
|
p->filename = xstrdup (file_name);
|
1999-05-03 09:29:11 +02:00
|
|
|
p->pos = 0;
|
|
|
|
p->linenum = 0;
|
|
|
|
p->at_end = 0;
|
|
|
|
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2003-11-24 18:52:33 +01:00
|
|
|
new_frag (void)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
frag_wane (frag_now);
|
|
|
|
frag_new (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_newline (char *ps)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
char *file;
|
|
|
|
unsigned int line;
|
|
|
|
static unsigned int last_line = 0xffff;
|
|
|
|
static char *last_file = NULL;
|
Updated sources to avoid using the identifier name "new", which is a
keyword in c++.
* bfd/aoutx.h (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol.
* bfd/coffgen.c (coff_make_empty_symbol)
(coff_bfd_make_debug_symbol): Rename variable new to new_symbol.
* bfd/cpu-ia64-opc.c (ext_reg, ins_imms_scaled): Rename variable
new to new_insn.
* bfd/doc/chew.c (newentry, add_intrinsic): Rename variable new to
new_d.
* bfd/ecoff.c (_bfd_ecoff_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/elf32-m68k.c (elf_m68k_get_got_entry_type): Rename argument
new to new_reloc.
* bfd/hash.c (bfd_hash_lookup): Rename variable new to new_string.
* bfd/ieee.c (ieee_make_empty_symbol): Rename variable new to
new_symbol.
* bfd/linker.c (bfd_new_link_order): Rename variable new to
new_lo.
* bfd/mach-o.c (bfd_mach_o_sizeof_headers): Rename variable new to
symbol.
* bfd/oasys.c (oasys_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/pdp11.c (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol_type.
* bfd/plugin.c (bfd_plugin_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/rs6000-core.c (CoreHdr, VmInfo): Rename union member new to
new_dump.
(read_hdr, rs6000coff_core_p)
(rs6000coff_core_file_matches_executable_p)
(rs6000coff_core_file_failing_command)
(rs6000coff_core_file_failing_signal): Updated function to use new
union member name.
* bfd/som.c (som_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/syms.c (_bfd_generic_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/tekhex.c (first_phase, tekhex_make_empty_symbol): Rename
variable new to new_symbol.
* binutils/nlmconv.c (main): Rename variable new to new_name.
* gas/config/tc-arm.c (insert_reg_alias): Rename variable new to
new_reg.
* gas/config/tc-dlx.c (parse_operand): Rename variable new to
new_pos.
* gas/config/tc-ia64.c (ia64_gen_real_reloc_type): Rename variable
new to newr.
* gas/config/tc-mcore.c (parse_exp, parse_imm): Rename variable
new to new_pointer.
* gas/config/tc-microblaze.c (parse_exp, parse_imm, check_got):
Change name from new to new_pointer.
* gas/config/tc-or32.c (parse_operand): Rename variable new to
new_pointer.
* gas/config/tc-pdp11.c (md_assemble): Rename variable new to
new_pointer.
* gas/config/tc-pj.c (alias): Change argument new to new_name.
* gas/config/tc-score.c (s3_build_score_ops_hsh): Rename variable
new to new_opcode. (s3_build_dependency_insn_hsh) Rename variable
new to new_i2n. (s3_convert): Rename variables old and new to
r_old and r_new.
* gas/config/tc-score7.c (s7_build_score_ops_hsh): Rename variable
new to new_opcode. (s7_build_dependency_insn_hsh): Rename variable
new to new_i2d. (s7_b32_relax_to_b16, s7_convert_frag): Rename
variables old and new to r_old and r_new.
* gas/config/tc-sh.c (parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-sh64.c (shmedia_parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-tic4x.c (tic4x_operand_parse): Rename variable new
to new_pointer.
* gas/config/tc-z8k.c (parse_exp): Rename variable new to
new_pointer.
* gas/listing.c (listing_newline): Rename variable new to new_i.
* ld/ldexp.c (exp_intop, exp_bigintop, exp_relop, exp_binop)
(exp_trinop, exp_unop, exp_nameop, exp_assop): Rename variable new
to new_e.
* ld/ldfile.c (ldfile_add_library_path): Rename variable new to
new_dirs. (ldfile_add_arch): Rename variable new to new_arch.
* ld/ldlang.c (new_statement, lang_final, lang_add_wild)
(lang_target, lang_add_fill, lang_add_data, lang_add_assignment)
(lang_add_insert): Rename variable new to new_stmt. (new_afile):
Added missing cast. (lang_memory_region_lookup): Rename variable
new to new_region. (init_os): Rename variable new to
new_userdata. (lang_add_section): Rename variable new to
new_section. (ldlang_add_undef): Rename variable new to
new_undef. (realsymbol): Rename variable new to new_name.
* opcodes/z8kgen.c (internal, gas): Rename variable new to new_op.
Updated sources to avoid using the identifier name "template",
which is a keyword in c++.
* bfd/elf32-arm.c (struct stub_def): Rename member template to
template_sequence. (arm_build_one_stub,
find_stub_size_and_template, arm_size_one_stub, arm_map_one_stub):
Rename variable template to template_sequence.
* bfd/elfxx-ia64.c (elfNN_ia64_relax_br, elfNN_ia64_relax_brl):
Rename variable template to template_val.
* gas/config/tc-arm.c (struct asm_cond, struct asm_psr, struct
asm_barrier_opt): Change member template to
template_name. (md_begin): Update code to reflect new member
names.
* gas/config/tc-i386.c (struct templates, struct _i386_insn)
(match_template, cpu_flags_match, match_reg_size, match_mem_size)
(operand_size_match, md_begin, i386_print_statistics, pi)
(build_vex_prefix, md_assemble, parse_insn, optimize_imm)
(optimize_disp): Updated code to use new names. (parse_insn):
Added casts.
* gas/config/tc-ia64.c (dot_template, emit_one_bundle): Updated
code to use new names.
* gas/config/tc-score.c (struct s3_asm_opcode): Renamed member
template to template_name. (s3_parse_16_32_inst, s3_parse_48_inst,
s3_do_macro_ldst_label, s3_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-score7.c (struct s7_asm_opcode): Renamed member
template to template_name. (s7_parse_16_32_inst,
s7_do_macro_ldst_label, s7_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-tic30.c (md_begin, struct tic30_insn)
(md_assemble): Update code to use new names.
* gas/config/tc-tic54x.c (struct _tic54x_insn, md_begin)
(optimize_insn, tic54x_parse_insn, next_line_shows_parallel):
Update code to use new names.
* include/opcode/tic30.h (template): Rename type template to
insn_template. Updated code to use new name.
* include/opcode/tic54x.h (template): Rename type template to
insn_template.
* opcodes/cris-dis.c (bytes_to_skip): Update code to use new name.
* opcodes/i386-dis.c (putop): Update code to use new name.
* opcodes/i386-gen.c (process_i386_opcodes): Update code to use
new name.
* opcodes/i386-opc.h (struct template): Rename struct template to
insn_template. Update code accordingly.
* opcodes/i386-tbl.h (i386_optab): Update type to use new name.
* opcodes/ia64-dis.c (print_insn_ia64): Rename variable template
to template_val.
* opcodes/tic30-dis.c (struct instruction, get_tic30_instruction):
Update code to use new name.
* opcodes/tic54x-dis.c (has_lkaddr, get_insn_size)
(print_parallel_instruction, print_insn_tic54x, tic54x_get_insn):
Update code to use new name.
* opcodes/tic54x-opc.c (tic54x_unknown_opcode, tic54x_optab):
Update type to new name.
2009-08-30 00:11:02 +02:00
|
|
|
list_info_type *new_i = NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
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)
|
|
|
|
{
|
2000-08-31 08:11:03 +02:00
|
|
|
if (line == last_line
|
2011-02-28 19:32:52 +01:00
|
|
|
&& !(last_file && file && filename_cmp (file, last_file)))
|
1999-05-03 09:29:11 +02:00
|
|
|
return;
|
|
|
|
|
Updated sources to avoid using the identifier name "new", which is a
keyword in c++.
* bfd/aoutx.h (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol.
* bfd/coffgen.c (coff_make_empty_symbol)
(coff_bfd_make_debug_symbol): Rename variable new to new_symbol.
* bfd/cpu-ia64-opc.c (ext_reg, ins_imms_scaled): Rename variable
new to new_insn.
* bfd/doc/chew.c (newentry, add_intrinsic): Rename variable new to
new_d.
* bfd/ecoff.c (_bfd_ecoff_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/elf32-m68k.c (elf_m68k_get_got_entry_type): Rename argument
new to new_reloc.
* bfd/hash.c (bfd_hash_lookup): Rename variable new to new_string.
* bfd/ieee.c (ieee_make_empty_symbol): Rename variable new to
new_symbol.
* bfd/linker.c (bfd_new_link_order): Rename variable new to
new_lo.
* bfd/mach-o.c (bfd_mach_o_sizeof_headers): Rename variable new to
symbol.
* bfd/oasys.c (oasys_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/pdp11.c (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol_type.
* bfd/plugin.c (bfd_plugin_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/rs6000-core.c (CoreHdr, VmInfo): Rename union member new to
new_dump.
(read_hdr, rs6000coff_core_p)
(rs6000coff_core_file_matches_executable_p)
(rs6000coff_core_file_failing_command)
(rs6000coff_core_file_failing_signal): Updated function to use new
union member name.
* bfd/som.c (som_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/syms.c (_bfd_generic_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/tekhex.c (first_phase, tekhex_make_empty_symbol): Rename
variable new to new_symbol.
* binutils/nlmconv.c (main): Rename variable new to new_name.
* gas/config/tc-arm.c (insert_reg_alias): Rename variable new to
new_reg.
* gas/config/tc-dlx.c (parse_operand): Rename variable new to
new_pos.
* gas/config/tc-ia64.c (ia64_gen_real_reloc_type): Rename variable
new to newr.
* gas/config/tc-mcore.c (parse_exp, parse_imm): Rename variable
new to new_pointer.
* gas/config/tc-microblaze.c (parse_exp, parse_imm, check_got):
Change name from new to new_pointer.
* gas/config/tc-or32.c (parse_operand): Rename variable new to
new_pointer.
* gas/config/tc-pdp11.c (md_assemble): Rename variable new to
new_pointer.
* gas/config/tc-pj.c (alias): Change argument new to new_name.
* gas/config/tc-score.c (s3_build_score_ops_hsh): Rename variable
new to new_opcode. (s3_build_dependency_insn_hsh) Rename variable
new to new_i2n. (s3_convert): Rename variables old and new to
r_old and r_new.
* gas/config/tc-score7.c (s7_build_score_ops_hsh): Rename variable
new to new_opcode. (s7_build_dependency_insn_hsh): Rename variable
new to new_i2d. (s7_b32_relax_to_b16, s7_convert_frag): Rename
variables old and new to r_old and r_new.
* gas/config/tc-sh.c (parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-sh64.c (shmedia_parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-tic4x.c (tic4x_operand_parse): Rename variable new
to new_pointer.
* gas/config/tc-z8k.c (parse_exp): Rename variable new to
new_pointer.
* gas/listing.c (listing_newline): Rename variable new to new_i.
* ld/ldexp.c (exp_intop, exp_bigintop, exp_relop, exp_binop)
(exp_trinop, exp_unop, exp_nameop, exp_assop): Rename variable new
to new_e.
* ld/ldfile.c (ldfile_add_library_path): Rename variable new to
new_dirs. (ldfile_add_arch): Rename variable new to new_arch.
* ld/ldlang.c (new_statement, lang_final, lang_add_wild)
(lang_target, lang_add_fill, lang_add_data, lang_add_assignment)
(lang_add_insert): Rename variable new to new_stmt. (new_afile):
Added missing cast. (lang_memory_region_lookup): Rename variable
new to new_region. (init_os): Rename variable new to
new_userdata. (lang_add_section): Rename variable new to
new_section. (ldlang_add_undef): Rename variable new to
new_undef. (realsymbol): Rename variable new to new_name.
* opcodes/z8kgen.c (internal, gas): Rename variable new to new_op.
Updated sources to avoid using the identifier name "template",
which is a keyword in c++.
* bfd/elf32-arm.c (struct stub_def): Rename member template to
template_sequence. (arm_build_one_stub,
find_stub_size_and_template, arm_size_one_stub, arm_map_one_stub):
Rename variable template to template_sequence.
* bfd/elfxx-ia64.c (elfNN_ia64_relax_br, elfNN_ia64_relax_brl):
Rename variable template to template_val.
* gas/config/tc-arm.c (struct asm_cond, struct asm_psr, struct
asm_barrier_opt): Change member template to
template_name. (md_begin): Update code to reflect new member
names.
* gas/config/tc-i386.c (struct templates, struct _i386_insn)
(match_template, cpu_flags_match, match_reg_size, match_mem_size)
(operand_size_match, md_begin, i386_print_statistics, pi)
(build_vex_prefix, md_assemble, parse_insn, optimize_imm)
(optimize_disp): Updated code to use new names. (parse_insn):
Added casts.
* gas/config/tc-ia64.c (dot_template, emit_one_bundle): Updated
code to use new names.
* gas/config/tc-score.c (struct s3_asm_opcode): Renamed member
template to template_name. (s3_parse_16_32_inst, s3_parse_48_inst,
s3_do_macro_ldst_label, s3_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-score7.c (struct s7_asm_opcode): Renamed member
template to template_name. (s7_parse_16_32_inst,
s7_do_macro_ldst_label, s7_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-tic30.c (md_begin, struct tic30_insn)
(md_assemble): Update code to use new names.
* gas/config/tc-tic54x.c (struct _tic54x_insn, md_begin)
(optimize_insn, tic54x_parse_insn, next_line_shows_parallel):
Update code to use new names.
* include/opcode/tic30.h (template): Rename type template to
insn_template. Updated code to use new name.
* include/opcode/tic54x.h (template): Rename type template to
insn_template.
* opcodes/cris-dis.c (bytes_to_skip): Update code to use new name.
* opcodes/i386-dis.c (putop): Update code to use new name.
* opcodes/i386-gen.c (process_i386_opcodes): Update code to use
new name.
* opcodes/i386-opc.h (struct template): Rename struct template to
insn_template. Update code accordingly.
* opcodes/i386-tbl.h (i386_optab): Update type to use new name.
* opcodes/ia64-dis.c (print_insn_ia64): Rename variable template
to template_val.
* opcodes/tic30-dis.c (struct instruction, get_tic30_instruction):
Update code to use new name.
* opcodes/tic54x-dis.c (has_lkaddr, get_insn_size)
(print_parallel_instruction, print_insn_tic54x, tic54x_get_insn):
Update code to use new name.
* opcodes/tic54x-opc.c (tic54x_unknown_opcode, tic54x_optab):
Update type to new name.
2009-08-30 00:11:02 +02:00
|
|
|
new_i = (list_info_type *) xmalloc (sizeof (list_info_type));
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
/* 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].
|
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
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. */
|
1999-05-03 09:29:11 +02:00
|
|
|
if (strcmp (file, _("{standard input}")) == 0
|
|
|
|
&& input_line_pointer != NULL)
|
|
|
|
{
|
2000-08-31 08:11:03 +02:00
|
|
|
char *copy;
|
1999-05-03 09:29:11 +02:00
|
|
|
int len;
|
|
|
|
int seen_quote = 0;
|
2009-03-24 02:04:25 +01:00
|
|
|
int seen_slash = 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2009-10-15 12:58:34 +02:00
|
|
|
for (copy = input_line_pointer;
|
2000-08-31 08:11:03 +02:00
|
|
|
*copy && (seen_quote
|
2009-03-24 02:04:25 +01:00
|
|
|
|| is_end_of_line [(unsigned char) *copy] != 1);
|
2000-08-31 08:11:03 +02:00
|
|
|
copy++)
|
2009-03-24 02:04:25 +01:00
|
|
|
{
|
2010-03-09 01:41:24 +01:00
|
|
|
if (seen_slash)
|
|
|
|
seen_slash = 0;
|
|
|
|
else if (*copy == '\\')
|
|
|
|
seen_slash = 1;
|
|
|
|
else if (*copy == '"')
|
|
|
|
seen_quote = !seen_quote;
|
2009-03-24 02:04:25 +01:00
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2009-10-15 12:58:34 +02:00
|
|
|
len = copy - input_line_pointer + 1;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2009-09-11 17:27:38 +02:00
|
|
|
copy = (char *) xmalloc (len);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
if (copy != NULL)
|
|
|
|
{
|
2009-10-15 12:58:34 +02:00
|
|
|
char *src = input_line_pointer;
|
2000-08-31 08:11:03 +02:00
|
|
|
char *dest = copy;
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
while (--len)
|
|
|
|
{
|
2000-08-31 08:11:03 +02:00
|
|
|
unsigned char c = *src++;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
/* Omit control characters in the listing. */
|
2001-09-19 07:33:36 +02:00
|
|
|
if (!ISCNTRL (c))
|
2000-08-31 08:11:03 +02:00
|
|
|
*dest++ = c;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
2000-08-31 08:11:03 +02:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
*dest = 0;
|
|
|
|
}
|
2000-08-31 08:11:03 +02:00
|
|
|
|
Updated sources to avoid using the identifier name "new", which is a
keyword in c++.
* bfd/aoutx.h (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol.
* bfd/coffgen.c (coff_make_empty_symbol)
(coff_bfd_make_debug_symbol): Rename variable new to new_symbol.
* bfd/cpu-ia64-opc.c (ext_reg, ins_imms_scaled): Rename variable
new to new_insn.
* bfd/doc/chew.c (newentry, add_intrinsic): Rename variable new to
new_d.
* bfd/ecoff.c (_bfd_ecoff_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/elf32-m68k.c (elf_m68k_get_got_entry_type): Rename argument
new to new_reloc.
* bfd/hash.c (bfd_hash_lookup): Rename variable new to new_string.
* bfd/ieee.c (ieee_make_empty_symbol): Rename variable new to
new_symbol.
* bfd/linker.c (bfd_new_link_order): Rename variable new to
new_lo.
* bfd/mach-o.c (bfd_mach_o_sizeof_headers): Rename variable new to
symbol.
* bfd/oasys.c (oasys_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/pdp11.c (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol_type.
* bfd/plugin.c (bfd_plugin_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/rs6000-core.c (CoreHdr, VmInfo): Rename union member new to
new_dump.
(read_hdr, rs6000coff_core_p)
(rs6000coff_core_file_matches_executable_p)
(rs6000coff_core_file_failing_command)
(rs6000coff_core_file_failing_signal): Updated function to use new
union member name.
* bfd/som.c (som_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/syms.c (_bfd_generic_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/tekhex.c (first_phase, tekhex_make_empty_symbol): Rename
variable new to new_symbol.
* binutils/nlmconv.c (main): Rename variable new to new_name.
* gas/config/tc-arm.c (insert_reg_alias): Rename variable new to
new_reg.
* gas/config/tc-dlx.c (parse_operand): Rename variable new to
new_pos.
* gas/config/tc-ia64.c (ia64_gen_real_reloc_type): Rename variable
new to newr.
* gas/config/tc-mcore.c (parse_exp, parse_imm): Rename variable
new to new_pointer.
* gas/config/tc-microblaze.c (parse_exp, parse_imm, check_got):
Change name from new to new_pointer.
* gas/config/tc-or32.c (parse_operand): Rename variable new to
new_pointer.
* gas/config/tc-pdp11.c (md_assemble): Rename variable new to
new_pointer.
* gas/config/tc-pj.c (alias): Change argument new to new_name.
* gas/config/tc-score.c (s3_build_score_ops_hsh): Rename variable
new to new_opcode. (s3_build_dependency_insn_hsh) Rename variable
new to new_i2n. (s3_convert): Rename variables old and new to
r_old and r_new.
* gas/config/tc-score7.c (s7_build_score_ops_hsh): Rename variable
new to new_opcode. (s7_build_dependency_insn_hsh): Rename variable
new to new_i2d. (s7_b32_relax_to_b16, s7_convert_frag): Rename
variables old and new to r_old and r_new.
* gas/config/tc-sh.c (parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-sh64.c (shmedia_parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-tic4x.c (tic4x_operand_parse): Rename variable new
to new_pointer.
* gas/config/tc-z8k.c (parse_exp): Rename variable new to
new_pointer.
* gas/listing.c (listing_newline): Rename variable new to new_i.
* ld/ldexp.c (exp_intop, exp_bigintop, exp_relop, exp_binop)
(exp_trinop, exp_unop, exp_nameop, exp_assop): Rename variable new
to new_e.
* ld/ldfile.c (ldfile_add_library_path): Rename variable new to
new_dirs. (ldfile_add_arch): Rename variable new to new_arch.
* ld/ldlang.c (new_statement, lang_final, lang_add_wild)
(lang_target, lang_add_fill, lang_add_data, lang_add_assignment)
(lang_add_insert): Rename variable new to new_stmt. (new_afile):
Added missing cast. (lang_memory_region_lookup): Rename variable
new to new_region. (init_os): Rename variable new to
new_userdata. (lang_add_section): Rename variable new to
new_section. (ldlang_add_undef): Rename variable new to
new_undef. (realsymbol): Rename variable new to new_name.
* opcodes/z8kgen.c (internal, gas): Rename variable new to new_op.
Updated sources to avoid using the identifier name "template",
which is a keyword in c++.
* bfd/elf32-arm.c (struct stub_def): Rename member template to
template_sequence. (arm_build_one_stub,
find_stub_size_and_template, arm_size_one_stub, arm_map_one_stub):
Rename variable template to template_sequence.
* bfd/elfxx-ia64.c (elfNN_ia64_relax_br, elfNN_ia64_relax_brl):
Rename variable template to template_val.
* gas/config/tc-arm.c (struct asm_cond, struct asm_psr, struct
asm_barrier_opt): Change member template to
template_name. (md_begin): Update code to reflect new member
names.
* gas/config/tc-i386.c (struct templates, struct _i386_insn)
(match_template, cpu_flags_match, match_reg_size, match_mem_size)
(operand_size_match, md_begin, i386_print_statistics, pi)
(build_vex_prefix, md_assemble, parse_insn, optimize_imm)
(optimize_disp): Updated code to use new names. (parse_insn):
Added casts.
* gas/config/tc-ia64.c (dot_template, emit_one_bundle): Updated
code to use new names.
* gas/config/tc-score.c (struct s3_asm_opcode): Renamed member
template to template_name. (s3_parse_16_32_inst, s3_parse_48_inst,
s3_do_macro_ldst_label, s3_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-score7.c (struct s7_asm_opcode): Renamed member
template to template_name. (s7_parse_16_32_inst,
s7_do_macro_ldst_label, s7_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-tic30.c (md_begin, struct tic30_insn)
(md_assemble): Update code to use new names.
* gas/config/tc-tic54x.c (struct _tic54x_insn, md_begin)
(optimize_insn, tic54x_parse_insn, next_line_shows_parallel):
Update code to use new names.
* include/opcode/tic30.h (template): Rename type template to
insn_template. Updated code to use new name.
* include/opcode/tic54x.h (template): Rename type template to
insn_template.
* opcodes/cris-dis.c (bytes_to_skip): Update code to use new name.
* opcodes/i386-dis.c (putop): Update code to use new name.
* opcodes/i386-gen.c (process_i386_opcodes): Update code to use
new name.
* opcodes/i386-opc.h (struct template): Rename struct template to
insn_template. Update code accordingly.
* opcodes/i386-tbl.h (i386_optab): Update type to use new name.
* opcodes/ia64-dis.c (print_insn_ia64): Rename variable template
to template_val.
* opcodes/tic30-dis.c (struct instruction, get_tic30_instruction):
Update code to use new name.
* opcodes/tic54x-dis.c (has_lkaddr, get_insn_size)
(print_parallel_instruction, print_insn_tic54x, tic54x_get_insn):
Update code to use new name.
* opcodes/tic54x-opc.c (tic54x_unknown_opcode, tic54x_optab):
Update type to new name.
2009-08-30 00:11:02 +02:00
|
|
|
new_i->line_contents = copy;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
else
|
Updated sources to avoid using the identifier name "new", which is a
keyword in c++.
* bfd/aoutx.h (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol.
* bfd/coffgen.c (coff_make_empty_symbol)
(coff_bfd_make_debug_symbol): Rename variable new to new_symbol.
* bfd/cpu-ia64-opc.c (ext_reg, ins_imms_scaled): Rename variable
new to new_insn.
* bfd/doc/chew.c (newentry, add_intrinsic): Rename variable new to
new_d.
* bfd/ecoff.c (_bfd_ecoff_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/elf32-m68k.c (elf_m68k_get_got_entry_type): Rename argument
new to new_reloc.
* bfd/hash.c (bfd_hash_lookup): Rename variable new to new_string.
* bfd/ieee.c (ieee_make_empty_symbol): Rename variable new to
new_symbol.
* bfd/linker.c (bfd_new_link_order): Rename variable new to
new_lo.
* bfd/mach-o.c (bfd_mach_o_sizeof_headers): Rename variable new to
symbol.
* bfd/oasys.c (oasys_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/pdp11.c (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol_type.
* bfd/plugin.c (bfd_plugin_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/rs6000-core.c (CoreHdr, VmInfo): Rename union member new to
new_dump.
(read_hdr, rs6000coff_core_p)
(rs6000coff_core_file_matches_executable_p)
(rs6000coff_core_file_failing_command)
(rs6000coff_core_file_failing_signal): Updated function to use new
union member name.
* bfd/som.c (som_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/syms.c (_bfd_generic_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/tekhex.c (first_phase, tekhex_make_empty_symbol): Rename
variable new to new_symbol.
* binutils/nlmconv.c (main): Rename variable new to new_name.
* gas/config/tc-arm.c (insert_reg_alias): Rename variable new to
new_reg.
* gas/config/tc-dlx.c (parse_operand): Rename variable new to
new_pos.
* gas/config/tc-ia64.c (ia64_gen_real_reloc_type): Rename variable
new to newr.
* gas/config/tc-mcore.c (parse_exp, parse_imm): Rename variable
new to new_pointer.
* gas/config/tc-microblaze.c (parse_exp, parse_imm, check_got):
Change name from new to new_pointer.
* gas/config/tc-or32.c (parse_operand): Rename variable new to
new_pointer.
* gas/config/tc-pdp11.c (md_assemble): Rename variable new to
new_pointer.
* gas/config/tc-pj.c (alias): Change argument new to new_name.
* gas/config/tc-score.c (s3_build_score_ops_hsh): Rename variable
new to new_opcode. (s3_build_dependency_insn_hsh) Rename variable
new to new_i2n. (s3_convert): Rename variables old and new to
r_old and r_new.
* gas/config/tc-score7.c (s7_build_score_ops_hsh): Rename variable
new to new_opcode. (s7_build_dependency_insn_hsh): Rename variable
new to new_i2d. (s7_b32_relax_to_b16, s7_convert_frag): Rename
variables old and new to r_old and r_new.
* gas/config/tc-sh.c (parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-sh64.c (shmedia_parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-tic4x.c (tic4x_operand_parse): Rename variable new
to new_pointer.
* gas/config/tc-z8k.c (parse_exp): Rename variable new to
new_pointer.
* gas/listing.c (listing_newline): Rename variable new to new_i.
* ld/ldexp.c (exp_intop, exp_bigintop, exp_relop, exp_binop)
(exp_trinop, exp_unop, exp_nameop, exp_assop): Rename variable new
to new_e.
* ld/ldfile.c (ldfile_add_library_path): Rename variable new to
new_dirs. (ldfile_add_arch): Rename variable new to new_arch.
* ld/ldlang.c (new_statement, lang_final, lang_add_wild)
(lang_target, lang_add_fill, lang_add_data, lang_add_assignment)
(lang_add_insert): Rename variable new to new_stmt. (new_afile):
Added missing cast. (lang_memory_region_lookup): Rename variable
new to new_region. (init_os): Rename variable new to
new_userdata. (lang_add_section): Rename variable new to
new_section. (ldlang_add_undef): Rename variable new to
new_undef. (realsymbol): Rename variable new to new_name.
* opcodes/z8kgen.c (internal, gas): Rename variable new to new_op.
Updated sources to avoid using the identifier name "template",
which is a keyword in c++.
* bfd/elf32-arm.c (struct stub_def): Rename member template to
template_sequence. (arm_build_one_stub,
find_stub_size_and_template, arm_size_one_stub, arm_map_one_stub):
Rename variable template to template_sequence.
* bfd/elfxx-ia64.c (elfNN_ia64_relax_br, elfNN_ia64_relax_brl):
Rename variable template to template_val.
* gas/config/tc-arm.c (struct asm_cond, struct asm_psr, struct
asm_barrier_opt): Change member template to
template_name. (md_begin): Update code to reflect new member
names.
* gas/config/tc-i386.c (struct templates, struct _i386_insn)
(match_template, cpu_flags_match, match_reg_size, match_mem_size)
(operand_size_match, md_begin, i386_print_statistics, pi)
(build_vex_prefix, md_assemble, parse_insn, optimize_imm)
(optimize_disp): Updated code to use new names. (parse_insn):
Added casts.
* gas/config/tc-ia64.c (dot_template, emit_one_bundle): Updated
code to use new names.
* gas/config/tc-score.c (struct s3_asm_opcode): Renamed member
template to template_name. (s3_parse_16_32_inst, s3_parse_48_inst,
s3_do_macro_ldst_label, s3_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-score7.c (struct s7_asm_opcode): Renamed member
template to template_name. (s7_parse_16_32_inst,
s7_do_macro_ldst_label, s7_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-tic30.c (md_begin, struct tic30_insn)
(md_assemble): Update code to use new names.
* gas/config/tc-tic54x.c (struct _tic54x_insn, md_begin)
(optimize_insn, tic54x_parse_insn, next_line_shows_parallel):
Update code to use new names.
* include/opcode/tic30.h (template): Rename type template to
insn_template. Updated code to use new name.
* include/opcode/tic54x.h (template): Rename type template to
insn_template.
* opcodes/cris-dis.c (bytes_to_skip): Update code to use new name.
* opcodes/i386-dis.c (putop): Update code to use new name.
* opcodes/i386-gen.c (process_i386_opcodes): Update code to use
new name.
* opcodes/i386-opc.h (struct template): Rename struct template to
insn_template. Update code accordingly.
* opcodes/i386-tbl.h (i386_optab): Update type to use new name.
* opcodes/ia64-dis.c (print_insn_ia64): Rename variable template
to template_val.
* opcodes/tic30-dis.c (struct instruction, get_tic30_instruction):
Update code to use new name.
* opcodes/tic54x-dis.c (has_lkaddr, get_insn_size)
(print_parallel_instruction, print_insn_tic54x, tic54x_get_insn):
Update code to use new name.
* opcodes/tic54x-opc.c (tic54x_unknown_opcode, tic54x_optab):
Update type to new name.
2009-08-30 00:11:02 +02:00
|
|
|
new_i->line_contents = NULL;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
Updated sources to avoid using the identifier name "new", which is a
keyword in c++.
* bfd/aoutx.h (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol.
* bfd/coffgen.c (coff_make_empty_symbol)
(coff_bfd_make_debug_symbol): Rename variable new to new_symbol.
* bfd/cpu-ia64-opc.c (ext_reg, ins_imms_scaled): Rename variable
new to new_insn.
* bfd/doc/chew.c (newentry, add_intrinsic): Rename variable new to
new_d.
* bfd/ecoff.c (_bfd_ecoff_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/elf32-m68k.c (elf_m68k_get_got_entry_type): Rename argument
new to new_reloc.
* bfd/hash.c (bfd_hash_lookup): Rename variable new to new_string.
* bfd/ieee.c (ieee_make_empty_symbol): Rename variable new to
new_symbol.
* bfd/linker.c (bfd_new_link_order): Rename variable new to
new_lo.
* bfd/mach-o.c (bfd_mach_o_sizeof_headers): Rename variable new to
symbol.
* bfd/oasys.c (oasys_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/pdp11.c (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol_type.
* bfd/plugin.c (bfd_plugin_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/rs6000-core.c (CoreHdr, VmInfo): Rename union member new to
new_dump.
(read_hdr, rs6000coff_core_p)
(rs6000coff_core_file_matches_executable_p)
(rs6000coff_core_file_failing_command)
(rs6000coff_core_file_failing_signal): Updated function to use new
union member name.
* bfd/som.c (som_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/syms.c (_bfd_generic_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/tekhex.c (first_phase, tekhex_make_empty_symbol): Rename
variable new to new_symbol.
* binutils/nlmconv.c (main): Rename variable new to new_name.
* gas/config/tc-arm.c (insert_reg_alias): Rename variable new to
new_reg.
* gas/config/tc-dlx.c (parse_operand): Rename variable new to
new_pos.
* gas/config/tc-ia64.c (ia64_gen_real_reloc_type): Rename variable
new to newr.
* gas/config/tc-mcore.c (parse_exp, parse_imm): Rename variable
new to new_pointer.
* gas/config/tc-microblaze.c (parse_exp, parse_imm, check_got):
Change name from new to new_pointer.
* gas/config/tc-or32.c (parse_operand): Rename variable new to
new_pointer.
* gas/config/tc-pdp11.c (md_assemble): Rename variable new to
new_pointer.
* gas/config/tc-pj.c (alias): Change argument new to new_name.
* gas/config/tc-score.c (s3_build_score_ops_hsh): Rename variable
new to new_opcode. (s3_build_dependency_insn_hsh) Rename variable
new to new_i2n. (s3_convert): Rename variables old and new to
r_old and r_new.
* gas/config/tc-score7.c (s7_build_score_ops_hsh): Rename variable
new to new_opcode. (s7_build_dependency_insn_hsh): Rename variable
new to new_i2d. (s7_b32_relax_to_b16, s7_convert_frag): Rename
variables old and new to r_old and r_new.
* gas/config/tc-sh.c (parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-sh64.c (shmedia_parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-tic4x.c (tic4x_operand_parse): Rename variable new
to new_pointer.
* gas/config/tc-z8k.c (parse_exp): Rename variable new to
new_pointer.
* gas/listing.c (listing_newline): Rename variable new to new_i.
* ld/ldexp.c (exp_intop, exp_bigintop, exp_relop, exp_binop)
(exp_trinop, exp_unop, exp_nameop, exp_assop): Rename variable new
to new_e.
* ld/ldfile.c (ldfile_add_library_path): Rename variable new to
new_dirs. (ldfile_add_arch): Rename variable new to new_arch.
* ld/ldlang.c (new_statement, lang_final, lang_add_wild)
(lang_target, lang_add_fill, lang_add_data, lang_add_assignment)
(lang_add_insert): Rename variable new to new_stmt. (new_afile):
Added missing cast. (lang_memory_region_lookup): Rename variable
new to new_region. (init_os): Rename variable new to
new_userdata. (lang_add_section): Rename variable new to
new_section. (ldlang_add_undef): Rename variable new to
new_undef. (realsymbol): Rename variable new to new_name.
* opcodes/z8kgen.c (internal, gas): Rename variable new to new_op.
Updated sources to avoid using the identifier name "template",
which is a keyword in c++.
* bfd/elf32-arm.c (struct stub_def): Rename member template to
template_sequence. (arm_build_one_stub,
find_stub_size_and_template, arm_size_one_stub, arm_map_one_stub):
Rename variable template to template_sequence.
* bfd/elfxx-ia64.c (elfNN_ia64_relax_br, elfNN_ia64_relax_brl):
Rename variable template to template_val.
* gas/config/tc-arm.c (struct asm_cond, struct asm_psr, struct
asm_barrier_opt): Change member template to
template_name. (md_begin): Update code to reflect new member
names.
* gas/config/tc-i386.c (struct templates, struct _i386_insn)
(match_template, cpu_flags_match, match_reg_size, match_mem_size)
(operand_size_match, md_begin, i386_print_statistics, pi)
(build_vex_prefix, md_assemble, parse_insn, optimize_imm)
(optimize_disp): Updated code to use new names. (parse_insn):
Added casts.
* gas/config/tc-ia64.c (dot_template, emit_one_bundle): Updated
code to use new names.
* gas/config/tc-score.c (struct s3_asm_opcode): Renamed member
template to template_name. (s3_parse_16_32_inst, s3_parse_48_inst,
s3_do_macro_ldst_label, s3_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-score7.c (struct s7_asm_opcode): Renamed member
template to template_name. (s7_parse_16_32_inst,
s7_do_macro_ldst_label, s7_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-tic30.c (md_begin, struct tic30_insn)
(md_assemble): Update code to use new names.
* gas/config/tc-tic54x.c (struct _tic54x_insn, md_begin)
(optimize_insn, tic54x_parse_insn, next_line_shows_parallel):
Update code to use new names.
* include/opcode/tic30.h (template): Rename type template to
insn_template. Updated code to use new name.
* include/opcode/tic54x.h (template): Rename type template to
insn_template.
* opcodes/cris-dis.c (bytes_to_skip): Update code to use new name.
* opcodes/i386-dis.c (putop): Update code to use new name.
* opcodes/i386-gen.c (process_i386_opcodes): Update code to use
new name.
* opcodes/i386-opc.h (struct template): Rename struct template to
insn_template. Update code accordingly.
* opcodes/i386-tbl.h (i386_optab): Update type to use new name.
* opcodes/ia64-dis.c (print_insn_ia64): Rename variable template
to template_val.
* opcodes/tic30-dis.c (struct instruction, get_tic30_instruction):
Update code to use new name.
* opcodes/tic54x-dis.c (has_lkaddr, get_insn_size)
(print_parallel_instruction, print_insn_tic54x, tic54x_get_insn):
Update code to use new name.
* opcodes/tic54x-opc.c (tic54x_unknown_opcode, tic54x_optab):
Update type to new name.
2009-08-30 00:11:02 +02:00
|
|
|
new_i = (list_info_type *) xmalloc (sizeof (list_info_type));
|
|
|
|
new_i->line_contents = ps;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
last_line = line;
|
|
|
|
last_file = file;
|
2000-08-31 08:11:03 +02:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
new_frag ();
|
|
|
|
|
|
|
|
if (listing_tail)
|
Updated sources to avoid using the identifier name "new", which is a
keyword in c++.
* bfd/aoutx.h (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol.
* bfd/coffgen.c (coff_make_empty_symbol)
(coff_bfd_make_debug_symbol): Rename variable new to new_symbol.
* bfd/cpu-ia64-opc.c (ext_reg, ins_imms_scaled): Rename variable
new to new_insn.
* bfd/doc/chew.c (newentry, add_intrinsic): Rename variable new to
new_d.
* bfd/ecoff.c (_bfd_ecoff_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/elf32-m68k.c (elf_m68k_get_got_entry_type): Rename argument
new to new_reloc.
* bfd/hash.c (bfd_hash_lookup): Rename variable new to new_string.
* bfd/ieee.c (ieee_make_empty_symbol): Rename variable new to
new_symbol.
* bfd/linker.c (bfd_new_link_order): Rename variable new to
new_lo.
* bfd/mach-o.c (bfd_mach_o_sizeof_headers): Rename variable new to
symbol.
* bfd/oasys.c (oasys_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/pdp11.c (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol_type.
* bfd/plugin.c (bfd_plugin_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/rs6000-core.c (CoreHdr, VmInfo): Rename union member new to
new_dump.
(read_hdr, rs6000coff_core_p)
(rs6000coff_core_file_matches_executable_p)
(rs6000coff_core_file_failing_command)
(rs6000coff_core_file_failing_signal): Updated function to use new
union member name.
* bfd/som.c (som_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/syms.c (_bfd_generic_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/tekhex.c (first_phase, tekhex_make_empty_symbol): Rename
variable new to new_symbol.
* binutils/nlmconv.c (main): Rename variable new to new_name.
* gas/config/tc-arm.c (insert_reg_alias): Rename variable new to
new_reg.
* gas/config/tc-dlx.c (parse_operand): Rename variable new to
new_pos.
* gas/config/tc-ia64.c (ia64_gen_real_reloc_type): Rename variable
new to newr.
* gas/config/tc-mcore.c (parse_exp, parse_imm): Rename variable
new to new_pointer.
* gas/config/tc-microblaze.c (parse_exp, parse_imm, check_got):
Change name from new to new_pointer.
* gas/config/tc-or32.c (parse_operand): Rename variable new to
new_pointer.
* gas/config/tc-pdp11.c (md_assemble): Rename variable new to
new_pointer.
* gas/config/tc-pj.c (alias): Change argument new to new_name.
* gas/config/tc-score.c (s3_build_score_ops_hsh): Rename variable
new to new_opcode. (s3_build_dependency_insn_hsh) Rename variable
new to new_i2n. (s3_convert): Rename variables old and new to
r_old and r_new.
* gas/config/tc-score7.c (s7_build_score_ops_hsh): Rename variable
new to new_opcode. (s7_build_dependency_insn_hsh): Rename variable
new to new_i2d. (s7_b32_relax_to_b16, s7_convert_frag): Rename
variables old and new to r_old and r_new.
* gas/config/tc-sh.c (parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-sh64.c (shmedia_parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-tic4x.c (tic4x_operand_parse): Rename variable new
to new_pointer.
* gas/config/tc-z8k.c (parse_exp): Rename variable new to
new_pointer.
* gas/listing.c (listing_newline): Rename variable new to new_i.
* ld/ldexp.c (exp_intop, exp_bigintop, exp_relop, exp_binop)
(exp_trinop, exp_unop, exp_nameop, exp_assop): Rename variable new
to new_e.
* ld/ldfile.c (ldfile_add_library_path): Rename variable new to
new_dirs. (ldfile_add_arch): Rename variable new to new_arch.
* ld/ldlang.c (new_statement, lang_final, lang_add_wild)
(lang_target, lang_add_fill, lang_add_data, lang_add_assignment)
(lang_add_insert): Rename variable new to new_stmt. (new_afile):
Added missing cast. (lang_memory_region_lookup): Rename variable
new to new_region. (init_os): Rename variable new to
new_userdata. (lang_add_section): Rename variable new to
new_section. (ldlang_add_undef): Rename variable new to
new_undef. (realsymbol): Rename variable new to new_name.
* opcodes/z8kgen.c (internal, gas): Rename variable new to new_op.
Updated sources to avoid using the identifier name "template",
which is a keyword in c++.
* bfd/elf32-arm.c (struct stub_def): Rename member template to
template_sequence. (arm_build_one_stub,
find_stub_size_and_template, arm_size_one_stub, arm_map_one_stub):
Rename variable template to template_sequence.
* bfd/elfxx-ia64.c (elfNN_ia64_relax_br, elfNN_ia64_relax_brl):
Rename variable template to template_val.
* gas/config/tc-arm.c (struct asm_cond, struct asm_psr, struct
asm_barrier_opt): Change member template to
template_name. (md_begin): Update code to reflect new member
names.
* gas/config/tc-i386.c (struct templates, struct _i386_insn)
(match_template, cpu_flags_match, match_reg_size, match_mem_size)
(operand_size_match, md_begin, i386_print_statistics, pi)
(build_vex_prefix, md_assemble, parse_insn, optimize_imm)
(optimize_disp): Updated code to use new names. (parse_insn):
Added casts.
* gas/config/tc-ia64.c (dot_template, emit_one_bundle): Updated
code to use new names.
* gas/config/tc-score.c (struct s3_asm_opcode): Renamed member
template to template_name. (s3_parse_16_32_inst, s3_parse_48_inst,
s3_do_macro_ldst_label, s3_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-score7.c (struct s7_asm_opcode): Renamed member
template to template_name. (s7_parse_16_32_inst,
s7_do_macro_ldst_label, s7_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-tic30.c (md_begin, struct tic30_insn)
(md_assemble): Update code to use new names.
* gas/config/tc-tic54x.c (struct _tic54x_insn, md_begin)
(optimize_insn, tic54x_parse_insn, next_line_shows_parallel):
Update code to use new names.
* include/opcode/tic30.h (template): Rename type template to
insn_template. Updated code to use new name.
* include/opcode/tic54x.h (template): Rename type template to
insn_template.
* opcodes/cris-dis.c (bytes_to_skip): Update code to use new name.
* opcodes/i386-dis.c (putop): Update code to use new name.
* opcodes/i386-gen.c (process_i386_opcodes): Update code to use
new name.
* opcodes/i386-opc.h (struct template): Rename struct template to
insn_template. Update code accordingly.
* opcodes/i386-tbl.h (i386_optab): Update type to use new name.
* opcodes/ia64-dis.c (print_insn_ia64): Rename variable template
to template_val.
* opcodes/tic30-dis.c (struct instruction, get_tic30_instruction):
Update code to use new name.
* opcodes/tic54x-dis.c (has_lkaddr, get_insn_size)
(print_parallel_instruction, print_insn_tic54x, tic54x_get_insn):
Update code to use new name.
* opcodes/tic54x-opc.c (tic54x_unknown_opcode, tic54x_optab):
Update type to new name.
2009-08-30 00:11:02 +02:00
|
|
|
listing_tail->next = new_i;
|
1999-05-03 09:29:11 +02:00
|
|
|
else
|
Updated sources to avoid using the identifier name "new", which is a
keyword in c++.
* bfd/aoutx.h (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol.
* bfd/coffgen.c (coff_make_empty_symbol)
(coff_bfd_make_debug_symbol): Rename variable new to new_symbol.
* bfd/cpu-ia64-opc.c (ext_reg, ins_imms_scaled): Rename variable
new to new_insn.
* bfd/doc/chew.c (newentry, add_intrinsic): Rename variable new to
new_d.
* bfd/ecoff.c (_bfd_ecoff_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/elf32-m68k.c (elf_m68k_get_got_entry_type): Rename argument
new to new_reloc.
* bfd/hash.c (bfd_hash_lookup): Rename variable new to new_string.
* bfd/ieee.c (ieee_make_empty_symbol): Rename variable new to
new_symbol.
* bfd/linker.c (bfd_new_link_order): Rename variable new to
new_lo.
* bfd/mach-o.c (bfd_mach_o_sizeof_headers): Rename variable new to
symbol.
* bfd/oasys.c (oasys_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/pdp11.c (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol_type.
* bfd/plugin.c (bfd_plugin_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/rs6000-core.c (CoreHdr, VmInfo): Rename union member new to
new_dump.
(read_hdr, rs6000coff_core_p)
(rs6000coff_core_file_matches_executable_p)
(rs6000coff_core_file_failing_command)
(rs6000coff_core_file_failing_signal): Updated function to use new
union member name.
* bfd/som.c (som_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/syms.c (_bfd_generic_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/tekhex.c (first_phase, tekhex_make_empty_symbol): Rename
variable new to new_symbol.
* binutils/nlmconv.c (main): Rename variable new to new_name.
* gas/config/tc-arm.c (insert_reg_alias): Rename variable new to
new_reg.
* gas/config/tc-dlx.c (parse_operand): Rename variable new to
new_pos.
* gas/config/tc-ia64.c (ia64_gen_real_reloc_type): Rename variable
new to newr.
* gas/config/tc-mcore.c (parse_exp, parse_imm): Rename variable
new to new_pointer.
* gas/config/tc-microblaze.c (parse_exp, parse_imm, check_got):
Change name from new to new_pointer.
* gas/config/tc-or32.c (parse_operand): Rename variable new to
new_pointer.
* gas/config/tc-pdp11.c (md_assemble): Rename variable new to
new_pointer.
* gas/config/tc-pj.c (alias): Change argument new to new_name.
* gas/config/tc-score.c (s3_build_score_ops_hsh): Rename variable
new to new_opcode. (s3_build_dependency_insn_hsh) Rename variable
new to new_i2n. (s3_convert): Rename variables old and new to
r_old and r_new.
* gas/config/tc-score7.c (s7_build_score_ops_hsh): Rename variable
new to new_opcode. (s7_build_dependency_insn_hsh): Rename variable
new to new_i2d. (s7_b32_relax_to_b16, s7_convert_frag): Rename
variables old and new to r_old and r_new.
* gas/config/tc-sh.c (parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-sh64.c (shmedia_parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-tic4x.c (tic4x_operand_parse): Rename variable new
to new_pointer.
* gas/config/tc-z8k.c (parse_exp): Rename variable new to
new_pointer.
* gas/listing.c (listing_newline): Rename variable new to new_i.
* ld/ldexp.c (exp_intop, exp_bigintop, exp_relop, exp_binop)
(exp_trinop, exp_unop, exp_nameop, exp_assop): Rename variable new
to new_e.
* ld/ldfile.c (ldfile_add_library_path): Rename variable new to
new_dirs. (ldfile_add_arch): Rename variable new to new_arch.
* ld/ldlang.c (new_statement, lang_final, lang_add_wild)
(lang_target, lang_add_fill, lang_add_data, lang_add_assignment)
(lang_add_insert): Rename variable new to new_stmt. (new_afile):
Added missing cast. (lang_memory_region_lookup): Rename variable
new to new_region. (init_os): Rename variable new to
new_userdata. (lang_add_section): Rename variable new to
new_section. (ldlang_add_undef): Rename variable new to
new_undef. (realsymbol): Rename variable new to new_name.
* opcodes/z8kgen.c (internal, gas): Rename variable new to new_op.
Updated sources to avoid using the identifier name "template",
which is a keyword in c++.
* bfd/elf32-arm.c (struct stub_def): Rename member template to
template_sequence. (arm_build_one_stub,
find_stub_size_and_template, arm_size_one_stub, arm_map_one_stub):
Rename variable template to template_sequence.
* bfd/elfxx-ia64.c (elfNN_ia64_relax_br, elfNN_ia64_relax_brl):
Rename variable template to template_val.
* gas/config/tc-arm.c (struct asm_cond, struct asm_psr, struct
asm_barrier_opt): Change member template to
template_name. (md_begin): Update code to reflect new member
names.
* gas/config/tc-i386.c (struct templates, struct _i386_insn)
(match_template, cpu_flags_match, match_reg_size, match_mem_size)
(operand_size_match, md_begin, i386_print_statistics, pi)
(build_vex_prefix, md_assemble, parse_insn, optimize_imm)
(optimize_disp): Updated code to use new names. (parse_insn):
Added casts.
* gas/config/tc-ia64.c (dot_template, emit_one_bundle): Updated
code to use new names.
* gas/config/tc-score.c (struct s3_asm_opcode): Renamed member
template to template_name. (s3_parse_16_32_inst, s3_parse_48_inst,
s3_do_macro_ldst_label, s3_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-score7.c (struct s7_asm_opcode): Renamed member
template to template_name. (s7_parse_16_32_inst,
s7_do_macro_ldst_label, s7_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-tic30.c (md_begin, struct tic30_insn)
(md_assemble): Update code to use new names.
* gas/config/tc-tic54x.c (struct _tic54x_insn, md_begin)
(optimize_insn, tic54x_parse_insn, next_line_shows_parallel):
Update code to use new names.
* include/opcode/tic30.h (template): Rename type template to
insn_template. Updated code to use new name.
* include/opcode/tic54x.h (template): Rename type template to
insn_template.
* opcodes/cris-dis.c (bytes_to_skip): Update code to use new name.
* opcodes/i386-dis.c (putop): Update code to use new name.
* opcodes/i386-gen.c (process_i386_opcodes): Update code to use
new name.
* opcodes/i386-opc.h (struct template): Rename struct template to
insn_template. Update code accordingly.
* opcodes/i386-tbl.h (i386_optab): Update type to use new name.
* opcodes/ia64-dis.c (print_insn_ia64): Rename variable template
to template_val.
* opcodes/tic30-dis.c (struct instruction, get_tic30_instruction):
Update code to use new name.
* opcodes/tic54x-dis.c (has_lkaddr, get_insn_size)
(print_parallel_instruction, print_insn_tic54x, tic54x_get_insn):
Update code to use new name.
* opcodes/tic54x-opc.c (tic54x_unknown_opcode, tic54x_optab):
Update type to new name.
2009-08-30 00:11:02 +02:00
|
|
|
head = new_i;
|
2000-08-31 08:11:03 +02:00
|
|
|
|
Updated sources to avoid using the identifier name "new", which is a
keyword in c++.
* bfd/aoutx.h (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol.
* bfd/coffgen.c (coff_make_empty_symbol)
(coff_bfd_make_debug_symbol): Rename variable new to new_symbol.
* bfd/cpu-ia64-opc.c (ext_reg, ins_imms_scaled): Rename variable
new to new_insn.
* bfd/doc/chew.c (newentry, add_intrinsic): Rename variable new to
new_d.
* bfd/ecoff.c (_bfd_ecoff_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/elf32-m68k.c (elf_m68k_get_got_entry_type): Rename argument
new to new_reloc.
* bfd/hash.c (bfd_hash_lookup): Rename variable new to new_string.
* bfd/ieee.c (ieee_make_empty_symbol): Rename variable new to
new_symbol.
* bfd/linker.c (bfd_new_link_order): Rename variable new to
new_lo.
* bfd/mach-o.c (bfd_mach_o_sizeof_headers): Rename variable new to
symbol.
* bfd/oasys.c (oasys_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/pdp11.c (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol_type.
* bfd/plugin.c (bfd_plugin_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/rs6000-core.c (CoreHdr, VmInfo): Rename union member new to
new_dump.
(read_hdr, rs6000coff_core_p)
(rs6000coff_core_file_matches_executable_p)
(rs6000coff_core_file_failing_command)
(rs6000coff_core_file_failing_signal): Updated function to use new
union member name.
* bfd/som.c (som_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/syms.c (_bfd_generic_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/tekhex.c (first_phase, tekhex_make_empty_symbol): Rename
variable new to new_symbol.
* binutils/nlmconv.c (main): Rename variable new to new_name.
* gas/config/tc-arm.c (insert_reg_alias): Rename variable new to
new_reg.
* gas/config/tc-dlx.c (parse_operand): Rename variable new to
new_pos.
* gas/config/tc-ia64.c (ia64_gen_real_reloc_type): Rename variable
new to newr.
* gas/config/tc-mcore.c (parse_exp, parse_imm): Rename variable
new to new_pointer.
* gas/config/tc-microblaze.c (parse_exp, parse_imm, check_got):
Change name from new to new_pointer.
* gas/config/tc-or32.c (parse_operand): Rename variable new to
new_pointer.
* gas/config/tc-pdp11.c (md_assemble): Rename variable new to
new_pointer.
* gas/config/tc-pj.c (alias): Change argument new to new_name.
* gas/config/tc-score.c (s3_build_score_ops_hsh): Rename variable
new to new_opcode. (s3_build_dependency_insn_hsh) Rename variable
new to new_i2n. (s3_convert): Rename variables old and new to
r_old and r_new.
* gas/config/tc-score7.c (s7_build_score_ops_hsh): Rename variable
new to new_opcode. (s7_build_dependency_insn_hsh): Rename variable
new to new_i2d. (s7_b32_relax_to_b16, s7_convert_frag): Rename
variables old and new to r_old and r_new.
* gas/config/tc-sh.c (parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-sh64.c (shmedia_parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-tic4x.c (tic4x_operand_parse): Rename variable new
to new_pointer.
* gas/config/tc-z8k.c (parse_exp): Rename variable new to
new_pointer.
* gas/listing.c (listing_newline): Rename variable new to new_i.
* ld/ldexp.c (exp_intop, exp_bigintop, exp_relop, exp_binop)
(exp_trinop, exp_unop, exp_nameop, exp_assop): Rename variable new
to new_e.
* ld/ldfile.c (ldfile_add_library_path): Rename variable new to
new_dirs. (ldfile_add_arch): Rename variable new to new_arch.
* ld/ldlang.c (new_statement, lang_final, lang_add_wild)
(lang_target, lang_add_fill, lang_add_data, lang_add_assignment)
(lang_add_insert): Rename variable new to new_stmt. (new_afile):
Added missing cast. (lang_memory_region_lookup): Rename variable
new to new_region. (init_os): Rename variable new to
new_userdata. (lang_add_section): Rename variable new to
new_section. (ldlang_add_undef): Rename variable new to
new_undef. (realsymbol): Rename variable new to new_name.
* opcodes/z8kgen.c (internal, gas): Rename variable new to new_op.
Updated sources to avoid using the identifier name "template",
which is a keyword in c++.
* bfd/elf32-arm.c (struct stub_def): Rename member template to
template_sequence. (arm_build_one_stub,
find_stub_size_and_template, arm_size_one_stub, arm_map_one_stub):
Rename variable template to template_sequence.
* bfd/elfxx-ia64.c (elfNN_ia64_relax_br, elfNN_ia64_relax_brl):
Rename variable template to template_val.
* gas/config/tc-arm.c (struct asm_cond, struct asm_psr, struct
asm_barrier_opt): Change member template to
template_name. (md_begin): Update code to reflect new member
names.
* gas/config/tc-i386.c (struct templates, struct _i386_insn)
(match_template, cpu_flags_match, match_reg_size, match_mem_size)
(operand_size_match, md_begin, i386_print_statistics, pi)
(build_vex_prefix, md_assemble, parse_insn, optimize_imm)
(optimize_disp): Updated code to use new names. (parse_insn):
Added casts.
* gas/config/tc-ia64.c (dot_template, emit_one_bundle): Updated
code to use new names.
* gas/config/tc-score.c (struct s3_asm_opcode): Renamed member
template to template_name. (s3_parse_16_32_inst, s3_parse_48_inst,
s3_do_macro_ldst_label, s3_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-score7.c (struct s7_asm_opcode): Renamed member
template to template_name. (s7_parse_16_32_inst,
s7_do_macro_ldst_label, s7_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-tic30.c (md_begin, struct tic30_insn)
(md_assemble): Update code to use new names.
* gas/config/tc-tic54x.c (struct _tic54x_insn, md_begin)
(optimize_insn, tic54x_parse_insn, next_line_shows_parallel):
Update code to use new names.
* include/opcode/tic30.h (template): Rename type template to
insn_template. Updated code to use new name.
* include/opcode/tic54x.h (template): Rename type template to
insn_template.
* opcodes/cris-dis.c (bytes_to_skip): Update code to use new name.
* opcodes/i386-dis.c (putop): Update code to use new name.
* opcodes/i386-gen.c (process_i386_opcodes): Update code to use
new name.
* opcodes/i386-opc.h (struct template): Rename struct template to
insn_template. Update code accordingly.
* opcodes/i386-tbl.h (i386_optab): Update type to use new name.
* opcodes/ia64-dis.c (print_insn_ia64): Rename variable template
to template_val.
* opcodes/tic30-dis.c (struct instruction, get_tic30_instruction):
Update code to use new name.
* opcodes/tic54x-dis.c (has_lkaddr, get_insn_size)
(print_parallel_instruction, print_insn_tic54x, tic54x_get_insn):
Update code to use new name.
* opcodes/tic54x-opc.c (tic54x_unknown_opcode, tic54x_optab):
Update type to new name.
2009-08-30 00:11:02 +02:00
|
|
|
listing_tail = new_i;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
Updated sources to avoid using the identifier name "new", which is a
keyword in c++.
* bfd/aoutx.h (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol.
* bfd/coffgen.c (coff_make_empty_symbol)
(coff_bfd_make_debug_symbol): Rename variable new to new_symbol.
* bfd/cpu-ia64-opc.c (ext_reg, ins_imms_scaled): Rename variable
new to new_insn.
* bfd/doc/chew.c (newentry, add_intrinsic): Rename variable new to
new_d.
* bfd/ecoff.c (_bfd_ecoff_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/elf32-m68k.c (elf_m68k_get_got_entry_type): Rename argument
new to new_reloc.
* bfd/hash.c (bfd_hash_lookup): Rename variable new to new_string.
* bfd/ieee.c (ieee_make_empty_symbol): Rename variable new to
new_symbol.
* bfd/linker.c (bfd_new_link_order): Rename variable new to
new_lo.
* bfd/mach-o.c (bfd_mach_o_sizeof_headers): Rename variable new to
symbol.
* bfd/oasys.c (oasys_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/pdp11.c (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol_type.
* bfd/plugin.c (bfd_plugin_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/rs6000-core.c (CoreHdr, VmInfo): Rename union member new to
new_dump.
(read_hdr, rs6000coff_core_p)
(rs6000coff_core_file_matches_executable_p)
(rs6000coff_core_file_failing_command)
(rs6000coff_core_file_failing_signal): Updated function to use new
union member name.
* bfd/som.c (som_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/syms.c (_bfd_generic_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/tekhex.c (first_phase, tekhex_make_empty_symbol): Rename
variable new to new_symbol.
* binutils/nlmconv.c (main): Rename variable new to new_name.
* gas/config/tc-arm.c (insert_reg_alias): Rename variable new to
new_reg.
* gas/config/tc-dlx.c (parse_operand): Rename variable new to
new_pos.
* gas/config/tc-ia64.c (ia64_gen_real_reloc_type): Rename variable
new to newr.
* gas/config/tc-mcore.c (parse_exp, parse_imm): Rename variable
new to new_pointer.
* gas/config/tc-microblaze.c (parse_exp, parse_imm, check_got):
Change name from new to new_pointer.
* gas/config/tc-or32.c (parse_operand): Rename variable new to
new_pointer.
* gas/config/tc-pdp11.c (md_assemble): Rename variable new to
new_pointer.
* gas/config/tc-pj.c (alias): Change argument new to new_name.
* gas/config/tc-score.c (s3_build_score_ops_hsh): Rename variable
new to new_opcode. (s3_build_dependency_insn_hsh) Rename variable
new to new_i2n. (s3_convert): Rename variables old and new to
r_old and r_new.
* gas/config/tc-score7.c (s7_build_score_ops_hsh): Rename variable
new to new_opcode. (s7_build_dependency_insn_hsh): Rename variable
new to new_i2d. (s7_b32_relax_to_b16, s7_convert_frag): Rename
variables old and new to r_old and r_new.
* gas/config/tc-sh.c (parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-sh64.c (shmedia_parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-tic4x.c (tic4x_operand_parse): Rename variable new
to new_pointer.
* gas/config/tc-z8k.c (parse_exp): Rename variable new to
new_pointer.
* gas/listing.c (listing_newline): Rename variable new to new_i.
* ld/ldexp.c (exp_intop, exp_bigintop, exp_relop, exp_binop)
(exp_trinop, exp_unop, exp_nameop, exp_assop): Rename variable new
to new_e.
* ld/ldfile.c (ldfile_add_library_path): Rename variable new to
new_dirs. (ldfile_add_arch): Rename variable new to new_arch.
* ld/ldlang.c (new_statement, lang_final, lang_add_wild)
(lang_target, lang_add_fill, lang_add_data, lang_add_assignment)
(lang_add_insert): Rename variable new to new_stmt. (new_afile):
Added missing cast. (lang_memory_region_lookup): Rename variable
new to new_region. (init_os): Rename variable new to
new_userdata. (lang_add_section): Rename variable new to
new_section. (ldlang_add_undef): Rename variable new to
new_undef. (realsymbol): Rename variable new to new_name.
* opcodes/z8kgen.c (internal, gas): Rename variable new to new_op.
Updated sources to avoid using the identifier name "template",
which is a keyword in c++.
* bfd/elf32-arm.c (struct stub_def): Rename member template to
template_sequence. (arm_build_one_stub,
find_stub_size_and_template, arm_size_one_stub, arm_map_one_stub):
Rename variable template to template_sequence.
* bfd/elfxx-ia64.c (elfNN_ia64_relax_br, elfNN_ia64_relax_brl):
Rename variable template to template_val.
* gas/config/tc-arm.c (struct asm_cond, struct asm_psr, struct
asm_barrier_opt): Change member template to
template_name. (md_begin): Update code to reflect new member
names.
* gas/config/tc-i386.c (struct templates, struct _i386_insn)
(match_template, cpu_flags_match, match_reg_size, match_mem_size)
(operand_size_match, md_begin, i386_print_statistics, pi)
(build_vex_prefix, md_assemble, parse_insn, optimize_imm)
(optimize_disp): Updated code to use new names. (parse_insn):
Added casts.
* gas/config/tc-ia64.c (dot_template, emit_one_bundle): Updated
code to use new names.
* gas/config/tc-score.c (struct s3_asm_opcode): Renamed member
template to template_name. (s3_parse_16_32_inst, s3_parse_48_inst,
s3_do_macro_ldst_label, s3_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-score7.c (struct s7_asm_opcode): Renamed member
template to template_name. (s7_parse_16_32_inst,
s7_do_macro_ldst_label, s7_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-tic30.c (md_begin, struct tic30_insn)
(md_assemble): Update code to use new names.
* gas/config/tc-tic54x.c (struct _tic54x_insn, md_begin)
(optimize_insn, tic54x_parse_insn, next_line_shows_parallel):
Update code to use new names.
* include/opcode/tic30.h (template): Rename type template to
insn_template. Updated code to use new name.
* include/opcode/tic54x.h (template): Rename type template to
insn_template.
* opcodes/cris-dis.c (bytes_to_skip): Update code to use new name.
* opcodes/i386-dis.c (putop): Update code to use new name.
* opcodes/i386-gen.c (process_i386_opcodes): Update code to use
new name.
* opcodes/i386-opc.h (struct template): Rename struct template to
insn_template. Update code accordingly.
* opcodes/i386-tbl.h (i386_optab): Update type to use new name.
* opcodes/ia64-dis.c (print_insn_ia64): Rename variable template
to template_val.
* opcodes/tic30-dis.c (struct instruction, get_tic30_instruction):
Update code to use new name.
* opcodes/tic54x-dis.c (has_lkaddr, get_insn_size)
(print_parallel_instruction, print_insn_tic54x, tic54x_get_insn):
Update code to use new name.
* opcodes/tic54x-opc.c (tic54x_unknown_opcode, tic54x_optab):
Update type to new name.
2009-08-30 00:11:02 +02:00
|
|
|
new_i->frag = frag_now;
|
|
|
|
new_i->line = line;
|
|
|
|
new_i->file = file_info (file);
|
|
|
|
new_i->next = (list_info_type *) NULL;
|
2012-07-27 05:32:21 +02:00
|
|
|
new_i->messages = NULL;
|
|
|
|
new_i->last_message = NULL;
|
Updated sources to avoid using the identifier name "new", which is a
keyword in c++.
* bfd/aoutx.h (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol.
* bfd/coffgen.c (coff_make_empty_symbol)
(coff_bfd_make_debug_symbol): Rename variable new to new_symbol.
* bfd/cpu-ia64-opc.c (ext_reg, ins_imms_scaled): Rename variable
new to new_insn.
* bfd/doc/chew.c (newentry, add_intrinsic): Rename variable new to
new_d.
* bfd/ecoff.c (_bfd_ecoff_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/elf32-m68k.c (elf_m68k_get_got_entry_type): Rename argument
new to new_reloc.
* bfd/hash.c (bfd_hash_lookup): Rename variable new to new_string.
* bfd/ieee.c (ieee_make_empty_symbol): Rename variable new to
new_symbol.
* bfd/linker.c (bfd_new_link_order): Rename variable new to
new_lo.
* bfd/mach-o.c (bfd_mach_o_sizeof_headers): Rename variable new to
symbol.
* bfd/oasys.c (oasys_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/pdp11.c (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol_type.
* bfd/plugin.c (bfd_plugin_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/rs6000-core.c (CoreHdr, VmInfo): Rename union member new to
new_dump.
(read_hdr, rs6000coff_core_p)
(rs6000coff_core_file_matches_executable_p)
(rs6000coff_core_file_failing_command)
(rs6000coff_core_file_failing_signal): Updated function to use new
union member name.
* bfd/som.c (som_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/syms.c (_bfd_generic_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/tekhex.c (first_phase, tekhex_make_empty_symbol): Rename
variable new to new_symbol.
* binutils/nlmconv.c (main): Rename variable new to new_name.
* gas/config/tc-arm.c (insert_reg_alias): Rename variable new to
new_reg.
* gas/config/tc-dlx.c (parse_operand): Rename variable new to
new_pos.
* gas/config/tc-ia64.c (ia64_gen_real_reloc_type): Rename variable
new to newr.
* gas/config/tc-mcore.c (parse_exp, parse_imm): Rename variable
new to new_pointer.
* gas/config/tc-microblaze.c (parse_exp, parse_imm, check_got):
Change name from new to new_pointer.
* gas/config/tc-or32.c (parse_operand): Rename variable new to
new_pointer.
* gas/config/tc-pdp11.c (md_assemble): Rename variable new to
new_pointer.
* gas/config/tc-pj.c (alias): Change argument new to new_name.
* gas/config/tc-score.c (s3_build_score_ops_hsh): Rename variable
new to new_opcode. (s3_build_dependency_insn_hsh) Rename variable
new to new_i2n. (s3_convert): Rename variables old and new to
r_old and r_new.
* gas/config/tc-score7.c (s7_build_score_ops_hsh): Rename variable
new to new_opcode. (s7_build_dependency_insn_hsh): Rename variable
new to new_i2d. (s7_b32_relax_to_b16, s7_convert_frag): Rename
variables old and new to r_old and r_new.
* gas/config/tc-sh.c (parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-sh64.c (shmedia_parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-tic4x.c (tic4x_operand_parse): Rename variable new
to new_pointer.
* gas/config/tc-z8k.c (parse_exp): Rename variable new to
new_pointer.
* gas/listing.c (listing_newline): Rename variable new to new_i.
* ld/ldexp.c (exp_intop, exp_bigintop, exp_relop, exp_binop)
(exp_trinop, exp_unop, exp_nameop, exp_assop): Rename variable new
to new_e.
* ld/ldfile.c (ldfile_add_library_path): Rename variable new to
new_dirs. (ldfile_add_arch): Rename variable new to new_arch.
* ld/ldlang.c (new_statement, lang_final, lang_add_wild)
(lang_target, lang_add_fill, lang_add_data, lang_add_assignment)
(lang_add_insert): Rename variable new to new_stmt. (new_afile):
Added missing cast. (lang_memory_region_lookup): Rename variable
new to new_region. (init_os): Rename variable new to
new_userdata. (lang_add_section): Rename variable new to
new_section. (ldlang_add_undef): Rename variable new to
new_undef. (realsymbol): Rename variable new to new_name.
* opcodes/z8kgen.c (internal, gas): Rename variable new to new_op.
Updated sources to avoid using the identifier name "template",
which is a keyword in c++.
* bfd/elf32-arm.c (struct stub_def): Rename member template to
template_sequence. (arm_build_one_stub,
find_stub_size_and_template, arm_size_one_stub, arm_map_one_stub):
Rename variable template to template_sequence.
* bfd/elfxx-ia64.c (elfNN_ia64_relax_br, elfNN_ia64_relax_brl):
Rename variable template to template_val.
* gas/config/tc-arm.c (struct asm_cond, struct asm_psr, struct
asm_barrier_opt): Change member template to
template_name. (md_begin): Update code to reflect new member
names.
* gas/config/tc-i386.c (struct templates, struct _i386_insn)
(match_template, cpu_flags_match, match_reg_size, match_mem_size)
(operand_size_match, md_begin, i386_print_statistics, pi)
(build_vex_prefix, md_assemble, parse_insn, optimize_imm)
(optimize_disp): Updated code to use new names. (parse_insn):
Added casts.
* gas/config/tc-ia64.c (dot_template, emit_one_bundle): Updated
code to use new names.
* gas/config/tc-score.c (struct s3_asm_opcode): Renamed member
template to template_name. (s3_parse_16_32_inst, s3_parse_48_inst,
s3_do_macro_ldst_label, s3_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-score7.c (struct s7_asm_opcode): Renamed member
template to template_name. (s7_parse_16_32_inst,
s7_do_macro_ldst_label, s7_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-tic30.c (md_begin, struct tic30_insn)
(md_assemble): Update code to use new names.
* gas/config/tc-tic54x.c (struct _tic54x_insn, md_begin)
(optimize_insn, tic54x_parse_insn, next_line_shows_parallel):
Update code to use new names.
* include/opcode/tic30.h (template): Rename type template to
insn_template. Updated code to use new name.
* include/opcode/tic54x.h (template): Rename type template to
insn_template.
* opcodes/cris-dis.c (bytes_to_skip): Update code to use new name.
* opcodes/i386-dis.c (putop): Update code to use new name.
* opcodes/i386-gen.c (process_i386_opcodes): Update code to use
new name.
* opcodes/i386-opc.h (struct template): Rename struct template to
insn_template. Update code accordingly.
* opcodes/i386-tbl.h (i386_optab): Update type to use new name.
* opcodes/ia64-dis.c (print_insn_ia64): Rename variable template
to template_val.
* opcodes/tic30-dis.c (struct instruction, get_tic30_instruction):
Update code to use new name.
* opcodes/tic54x-dis.c (has_lkaddr, get_insn_size)
(print_parallel_instruction, print_insn_tic54x, tic54x_get_insn):
Update code to use new name.
* opcodes/tic54x-opc.c (tic54x_unknown_opcode, tic54x_optab):
Update type to new name.
2009-08-30 00:11:02 +02:00
|
|
|
new_i->edict = EDICT_NONE;
|
|
|
|
new_i->hll_file = (file_info_type *) NULL;
|
|
|
|
new_i->hll_line = 0;
|
|
|
|
new_i->debugging = 0;
|
2000-08-31 08:11:03 +02:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
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)
|
Updated sources to avoid using the identifier name "new", which is a
keyword in c++.
* bfd/aoutx.h (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol.
* bfd/coffgen.c (coff_make_empty_symbol)
(coff_bfd_make_debug_symbol): Rename variable new to new_symbol.
* bfd/cpu-ia64-opc.c (ext_reg, ins_imms_scaled): Rename variable
new to new_insn.
* bfd/doc/chew.c (newentry, add_intrinsic): Rename variable new to
new_d.
* bfd/ecoff.c (_bfd_ecoff_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/elf32-m68k.c (elf_m68k_get_got_entry_type): Rename argument
new to new_reloc.
* bfd/hash.c (bfd_hash_lookup): Rename variable new to new_string.
* bfd/ieee.c (ieee_make_empty_symbol): Rename variable new to
new_symbol.
* bfd/linker.c (bfd_new_link_order): Rename variable new to
new_lo.
* bfd/mach-o.c (bfd_mach_o_sizeof_headers): Rename variable new to
symbol.
* bfd/oasys.c (oasys_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/pdp11.c (NAME (aout, make_empty_symbol)): Rename variable
new to new_symbol_type.
* bfd/plugin.c (bfd_plugin_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/rs6000-core.c (CoreHdr, VmInfo): Rename union member new to
new_dump.
(read_hdr, rs6000coff_core_p)
(rs6000coff_core_file_matches_executable_p)
(rs6000coff_core_file_failing_command)
(rs6000coff_core_file_failing_signal): Updated function to use new
union member name.
* bfd/som.c (som_make_empty_symbol): Rename variable new to
new_symbol_type.
* bfd/syms.c (_bfd_generic_make_empty_symbol): Rename variable new
to new_symbol.
* bfd/tekhex.c (first_phase, tekhex_make_empty_symbol): Rename
variable new to new_symbol.
* binutils/nlmconv.c (main): Rename variable new to new_name.
* gas/config/tc-arm.c (insert_reg_alias): Rename variable new to
new_reg.
* gas/config/tc-dlx.c (parse_operand): Rename variable new to
new_pos.
* gas/config/tc-ia64.c (ia64_gen_real_reloc_type): Rename variable
new to newr.
* gas/config/tc-mcore.c (parse_exp, parse_imm): Rename variable
new to new_pointer.
* gas/config/tc-microblaze.c (parse_exp, parse_imm, check_got):
Change name from new to new_pointer.
* gas/config/tc-or32.c (parse_operand): Rename variable new to
new_pointer.
* gas/config/tc-pdp11.c (md_assemble): Rename variable new to
new_pointer.
* gas/config/tc-pj.c (alias): Change argument new to new_name.
* gas/config/tc-score.c (s3_build_score_ops_hsh): Rename variable
new to new_opcode. (s3_build_dependency_insn_hsh) Rename variable
new to new_i2n. (s3_convert): Rename variables old and new to
r_old and r_new.
* gas/config/tc-score7.c (s7_build_score_ops_hsh): Rename variable
new to new_opcode. (s7_build_dependency_insn_hsh): Rename variable
new to new_i2d. (s7_b32_relax_to_b16, s7_convert_frag): Rename
variables old and new to r_old and r_new.
* gas/config/tc-sh.c (parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-sh64.c (shmedia_parse_exp): Rename variable new to
new_pointer.
* gas/config/tc-tic4x.c (tic4x_operand_parse): Rename variable new
to new_pointer.
* gas/config/tc-z8k.c (parse_exp): Rename variable new to
new_pointer.
* gas/listing.c (listing_newline): Rename variable new to new_i.
* ld/ldexp.c (exp_intop, exp_bigintop, exp_relop, exp_binop)
(exp_trinop, exp_unop, exp_nameop, exp_assop): Rename variable new
to new_e.
* ld/ldfile.c (ldfile_add_library_path): Rename variable new to
new_dirs. (ldfile_add_arch): Rename variable new to new_arch.
* ld/ldlang.c (new_statement, lang_final, lang_add_wild)
(lang_target, lang_add_fill, lang_add_data, lang_add_assignment)
(lang_add_insert): Rename variable new to new_stmt. (new_afile):
Added missing cast. (lang_memory_region_lookup): Rename variable
new to new_region. (init_os): Rename variable new to
new_userdata. (lang_add_section): Rename variable new to
new_section. (ldlang_add_undef): Rename variable new to
new_undef. (realsymbol): Rename variable new to new_name.
* opcodes/z8kgen.c (internal, gas): Rename variable new to new_op.
Updated sources to avoid using the identifier name "template",
which is a keyword in c++.
* bfd/elf32-arm.c (struct stub_def): Rename member template to
template_sequence. (arm_build_one_stub,
find_stub_size_and_template, arm_size_one_stub, arm_map_one_stub):
Rename variable template to template_sequence.
* bfd/elfxx-ia64.c (elfNN_ia64_relax_br, elfNN_ia64_relax_brl):
Rename variable template to template_val.
* gas/config/tc-arm.c (struct asm_cond, struct asm_psr, struct
asm_barrier_opt): Change member template to
template_name. (md_begin): Update code to reflect new member
names.
* gas/config/tc-i386.c (struct templates, struct _i386_insn)
(match_template, cpu_flags_match, match_reg_size, match_mem_size)
(operand_size_match, md_begin, i386_print_statistics, pi)
(build_vex_prefix, md_assemble, parse_insn, optimize_imm)
(optimize_disp): Updated code to use new names. (parse_insn):
Added casts.
* gas/config/tc-ia64.c (dot_template, emit_one_bundle): Updated
code to use new names.
* gas/config/tc-score.c (struct s3_asm_opcode): Renamed member
template to template_name. (s3_parse_16_32_inst, s3_parse_48_inst,
s3_do_macro_ldst_label, s3_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-score7.c (struct s7_asm_opcode): Renamed member
template to template_name. (s7_parse_16_32_inst,
s7_do_macro_ldst_label, s7_build_score_ops_hsh): Update code to
use new names.
* gas/config/tc-tic30.c (md_begin, struct tic30_insn)
(md_assemble): Update code to use new names.
* gas/config/tc-tic54x.c (struct _tic54x_insn, md_begin)
(optimize_insn, tic54x_parse_insn, next_line_shows_parallel):
Update code to use new names.
* include/opcode/tic30.h (template): Rename type template to
insn_template. Updated code to use new name.
* include/opcode/tic54x.h (template): Rename type template to
insn_template.
* opcodes/cris-dis.c (bytes_to_skip): Update code to use new name.
* opcodes/i386-dis.c (putop): Update code to use new name.
* opcodes/i386-gen.c (process_i386_opcodes): Update code to use
new name.
* opcodes/i386-opc.h (struct template): Rename struct template to
insn_template. Update code accordingly.
* opcodes/i386-tbl.h (i386_optab): Update type to use new name.
* opcodes/ia64-dis.c (print_insn_ia64): Rename variable template
to template_val.
* opcodes/tic30-dis.c (struct instruction, get_tic30_instruction):
Update code to use new name.
* opcodes/tic54x-dis.c (has_lkaddr, get_insn_size)
(print_parallel_instruction, print_insn_tic54x, tic54x_get_insn):
Update code to use new name.
* opcodes/tic54x-opc.c (tic54x_unknown_opcode, tic54x_optab):
Update type to new name.
2009-08-30 00:11:02 +02:00
|
|
|
new_i->debugging = 1;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
#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
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_prev_line (void)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
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 ();
|
|
|
|
}
|
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
/* 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
|
2009-07-14 14:54:47 +02:00
|
|
|
file to make using the returned buffer simpler. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
static char *
|
2003-11-24 18:52:33 +01:00
|
|
|
buffer_line (file_info_type *file, char *line, unsigned int size)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
unsigned int count = 0;
|
|
|
|
int c;
|
|
|
|
char *p = line;
|
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
/* If we couldn't open the file, return an empty line. */
|
1999-05-03 09:29:11 +02:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2008-10-03 22:21:33 +02:00
|
|
|
/* Open the file in the binary mode so that ftell above can
|
|
|
|
return a reliable value that we can feed to fseek below. */
|
1999-05-03 09:29:11 +02:00
|
|
|
last_open_file_info = file;
|
2008-10-03 22:21:33 +02:00
|
|
|
last_open_file = fopen (file->filename, FOPEN_RB);
|
1999-05-03 09:29:11 +02:00
|
|
|
if (last_open_file == NULL)
|
|
|
|
{
|
|
|
|
file->at_end = 1;
|
|
|
|
return "";
|
|
|
|
}
|
2000-08-31 08:11:03 +02:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
/* Seek to where we were last time this file was open. */
|
|
|
|
if (file->pos)
|
2000-08-31 08:11:03 +02:00
|
|
|
fseek (last_open_file, file->pos, SEEK_SET);
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
/* Leave room for null. */
|
|
|
|
size -= 1;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2009-07-14 14:54:47 +02:00
|
|
|
c = fgetc (last_open_file);
|
|
|
|
|
2008-10-03 22:21:33 +02:00
|
|
|
while (c != EOF && c != '\n' && c != '\r')
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
if (count < size)
|
|
|
|
*p++ = c;
|
|
|
|
count++;
|
|
|
|
|
|
|
|
c = fgetc (last_open_file);
|
|
|
|
}
|
2008-10-03 22:21:33 +02:00
|
|
|
|
|
|
|
/* If '\r' is followed by '\n', swallow that. Likewise, if '\n'
|
|
|
|
is followed by '\r', swallow that as well. */
|
|
|
|
if (c == '\r' || c == '\n')
|
|
|
|
{
|
|
|
|
int next = fgetc (last_open_file);
|
2009-07-14 14:54:47 +02:00
|
|
|
|
2008-10-03 22:21:33 +02:00
|
|
|
if ((c == '\r' && next != '\n')
|
|
|
|
|| (c == '\n' && next != '\r'))
|
|
|
|
ungetc (next, last_open_file);
|
|
|
|
}
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
if (c == EOF)
|
|
|
|
{
|
|
|
|
file->at_end = 1;
|
2001-09-25 14:09:45 +02:00
|
|
|
if (count + 2 < size)
|
|
|
|
{
|
|
|
|
*p++ = '.';
|
|
|
|
*p++ = '.';
|
|
|
|
*p++ = '.';
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
file->linenum++;
|
|
|
|
*p++ = 0;
|
|
|
|
return line;
|
|
|
|
}
|
|
|
|
|
2009-07-14 14:54:47 +02:00
|
|
|
|
|
|
|
/* This function rewinds the requested file back to the line requested,
|
|
|
|
reads it in again into the buffer provided and then restores the file
|
2013-03-26 15:16:59 +01:00
|
|
|
back to its original location. Returns the buffer pointer upon success
|
|
|
|
or an empty string if an error occurs. */
|
2009-07-14 14:54:47 +02:00
|
|
|
|
|
|
|
static char *
|
|
|
|
rebuffer_line (file_info_type * file,
|
|
|
|
unsigned int linenum,
|
|
|
|
char * buffer,
|
|
|
|
unsigned int size)
|
|
|
|
{
|
|
|
|
unsigned int count = 0;
|
2013-03-26 15:16:59 +01:00
|
|
|
unsigned int current_line;
|
2009-07-14 14:54:47 +02:00
|
|
|
char * p = buffer;
|
|
|
|
long pos;
|
2013-03-26 15:16:59 +01:00
|
|
|
long pos2;
|
2009-07-14 14:54:47 +02:00
|
|
|
int c;
|
2013-03-26 15:16:59 +01:00
|
|
|
bfd_boolean found = FALSE;
|
2009-07-14 14:54:47 +02:00
|
|
|
|
|
|
|
/* Sanity checks. */
|
2013-03-26 15:16:59 +01:00
|
|
|
if (file == NULL || buffer == NULL || size <= 1 || file->linenum <= linenum)
|
2009-07-14 14:54:47 +02:00
|
|
|
return "";
|
|
|
|
|
|
|
|
/* Check the cache and see if we last used this file. */
|
|
|
|
if (last_open_file_info == NULL || file != last_open_file_info)
|
|
|
|
{
|
|
|
|
if (last_open_file)
|
|
|
|
{
|
|
|
|
last_open_file_info->pos = ftell (last_open_file);
|
|
|
|
fclose (last_open_file);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Open the file in the binary mode so that ftell above can
|
|
|
|
return a reliable value that we can feed to fseek below. */
|
|
|
|
last_open_file_info = file;
|
|
|
|
last_open_file = fopen (file->filename, FOPEN_RB);
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Remember where we are in the current file. */
|
2013-03-26 15:16:59 +01:00
|
|
|
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;
|
2009-07-14 14:54:47 +02:00
|
|
|
|
2013-03-26 15:16:59 +01:00
|
|
|
/* 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;
|
2009-07-14 14:54:47 +02:00
|
|
|
|
2013-03-26 15:16:59 +01:00
|
|
|
while (pos2 > 0 && ! found)
|
2009-07-14 14:54:47 +02:00
|
|
|
{
|
2013-03-26 15:16:59 +01:00
|
|
|
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)
|
2009-07-14 14:54:47 +02:00
|
|
|
{
|
2013-03-26 15:16:59 +01:00
|
|
|
as_warn (_("unable to rebuffer file: %s\n"), file->filename);
|
|
|
|
return "";
|
2009-07-14 14:54:47 +02:00
|
|
|
}
|
|
|
|
|
2013-03-26 15:16:59 +01:00
|
|
|
for (ptr = buffer + size; ptr >= buffer; -- ptr)
|
2009-07-14 14:54:47 +02:00
|
|
|
{
|
2013-03-26 15:16:59 +01:00
|
|
|
if (*ptr == '\n')
|
|
|
|
{
|
|
|
|
-- current_line;
|
2009-07-14 14:54:47 +02:00
|
|
|
|
2013-03-26 15:16:59 +01:00
|
|
|
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);
|
|
|
|
|
|
|
|
/* Move the file pointer to this location. */
|
|
|
|
fseek (last_open_file, pos2, SEEK_SET);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2009-07-14 14:54:47 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read in the line. */
|
|
|
|
c = fgetc (last_open_file);
|
|
|
|
|
|
|
|
while (c != EOF && c != '\n' && c != '\r')
|
|
|
|
{
|
|
|
|
if (count < size)
|
|
|
|
*p++ = c;
|
|
|
|
count++;
|
|
|
|
|
|
|
|
c = fgetc (last_open_file);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If '\r' is followed by '\n', swallow that. Likewise, if '\n'
|
|
|
|
is followed by '\r', swallow that as well. */
|
|
|
|
if (c == '\r' || c == '\n')
|
|
|
|
{
|
|
|
|
int next = fgetc (last_open_file);
|
|
|
|
|
|
|
|
if ((c == '\r' && next != '\n')
|
|
|
|
|| (c == '\n' && next != '\r'))
|
|
|
|
ungetc (next, last_open_file);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Terminate the line. */
|
|
|
|
*p++ = 0;
|
|
|
|
|
|
|
|
/* Reset the file position. */
|
|
|
|
fseek (last_open_file, pos, SEEK_SET);
|
|
|
|
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
static const char *fn;
|
|
|
|
|
|
|
|
static unsigned int eject; /* Eject pending */
|
|
|
|
static unsigned int page; /* Current page number */
|
2000-08-31 08:11:03 +02:00
|
|
|
static char *title; /* Current title */
|
|
|
|
static char *subtitle; /* Current subtitle */
|
|
|
|
static unsigned int on_page; /* Number of lines printed on current page */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
static void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_page (list_info_type *list)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
/* Grope around, see if we can see a title or subtitle edict coming up
|
2000-08-31 08:11:03 +02:00
|
|
|
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)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-07-14 14:54:47 +02:00
|
|
|
/* Print a line into the list_file. Update the line count
|
|
|
|
and if necessary start a new page. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
emit_line (list_info_type * list, const char * format, ...)
|
|
|
|
{
|
|
|
|
va_list args;
|
|
|
|
|
|
|
|
va_start (args, format);
|
|
|
|
|
|
|
|
vfprintf (list_file, format, args);
|
|
|
|
on_page++;
|
|
|
|
listing_page (list);
|
|
|
|
|
|
|
|
va_end (args);
|
|
|
|
}
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
static unsigned int
|
2003-11-24 18:52:33 +01:00
|
|
|
calc_hex (list_info_type *list)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
int data_buffer_size;
|
|
|
|
list_info_type *first = list;
|
2000-08-31 08:11:03 +02:00
|
|
|
unsigned int address = ~(unsigned int) 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
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
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
/* Find first frag which says it belongs to this line. */
|
1999-05-03 09:29:11 +02:00
|
|
|
frag = list->frag;
|
|
|
|
while (frag && frag->line != list)
|
|
|
|
frag = frag->fr_next;
|
|
|
|
|
|
|
|
frag_ptr = frag;
|
|
|
|
|
|
|
|
data_buffer_size = 0;
|
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
/* Dump all the frags which belong to this line. */
|
1999-05-03 09:29:11 +02:00
|
|
|
while (frag_ptr != (fragS *) NULL && frag_ptr->line == first)
|
|
|
|
{
|
2000-08-31 08:11:03 +02:00
|
|
|
/* 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)
|
|
|
|
{
|
2000-08-31 08:11:03 +02:00
|
|
|
if (address == ~(unsigned int) 0)
|
2003-12-19 16:23:41 +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
|
|
|
}
|
2002-05-18 14:53:30 +02:00
|
|
|
if (frag_ptr->fr_type == rs_fill)
|
|
|
|
{
|
|
|
|
unsigned int var_rep_max = octet_in_frag;
|
|
|
|
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))
|
|
|
|
&& data_buffer_size < MAX_BYTES - 3)
|
|
|
|
{
|
|
|
|
if (address == ~(unsigned int) 0)
|
2003-12-19 16:23:41 +01:00
|
|
|
address = frag_ptr->fr_address / OCTETS_PER_BYTE;
|
|
|
|
|
2002-05-18 14:53:30 +02:00
|
|
|
sprintf (data_buffer + data_buffer_size,
|
|
|
|
"%02X",
|
|
|
|
(frag_ptr->fr_literal[var_rep_idx]) & 0xff);
|
|
|
|
data_buffer_size += 2;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2002-05-18 14:53:30 +02:00
|
|
|
var_rep_idx++;
|
|
|
|
octet_in_frag++;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2002-05-18 14:53:30 +02:00
|
|
|
if ((offsetT) var_rep_idx >= frag_ptr->fr_fix + frag_ptr->fr_var)
|
|
|
|
var_rep_idx = var_rep_max;
|
|
|
|
}
|
|
|
|
}
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
frag_ptr = frag_ptr->fr_next;
|
|
|
|
}
|
|
|
|
data_buffer[data_buffer_size] = '\0';
|
|
|
|
return address;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2003-11-24 18:52:33 +01:00
|
|
|
print_lines (list_info_type *list, unsigned int lineno,
|
|
|
|
char *string, unsigned int address)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
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;
|
2012-07-27 05:32:21 +02:00
|
|
|
struct list_message *msg;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
/* Print the stuff on the first line. */
|
1999-05-03 09:29:11 +02:00
|
|
|
listing_page (list);
|
|
|
|
nchars = (LISTING_WORD_SIZE * 2 + 1) * listing_lhs_width;
|
2000-08-31 08:11:03 +02:00
|
|
|
|
|
|
|
/* Print the hex for the first line. */
|
|
|
|
if (address == ~(unsigned int) 0)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
fprintf (list_file, "% 4d ", lineno);
|
|
|
|
for (idx = 0; idx < nchars; idx++)
|
|
|
|
fprintf (list_file, " ");
|
|
|
|
|
2009-07-14 14:54:47 +02:00
|
|
|
emit_line (NULL, "\t%s\n", string ? string : "");
|
1999-05-03 09:29:11 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (had_errors ())
|
|
|
|
fprintf (list_file, "% 4d ???? ", lineno);
|
|
|
|
else
|
|
|
|
fprintf (list_file, "% 4d %04x ", lineno, address);
|
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
/* And the data to go along with it. */
|
1999-05-03 09:29:11 +02:00
|
|
|
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;
|
2000-08-31 08:11:03 +02:00
|
|
|
fprintf (list_file, "%c%c", src[offset], src[offset + 1]);
|
2000-02-03 19:20:23 +01:00
|
|
|
cur += 2;
|
|
|
|
octet_in_word++;
|
2000-08-31 08:11:03 +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
|
|
|
}
|
2000-08-31 08:11:03 +02:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
idx += 2;
|
|
|
|
}
|
2000-08-31 08:11:03 +02:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
for (; idx < nchars; idx++)
|
|
|
|
fprintf (list_file, " ");
|
2000-08-31 08:11:03 +02:00
|
|
|
|
2009-07-14 14:54:47 +02:00
|
|
|
emit_line (list, "\t%s\n", string ? string : "");
|
2000-08-31 08:11:03 +02:00
|
|
|
|
2012-07-27 05:32:21 +02:00
|
|
|
for (msg = list->messages; msg; msg = msg->next)
|
|
|
|
emit_line (list, "**** %s\n", msg->message);
|
2000-08-31 08:11:03 +02:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
for (lines = 0;
|
|
|
|
lines < (unsigned int) listing_lhs_cont_lines
|
2000-02-03 19:20:23 +01:00
|
|
|
&& src[cur];
|
2000-08-31 08:11:03 +02:00
|
|
|
lines++)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2000-08-31 08:11:03 +02:00
|
|
|
nchars = ((LISTING_WORD_SIZE * 2) + 1) * listing_lhs_width_second - 1;
|
1999-05-03 09:29:11 +02:00
|
|
|
idx = 0;
|
2000-08-31 08:11:03 +02:00
|
|
|
|
|
|
|
/* Print any more lines of data, but more compactly. */
|
1999-05-03 09:29:11 +02:00
|
|
|
fprintf (list_file, "% 4d ", lineno);
|
2000-08-31 08:11:03 +02:00
|
|
|
|
2000-02-03 19:20:23 +01:00
|
|
|
while (src[cur] && idx < nchars)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2000-08-31 08:11:03 +02:00
|
|
|
int offset;
|
|
|
|
offset = cur;
|
|
|
|
fprintf (list_file, "%c%c", src[offset], src[offset + 1]);
|
2000-02-03 19:20:23 +01:00
|
|
|
cur += 2;
|
1999-05-03 09:29:11 +02:00
|
|
|
idx += 2;
|
2000-02-03 19:20:23 +01:00
|
|
|
octet_in_word++;
|
2000-08-31 08:11:03 +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
|
|
|
}
|
|
|
|
}
|
2000-08-31 08:11:03 +02:00
|
|
|
|
2009-07-14 14:54:47 +02:00
|
|
|
emit_line (list, "\n");
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2003-11-24 18:52:33 +01:00
|
|
|
list_symbol_table (void)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
extern symbolS *symbol_rootP;
|
|
|
|
int got_some = 0;
|
|
|
|
|
|
|
|
symbolS *ptr;
|
|
|
|
eject = 1;
|
2009-07-14 14:54:47 +02:00
|
|
|
listing_page (NULL);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
for (ptr = symbol_rootP; ptr != (symbolS *) NULL; ptr = symbol_next (ptr))
|
|
|
|
{
|
|
|
|
if (SEG_NORMAL (S_GET_SEGMENT (ptr))
|
|
|
|
|| S_GET_SEGMENT (ptr) == absolute_section)
|
|
|
|
{
|
|
|
|
/* 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;
|
* README-vms: Delete.
* config-gas.com: Delete.
* makefile.vms: Delete.
* vmsconf.sh: Delete.
* config/atof-tahoe.c: Delete.
* config/m88k-opcode.h: Delete.
* config/obj-bout.c: Delete.
* config/obj-bout.h: Delete.
* config/obj-hp300.c: Delete.
* config/obj-hp300.h: Delete.
* config/tc-a29k.c: Delete.
* config/tc-a29k.h: Delete.
* config/tc-h8500.c: Delete.
* config/tc-h8500.h: Delete.
* config/tc-m88k.c: Delete.
* config/tc-m88k.h: Delete.
* config/tc-tahoe.c: Delete.
* config/tc-tahoe.h: Delete.
* config/tc-tic80.c: Delete.
* config/tc-tic80.h: Delete.
* config/tc-w65.c: Delete.
* config/tc-w65.h: Delete.
* config/te-aux.h: Delete.
* config/te-delt88.h: Delete.
* config/te-delta.h: Delete.
* config/te-dpx2.h: Delete.
* config/te-hp300.h: Delete.
* config/te-ic960.h: Delete.
* config/vms-a-conf.h: Delete.
* doc/c-a29k.texi: Delete.
* doc/c-h8500.texi: Delete.
* doc/c-m88k.texi: Delete.
* README: Remove obsolete examples, and list of supported targets.
* Makefile.am: Remove a29k, h8500, m88k, tahoe, tic80, w65,
bout and hp300 support.
(DEP_FLAGS): Don't define BFD_ASSEMBLER.
* configure.in: Remove --enable-bfd-assembler, need_bfd,
primary_bfd_gas.
* configure.tgt: Remove a29k, h8300-coff, h8500-*, i960 non-elf,
m68k non bfd, m88k, or32-coff, tic80-*, vax non-bfd, w65k-*, *-nindy.
* as.c: Remove all non-BFD_ASSEMBLER code, support for above targets.
* as.h: Likewise.
* dw2gencfi.c: Likewise.
* dwarf2dbg.c: Likewise.
* ehopt.c: Likewise.
* input-file.c: Likewise.
* listing.c: Likewise.
* literal.c: Likewise.
* messages.c: Likewise.
* obj.h: Likewise.
* output-file.c: Likewise.
* read.c: Likewise.
* stabs.c: Likewise.
* struc-symbol.h: Likewise.
* subsegs.c: Likewise.
* subsegs.h: Likewise.
* symbols.c: Likewise.
* symbols.h: Likewise.
* tc.h: Likewise.
* write.c: Likewise.
* write.h: Likewise.
* config/aout_gnu.h: Likewise.
* config/obj-aout.c: Likewise.
* config/obj-aout.h: Likewise.
* config/obj-coff.c: Likewise.
* config/obj-coff.h: Likewise.
* config/obj-evax.h: Likewise.
* config/obj-ieee.h: Likewise.
* config/tc-arm.c: Likewise.
* config/tc-arm.h: Likewise.
* config/tc-avr.c: Likewise.
* config/tc-avr.h: Likewise.
* config/tc-crx.h: Likewise.
* config/tc-d10v.h: Likewise.
* config/tc-d30v.h: Likewise.
* config/tc-dlx.h: Likewise.
* config/tc-fr30.h: Likewise.
* config/tc-frv.h: Likewise.
* config/tc-h8300.c: Likewise.
* config/tc-h8300.h: Likewise.
* config/tc-hppa.h: Likewise.
* config/tc-i370.h: Likewise.
* config/tc-i386.c: Likewise.
* config/tc-i386.h: Likewise.
* config/tc-i860.h: Likewise.
* config/tc-i960.c: Likewise.
* config/tc-i960.h: Likewise.
* config/tc-ip2k.h: Likewise.
* config/tc-iq2000.h: Likewise.
* config/tc-m32c.h: Likewise.
* config/tc-m32r.h: Likewise.
* config/tc-m68hc11.h: Likewise.
* config/tc-m68k.c: Likewise.
* config/tc-m68k.h: Likewise.
* config/tc-maxq.c: Likewise.
* config/tc-maxq.h: Likewise.
* config/tc-mcore.c: Likewise.
* config/tc-mcore.h: Likewise.
* config/tc-mn10200.h: Likewise.
* config/tc-mn10300.c: Likewise.
* config/tc-mn10300.h: Likewise.
* config/tc-ms1.h: Likewise.
* config/tc-msp430.c: Likewise.
* config/tc-msp430.h: Likewise.
* config/tc-ns32k.c: Likewise.
* config/tc-ns32k.h: Likewise.
* config/tc-openrisc.h: Likewise.
* config/tc-or32.c: Likewise.
* config/tc-or32.h: Likewise.
* config/tc-ppc.c: Likewise.
* config/tc-ppc.h: Likewise.
* config/tc-s390.h: Likewise.
* config/tc-sh.c: Likewise.
* config/tc-sh.h: Likewise.
* config/tc-sparc.c: Likewise.
* config/tc-tic30.c: Likewise.
* config/tc-tic30.h: Likewise.
* config/tc-tic4x.c: Likewise.
* config/tc-tic4x.h: Likewise.
* config/tc-tic54x.c: Likewise.
* config/tc-tic54x.h: Likewise.
* config/tc-v850.h: Likewise.
* config/tc-vax.c: Likewise.
* config/tc-vax.h: Likewise.
* config/tc-xstormy16.h: Likewise.
* config/tc-xtensa.h: Likewise.
* config/tc-z8k.c: Likewise.
* config/tc-z8k.h: Likewise.
* config/vms-a-conf.h
* doc/Makefile.am: Likewise.
* doc/all.texi: Likewise.
* doc/as.texinfo: Likewise.
* doc/Makefile.in: Regenerate.
* Makefile.in: Regenerate.
* configure: Regenerate.
* config.in: Regenerate.
* po/POTFILES.in: Regenerate.
2005-08-11 03:25:29 +02:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
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));
|
|
|
|
}
|
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
on_page++;
|
2009-07-14 14:54:47 +02:00
|
|
|
listing_page (NULL);
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
if (!got_some)
|
|
|
|
{
|
|
|
|
fprintf (list_file, "NO DEFINED SYMBOLS\n");
|
|
|
|
on_page++;
|
|
|
|
}
|
2009-07-14 14:54:47 +02:00
|
|
|
emit_line (NULL, "\n");
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
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;
|
2009-07-14 14:54:47 +02:00
|
|
|
|
|
|
|
emit_line (NULL, "UNDEFINED SYMBOLS\n");
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
2009-07-14 14:54:47 +02:00
|
|
|
|
|
|
|
emit_line (NULL, "%s\n", S_GET_NAME (ptr));
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2009-07-14 14:54:47 +02:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
if (!got_some)
|
2009-07-14 14:54:47 +02:00
|
|
|
emit_line (NULL, "NO UNDEFINED SYMBOLS\n");
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
2009-07-14 14:54:47 +02:00
|
|
|
typedef struct cached_line
|
|
|
|
{
|
|
|
|
file_info_type * file;
|
|
|
|
unsigned int line;
|
|
|
|
char buffer [LISTING_RHS_WIDTH];
|
|
|
|
} cached_line;
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
static void
|
2009-07-14 14:54:47 +02:00
|
|
|
print_source (file_info_type * current_file,
|
|
|
|
list_info_type * list,
|
|
|
|
unsigned int width)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
2009-07-14 14:54:47 +02:00
|
|
|
#define NUM_CACHE_LINES 3
|
|
|
|
static cached_line cached_lines[NUM_CACHE_LINES];
|
|
|
|
static int next_free_line = 0;
|
2009-07-16 02:37:28 +02:00
|
|
|
cached_line * cache = NULL;
|
2009-07-14 14:54:47 +02:00
|
|
|
|
|
|
|
if (current_file->linenum > list->hll_line
|
|
|
|
&& list->hll_line > 0)
|
|
|
|
{
|
|
|
|
/* This can happen with modern optimizing compilers. The source
|
|
|
|
lines from the high level language input program are split up
|
|
|
|
and interleaved, meaning the line number we want to display
|
|
|
|
(list->hll_line) can have already been displayed. We have
|
|
|
|
three choices:
|
|
|
|
|
|
|
|
a. Do nothing, since we have already displayed the source
|
|
|
|
line. This was the old behaviour.
|
|
|
|
|
|
|
|
b. Display the particular line requested again, but only
|
|
|
|
that line. This is the new behaviour.
|
|
|
|
|
|
|
|
c. Display the particular line requested again and reset
|
|
|
|
the current_file->line_num value so that we redisplay
|
|
|
|
all the following lines as well the next time we
|
|
|
|
encounter a larger line number. */
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Check the cache, maybe we already have the line saved. */
|
|
|
|
for (i = 0; i < NUM_CACHE_LINES; i++)
|
|
|
|
if (cached_lines[i].file == current_file
|
|
|
|
&& cached_lines[i].line == list->hll_line)
|
|
|
|
{
|
|
|
|
cache = cached_lines + i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i == NUM_CACHE_LINES)
|
|
|
|
{
|
|
|
|
cache = cached_lines + next_free_line;
|
|
|
|
next_free_line ++;
|
|
|
|
if (next_free_line == NUM_CACHE_LINES)
|
|
|
|
next_free_line = 0;
|
|
|
|
|
|
|
|
cache->file = current_file;
|
|
|
|
cache->line = list->hll_line;
|
|
|
|
cache->buffer[0] = 0;
|
|
|
|
rebuffer_line (current_file, cache->line, cache->buffer, width);
|
|
|
|
}
|
|
|
|
|
|
|
|
emit_line (list, "%4u:%-13s **** %s\n",
|
|
|
|
cache->line, cache->file->filename, cache->buffer);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
if (!current_file->at_end)
|
|
|
|
{
|
2009-07-14 14:54:47 +02:00
|
|
|
int num_lines_shown = 0;
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
while (current_file->linenum < list->hll_line
|
|
|
|
&& !current_file->at_end)
|
|
|
|
{
|
2009-07-14 14:54:47 +02:00
|
|
|
char *p;
|
|
|
|
|
2009-12-11 14:42:17 +01:00
|
|
|
cache = cached_lines + next_free_line;
|
2009-07-14 14:54:47 +02:00
|
|
|
cache->file = current_file;
|
2010-01-12 02:10:55 +01:00
|
|
|
cache->line = current_file->linenum + 1;
|
2009-07-14 14:54:47 +02:00
|
|
|
cache->buffer[0] = 0;
|
|
|
|
p = buffer_line (current_file, cache->buffer, width);
|
|
|
|
|
|
|
|
/* Cache optimization: If printing a group of lines
|
|
|
|
cache the first and last lines in the group. */
|
|
|
|
if (num_lines_shown == 0)
|
|
|
|
{
|
|
|
|
next_free_line ++;
|
|
|
|
if (next_free_line == NUM_CACHE_LINES)
|
|
|
|
next_free_line = 0;
|
|
|
|
}
|
2003-12-19 16:23:41 +01:00
|
|
|
|
2009-07-14 14:54:47 +02:00
|
|
|
emit_line (list, "%4u:%-13s **** %s\n",
|
|
|
|
cache->line, cache->file->filename, p);
|
|
|
|
num_lines_shown ++;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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
|
2003-11-24 18:52:33 +01:00
|
|
|
debugging_pseudo (list_info_type *list, const char *line)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
* config/obj-evax.h (S_SET_OTHER, S_SET_TYPE, S_SET_DESC): Don't define.
* config/tc-crx.c (gettrap): Constify arg.
(handle_LoadStor, get_cinv_parameters): Likewise.
(getreg_image): Fix enum warning
(md_assemble): Restore input line char.
* config/tc-hppa.c (tc_gen_reloc): Fix enum warning.
* config/tc-i960.c (mem_fmt): Rename var to fix shadow warning.
* config/tc-sh.c (sh_fdpic): Only define when OBJ_ELF.
(build_Mytes): Fix build failure for non-elf targets.
* config/tc-tic4x.c (tic4x_eval): Restore terminator char.
* config/tc-xtensa.c (xtensa_end_directive): Fix switch enum warning.
* cgen.c (gas_cgen_md_apply_fix): Avoid set but unused warning.
* ecoff.c (add_ecoff_symbol): Likewise.
* itbl-ops.c (append_insns_as_macros): Likewise.
* listing.c (debugging_pseudo): Likewise.
* read.c (s_mri_common, stringer): Likewise.
* config/obj-coff.c (coff_frob_section): Likewise.
* config/tc-alpha.c (emit_ldgp, s_alpha_proc): Likewise.
* config/tc-arm.c (my_get_expression): Likewise.
* config/tc-hppa.c (process_exit, pa_type_args): Likewise.
* config/tc-m32c.c (md_assemble): Likewise.
* config/tc-microblaze.c (md_convert_frag): Likewise.
* config/tc-mips.c (s_change_section): Likewise.
* config/tc-mt.c (mt_fix_adjustable): Likewise.
* config/tc-xtensa.c (xtensa_literal_pseudo): Likewise.
* config/obj-aout.c (obj_aout_frob_symbol): Delete set but otherwise
unused vars.
* config/tc-alpha.c (load_expression): Likewise.
(s_alpha_rdata, s_alpha_section, s_alpha_prologue): Likewise.
* config/tc-arm.c (parse_neon_el_struct_list): Likewise.
* config/tc-avr.c (extract_word): Likewise.
* config/tc-cris.c (cris_get_expression): Likewise.
* config/tc-d30v.c (build_insn, find_format): Likewise.
* config/tc-dlx.c (machine_ip): Likewise.
* config/tc-hppa.c (pa_get_absolute_expression): Likewise.
* config/tc-i370.c (md_assemble): Likewise.
* config/tc-i960.c (brtab_emit): Likewise.
* config/tc-iq2000.c (s_iq2000_ent): Likewise.
* config/tc-m32c.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (fixup24, build_jump_insn): Likewise.
(md_estimate_size_before_relax, md_apply_fix): Likewise.
* config/tc-m68k.c (md_show_usage): Likewise.
* config/tc-microblaze.c (microblaze_s_lcomm): Likewise.
* config/tc-mips.c (s_mips_end): Likewise.
* config/tc-mmix.c (mmix_byte, mmix_cons): Likewise.
* config/tc-mn10300.c (md_assemble): Likewise.
* config/tc-msp430.c (extract_word): Likewise.
* config/tc-mt.c (md_assemble): Likewise.
* config/tc-or32.c (machine_ip): Likewise.
* config/tc-pj.c (md_apply_fix): Likewise.
* config/tc-s390.c (md_gather_operands): Likewise.
* config/tc-sh.c (sh_cons_align): Likewise.
* config/tc-sparc.c (sparc_cons_align): Likewise.
* config/tc-tic4x.c (tic4x_sect): Likewise.
* config/tc-tic54x.c (tic54x_stringer): Likewise.
* config/tc-vax.c (vip_op): Likewise.
* config/tc-xstormy16.c (xstormy16_cons_fix_new): Likewise.
* config/tc-xtensa.c (md_assemble): Likewise.
(xtensa_fix_short_loop_frags, convert_frag_immed): Likewise.
(xtensa_move_literals): Likewise.
2010-06-28 16:06:57 +02:00
|
|
|
#ifdef OBJ_ELF
|
1999-05-03 09:29:11 +02:00
|
|
|
static int in_debug;
|
|
|
|
int was_debug;
|
* config/obj-evax.h (S_SET_OTHER, S_SET_TYPE, S_SET_DESC): Don't define.
* config/tc-crx.c (gettrap): Constify arg.
(handle_LoadStor, get_cinv_parameters): Likewise.
(getreg_image): Fix enum warning
(md_assemble): Restore input line char.
* config/tc-hppa.c (tc_gen_reloc): Fix enum warning.
* config/tc-i960.c (mem_fmt): Rename var to fix shadow warning.
* config/tc-sh.c (sh_fdpic): Only define when OBJ_ELF.
(build_Mytes): Fix build failure for non-elf targets.
* config/tc-tic4x.c (tic4x_eval): Restore terminator char.
* config/tc-xtensa.c (xtensa_end_directive): Fix switch enum warning.
* cgen.c (gas_cgen_md_apply_fix): Avoid set but unused warning.
* ecoff.c (add_ecoff_symbol): Likewise.
* itbl-ops.c (append_insns_as_macros): Likewise.
* listing.c (debugging_pseudo): Likewise.
* read.c (s_mri_common, stringer): Likewise.
* config/obj-coff.c (coff_frob_section): Likewise.
* config/tc-alpha.c (emit_ldgp, s_alpha_proc): Likewise.
* config/tc-arm.c (my_get_expression): Likewise.
* config/tc-hppa.c (process_exit, pa_type_args): Likewise.
* config/tc-m32c.c (md_assemble): Likewise.
* config/tc-microblaze.c (md_convert_frag): Likewise.
* config/tc-mips.c (s_change_section): Likewise.
* config/tc-mt.c (mt_fix_adjustable): Likewise.
* config/tc-xtensa.c (xtensa_literal_pseudo): Likewise.
* config/obj-aout.c (obj_aout_frob_symbol): Delete set but otherwise
unused vars.
* config/tc-alpha.c (load_expression): Likewise.
(s_alpha_rdata, s_alpha_section, s_alpha_prologue): Likewise.
* config/tc-arm.c (parse_neon_el_struct_list): Likewise.
* config/tc-avr.c (extract_word): Likewise.
* config/tc-cris.c (cris_get_expression): Likewise.
* config/tc-d30v.c (build_insn, find_format): Likewise.
* config/tc-dlx.c (machine_ip): Likewise.
* config/tc-hppa.c (pa_get_absolute_expression): Likewise.
* config/tc-i370.c (md_assemble): Likewise.
* config/tc-i960.c (brtab_emit): Likewise.
* config/tc-iq2000.c (s_iq2000_ent): Likewise.
* config/tc-m32c.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (fixup24, build_jump_insn): Likewise.
(md_estimate_size_before_relax, md_apply_fix): Likewise.
* config/tc-m68k.c (md_show_usage): Likewise.
* config/tc-microblaze.c (microblaze_s_lcomm): Likewise.
* config/tc-mips.c (s_mips_end): Likewise.
* config/tc-mmix.c (mmix_byte, mmix_cons): Likewise.
* config/tc-mn10300.c (md_assemble): Likewise.
* config/tc-msp430.c (extract_word): Likewise.
* config/tc-mt.c (md_assemble): Likewise.
* config/tc-or32.c (machine_ip): Likewise.
* config/tc-pj.c (md_apply_fix): Likewise.
* config/tc-s390.c (md_gather_operands): Likewise.
* config/tc-sh.c (sh_cons_align): Likewise.
* config/tc-sparc.c (sparc_cons_align): Likewise.
* config/tc-tic4x.c (tic4x_sect): Likewise.
* config/tc-tic54x.c (tic54x_stringer): Likewise.
* config/tc-vax.c (vip_op): Likewise.
* config/tc-xstormy16.c (xstormy16_cons_fix_new): Likewise.
* config/tc-xtensa.c (md_assemble): Likewise.
(xtensa_fix_short_loop_frags, convert_frag_immed): Likewise.
(xtensa_move_literals): Likewise.
2010-06-28 16:06:57 +02:00
|
|
|
#endif
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
if (list->debugging)
|
|
|
|
{
|
* config/obj-evax.h (S_SET_OTHER, S_SET_TYPE, S_SET_DESC): Don't define.
* config/tc-crx.c (gettrap): Constify arg.
(handle_LoadStor, get_cinv_parameters): Likewise.
(getreg_image): Fix enum warning
(md_assemble): Restore input line char.
* config/tc-hppa.c (tc_gen_reloc): Fix enum warning.
* config/tc-i960.c (mem_fmt): Rename var to fix shadow warning.
* config/tc-sh.c (sh_fdpic): Only define when OBJ_ELF.
(build_Mytes): Fix build failure for non-elf targets.
* config/tc-tic4x.c (tic4x_eval): Restore terminator char.
* config/tc-xtensa.c (xtensa_end_directive): Fix switch enum warning.
* cgen.c (gas_cgen_md_apply_fix): Avoid set but unused warning.
* ecoff.c (add_ecoff_symbol): Likewise.
* itbl-ops.c (append_insns_as_macros): Likewise.
* listing.c (debugging_pseudo): Likewise.
* read.c (s_mri_common, stringer): Likewise.
* config/obj-coff.c (coff_frob_section): Likewise.
* config/tc-alpha.c (emit_ldgp, s_alpha_proc): Likewise.
* config/tc-arm.c (my_get_expression): Likewise.
* config/tc-hppa.c (process_exit, pa_type_args): Likewise.
* config/tc-m32c.c (md_assemble): Likewise.
* config/tc-microblaze.c (md_convert_frag): Likewise.
* config/tc-mips.c (s_change_section): Likewise.
* config/tc-mt.c (mt_fix_adjustable): Likewise.
* config/tc-xtensa.c (xtensa_literal_pseudo): Likewise.
* config/obj-aout.c (obj_aout_frob_symbol): Delete set but otherwise
unused vars.
* config/tc-alpha.c (load_expression): Likewise.
(s_alpha_rdata, s_alpha_section, s_alpha_prologue): Likewise.
* config/tc-arm.c (parse_neon_el_struct_list): Likewise.
* config/tc-avr.c (extract_word): Likewise.
* config/tc-cris.c (cris_get_expression): Likewise.
* config/tc-d30v.c (build_insn, find_format): Likewise.
* config/tc-dlx.c (machine_ip): Likewise.
* config/tc-hppa.c (pa_get_absolute_expression): Likewise.
* config/tc-i370.c (md_assemble): Likewise.
* config/tc-i960.c (brtab_emit): Likewise.
* config/tc-iq2000.c (s_iq2000_ent): Likewise.
* config/tc-m32c.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (fixup24, build_jump_insn): Likewise.
(md_estimate_size_before_relax, md_apply_fix): Likewise.
* config/tc-m68k.c (md_show_usage): Likewise.
* config/tc-microblaze.c (microblaze_s_lcomm): Likewise.
* config/tc-mips.c (s_mips_end): Likewise.
* config/tc-mmix.c (mmix_byte, mmix_cons): Likewise.
* config/tc-mn10300.c (md_assemble): Likewise.
* config/tc-msp430.c (extract_word): Likewise.
* config/tc-mt.c (md_assemble): Likewise.
* config/tc-or32.c (machine_ip): Likewise.
* config/tc-pj.c (md_apply_fix): Likewise.
* config/tc-s390.c (md_gather_operands): Likewise.
* config/tc-sh.c (sh_cons_align): Likewise.
* config/tc-sparc.c (sparc_cons_align): Likewise.
* config/tc-tic4x.c (tic4x_sect): Likewise.
* config/tc-tic54x.c (tic54x_stringer): Likewise.
* config/tc-vax.c (vip_op): Likewise.
* config/tc-xstormy16.c (xstormy16_cons_fix_new): Likewise.
* config/tc-xtensa.c (md_assemble): Likewise.
(xtensa_fix_short_loop_frags, convert_frag_immed): Likewise.
(xtensa_move_literals): Likewise.
2010-06-28 16:06:57 +02:00
|
|
|
#ifdef OBJ_ELF
|
1999-05-03 09:29:11 +02:00
|
|
|
in_debug = 1;
|
* config/obj-evax.h (S_SET_OTHER, S_SET_TYPE, S_SET_DESC): Don't define.
* config/tc-crx.c (gettrap): Constify arg.
(handle_LoadStor, get_cinv_parameters): Likewise.
(getreg_image): Fix enum warning
(md_assemble): Restore input line char.
* config/tc-hppa.c (tc_gen_reloc): Fix enum warning.
* config/tc-i960.c (mem_fmt): Rename var to fix shadow warning.
* config/tc-sh.c (sh_fdpic): Only define when OBJ_ELF.
(build_Mytes): Fix build failure for non-elf targets.
* config/tc-tic4x.c (tic4x_eval): Restore terminator char.
* config/tc-xtensa.c (xtensa_end_directive): Fix switch enum warning.
* cgen.c (gas_cgen_md_apply_fix): Avoid set but unused warning.
* ecoff.c (add_ecoff_symbol): Likewise.
* itbl-ops.c (append_insns_as_macros): Likewise.
* listing.c (debugging_pseudo): Likewise.
* read.c (s_mri_common, stringer): Likewise.
* config/obj-coff.c (coff_frob_section): Likewise.
* config/tc-alpha.c (emit_ldgp, s_alpha_proc): Likewise.
* config/tc-arm.c (my_get_expression): Likewise.
* config/tc-hppa.c (process_exit, pa_type_args): Likewise.
* config/tc-m32c.c (md_assemble): Likewise.
* config/tc-microblaze.c (md_convert_frag): Likewise.
* config/tc-mips.c (s_change_section): Likewise.
* config/tc-mt.c (mt_fix_adjustable): Likewise.
* config/tc-xtensa.c (xtensa_literal_pseudo): Likewise.
* config/obj-aout.c (obj_aout_frob_symbol): Delete set but otherwise
unused vars.
* config/tc-alpha.c (load_expression): Likewise.
(s_alpha_rdata, s_alpha_section, s_alpha_prologue): Likewise.
* config/tc-arm.c (parse_neon_el_struct_list): Likewise.
* config/tc-avr.c (extract_word): Likewise.
* config/tc-cris.c (cris_get_expression): Likewise.
* config/tc-d30v.c (build_insn, find_format): Likewise.
* config/tc-dlx.c (machine_ip): Likewise.
* config/tc-hppa.c (pa_get_absolute_expression): Likewise.
* config/tc-i370.c (md_assemble): Likewise.
* config/tc-i960.c (brtab_emit): Likewise.
* config/tc-iq2000.c (s_iq2000_ent): Likewise.
* config/tc-m32c.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (fixup24, build_jump_insn): Likewise.
(md_estimate_size_before_relax, md_apply_fix): Likewise.
* config/tc-m68k.c (md_show_usage): Likewise.
* config/tc-microblaze.c (microblaze_s_lcomm): Likewise.
* config/tc-mips.c (s_mips_end): Likewise.
* config/tc-mmix.c (mmix_byte, mmix_cons): Likewise.
* config/tc-mn10300.c (md_assemble): Likewise.
* config/tc-msp430.c (extract_word): Likewise.
* config/tc-mt.c (md_assemble): Likewise.
* config/tc-or32.c (machine_ip): Likewise.
* config/tc-pj.c (md_apply_fix): Likewise.
* config/tc-s390.c (md_gather_operands): Likewise.
* config/tc-sh.c (sh_cons_align): Likewise.
* config/tc-sparc.c (sparc_cons_align): Likewise.
* config/tc-tic4x.c (tic4x_sect): Likewise.
* config/tc-tic54x.c (tic54x_stringer): Likewise.
* config/tc-vax.c (vip_op): Likewise.
* config/tc-xstormy16.c (xstormy16_cons_fix_new): Likewise.
* config/tc-xtensa.c (md_assemble): Likewise.
(xtensa_fix_short_loop_frags, convert_frag_immed): Likewise.
(xtensa_move_literals): Likewise.
2010-06-28 16:06:57 +02:00
|
|
|
#endif
|
1999-05-03 09:29:11 +02:00
|
|
|
return 1;
|
|
|
|
}
|
* config/obj-evax.h (S_SET_OTHER, S_SET_TYPE, S_SET_DESC): Don't define.
* config/tc-crx.c (gettrap): Constify arg.
(handle_LoadStor, get_cinv_parameters): Likewise.
(getreg_image): Fix enum warning
(md_assemble): Restore input line char.
* config/tc-hppa.c (tc_gen_reloc): Fix enum warning.
* config/tc-i960.c (mem_fmt): Rename var to fix shadow warning.
* config/tc-sh.c (sh_fdpic): Only define when OBJ_ELF.
(build_Mytes): Fix build failure for non-elf targets.
* config/tc-tic4x.c (tic4x_eval): Restore terminator char.
* config/tc-xtensa.c (xtensa_end_directive): Fix switch enum warning.
* cgen.c (gas_cgen_md_apply_fix): Avoid set but unused warning.
* ecoff.c (add_ecoff_symbol): Likewise.
* itbl-ops.c (append_insns_as_macros): Likewise.
* listing.c (debugging_pseudo): Likewise.
* read.c (s_mri_common, stringer): Likewise.
* config/obj-coff.c (coff_frob_section): Likewise.
* config/tc-alpha.c (emit_ldgp, s_alpha_proc): Likewise.
* config/tc-arm.c (my_get_expression): Likewise.
* config/tc-hppa.c (process_exit, pa_type_args): Likewise.
* config/tc-m32c.c (md_assemble): Likewise.
* config/tc-microblaze.c (md_convert_frag): Likewise.
* config/tc-mips.c (s_change_section): Likewise.
* config/tc-mt.c (mt_fix_adjustable): Likewise.
* config/tc-xtensa.c (xtensa_literal_pseudo): Likewise.
* config/obj-aout.c (obj_aout_frob_symbol): Delete set but otherwise
unused vars.
* config/tc-alpha.c (load_expression): Likewise.
(s_alpha_rdata, s_alpha_section, s_alpha_prologue): Likewise.
* config/tc-arm.c (parse_neon_el_struct_list): Likewise.
* config/tc-avr.c (extract_word): Likewise.
* config/tc-cris.c (cris_get_expression): Likewise.
* config/tc-d30v.c (build_insn, find_format): Likewise.
* config/tc-dlx.c (machine_ip): Likewise.
* config/tc-hppa.c (pa_get_absolute_expression): Likewise.
* config/tc-i370.c (md_assemble): Likewise.
* config/tc-i960.c (brtab_emit): Likewise.
* config/tc-iq2000.c (s_iq2000_ent): Likewise.
* config/tc-m32c.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (fixup24, build_jump_insn): Likewise.
(md_estimate_size_before_relax, md_apply_fix): Likewise.
* config/tc-m68k.c (md_show_usage): Likewise.
* config/tc-microblaze.c (microblaze_s_lcomm): Likewise.
* config/tc-mips.c (s_mips_end): Likewise.
* config/tc-mmix.c (mmix_byte, mmix_cons): Likewise.
* config/tc-mn10300.c (md_assemble): Likewise.
* config/tc-msp430.c (extract_word): Likewise.
* config/tc-mt.c (md_assemble): Likewise.
* config/tc-or32.c (machine_ip): Likewise.
* config/tc-pj.c (md_apply_fix): Likewise.
* config/tc-s390.c (md_gather_operands): Likewise.
* config/tc-sh.c (sh_cons_align): Likewise.
* config/tc-sparc.c (sparc_cons_align): Likewise.
* config/tc-tic4x.c (tic4x_sect): Likewise.
* config/tc-tic54x.c (tic54x_stringer): Likewise.
* config/tc-vax.c (vip_op): Likewise.
* config/tc-xstormy16.c (xstormy16_cons_fix_new): Likewise.
* config/tc-xtensa.c (md_assemble): Likewise.
(xtensa_fix_short_loop_frags, convert_frag_immed): Likewise.
(xtensa_move_literals): Likewise.
2010-06-28 16:06:57 +02:00
|
|
|
#ifdef OBJ_ELF
|
1999-05-03 09:29:11 +02:00
|
|
|
was_debug = in_debug;
|
|
|
|
in_debug = 0;
|
* config/obj-evax.h (S_SET_OTHER, S_SET_TYPE, S_SET_DESC): Don't define.
* config/tc-crx.c (gettrap): Constify arg.
(handle_LoadStor, get_cinv_parameters): Likewise.
(getreg_image): Fix enum warning
(md_assemble): Restore input line char.
* config/tc-hppa.c (tc_gen_reloc): Fix enum warning.
* config/tc-i960.c (mem_fmt): Rename var to fix shadow warning.
* config/tc-sh.c (sh_fdpic): Only define when OBJ_ELF.
(build_Mytes): Fix build failure for non-elf targets.
* config/tc-tic4x.c (tic4x_eval): Restore terminator char.
* config/tc-xtensa.c (xtensa_end_directive): Fix switch enum warning.
* cgen.c (gas_cgen_md_apply_fix): Avoid set but unused warning.
* ecoff.c (add_ecoff_symbol): Likewise.
* itbl-ops.c (append_insns_as_macros): Likewise.
* listing.c (debugging_pseudo): Likewise.
* read.c (s_mri_common, stringer): Likewise.
* config/obj-coff.c (coff_frob_section): Likewise.
* config/tc-alpha.c (emit_ldgp, s_alpha_proc): Likewise.
* config/tc-arm.c (my_get_expression): Likewise.
* config/tc-hppa.c (process_exit, pa_type_args): Likewise.
* config/tc-m32c.c (md_assemble): Likewise.
* config/tc-microblaze.c (md_convert_frag): Likewise.
* config/tc-mips.c (s_change_section): Likewise.
* config/tc-mt.c (mt_fix_adjustable): Likewise.
* config/tc-xtensa.c (xtensa_literal_pseudo): Likewise.
* config/obj-aout.c (obj_aout_frob_symbol): Delete set but otherwise
unused vars.
* config/tc-alpha.c (load_expression): Likewise.
(s_alpha_rdata, s_alpha_section, s_alpha_prologue): Likewise.
* config/tc-arm.c (parse_neon_el_struct_list): Likewise.
* config/tc-avr.c (extract_word): Likewise.
* config/tc-cris.c (cris_get_expression): Likewise.
* config/tc-d30v.c (build_insn, find_format): Likewise.
* config/tc-dlx.c (machine_ip): Likewise.
* config/tc-hppa.c (pa_get_absolute_expression): Likewise.
* config/tc-i370.c (md_assemble): Likewise.
* config/tc-i960.c (brtab_emit): Likewise.
* config/tc-iq2000.c (s_iq2000_ent): Likewise.
* config/tc-m32c.c (md_convert_frag): Likewise.
* config/tc-m68hc11.c (fixup24, build_jump_insn): Likewise.
(md_estimate_size_before_relax, md_apply_fix): Likewise.
* config/tc-m68k.c (md_show_usage): Likewise.
* config/tc-microblaze.c (microblaze_s_lcomm): Likewise.
* config/tc-mips.c (s_mips_end): Likewise.
* config/tc-mmix.c (mmix_byte, mmix_cons): Likewise.
* config/tc-mn10300.c (md_assemble): Likewise.
* config/tc-msp430.c (extract_word): Likewise.
* config/tc-mt.c (md_assemble): Likewise.
* config/tc-or32.c (machine_ip): Likewise.
* config/tc-pj.c (md_apply_fix): Likewise.
* config/tc-s390.c (md_gather_operands): Likewise.
* config/tc-sh.c (sh_cons_align): Likewise.
* config/tc-sparc.c (sparc_cons_align): Likewise.
* config/tc-tic4x.c (tic4x_sect): Likewise.
* config/tc-tic54x.c (tic54x_stringer): Likewise.
* config/tc-vax.c (vip_op): Likewise.
* config/tc-xstormy16.c (xstormy16_cons_fix_new): Likewise.
* config/tc-xtensa.c (md_assemble): Likewise.
(xtensa_fix_short_loop_frags, convert_frag_immed): Likewise.
(xtensa_move_literals): Likewise.
2010-06-28 16:06:57 +02:00
|
|
|
#endif
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2001-09-19 07:33:36 +02:00
|
|
|
while (ISSPACE (*line))
|
1999-05-03 09:29:11 +02:00
|
|
|
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
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_listing (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 *buffer;
|
|
|
|
char *p;
|
|
|
|
int show_listing = 1;
|
|
|
|
unsigned int width;
|
|
|
|
|
2009-09-11 17:27:38 +02:00
|
|
|
buffer = (char *) xmalloc (listing_rhs_width);
|
|
|
|
data_buffer = (char *) xmalloc (MAX_BYTES);
|
1999-05-03 09:29:11 +02:00
|
|
|
eject = 1;
|
|
|
|
list = head->next;
|
|
|
|
|
|
|
|
while (list)
|
|
|
|
{
|
1999-07-11 22:20:04 +02:00
|
|
|
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:
|
2001-03-31 08:47:54 +02:00
|
|
|
if (show_listing == 0)
|
|
|
|
list_line--;
|
1999-05-03 09:29:11 +02:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
2001-03-31 08:47:54 +02:00
|
|
|
if (list->edict == EDICT_LIST
|
|
|
|
|| (list->edict == EDICT_NOLIST_NEXT && show_listing == 0))
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
/* 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). */
|
|
|
|
if (list->hll_file)
|
2003-12-19 16:23:41 +01:00
|
|
|
current_hll_file = list->hll_file;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
if (current_hll_file && list->hll_line && (listing & LISTING_HLL))
|
2009-07-14 14:54:47 +02:00
|
|
|
print_source (current_hll_file, list, width);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
if (list->line_contents)
|
|
|
|
{
|
|
|
|
if (!((listing & LISTING_NODEBUG)
|
|
|
|
&& debugging_pseudo (list, list->line_contents)))
|
2003-12-19 16:23:41 +01:00
|
|
|
print_lines (list,
|
|
|
|
list->file->linenum == 0 ? list->line : list->file->linenum,
|
|
|
|
list->line_contents, calc_hex (list));
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
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)
|
2000-08-31 08:11:03 +02:00
|
|
|
address = ~(unsigned int) 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
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)
|
2003-12-19 16:23:41 +01:00
|
|
|
eject = 1;
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
2001-03-31 08:47:54 +02:00
|
|
|
if (list->edict == EDICT_NOLIST_NEXT && show_listing == 1)
|
1999-05-03 09:29:11 +02:00
|
|
|
--show_listing;
|
|
|
|
|
|
|
|
list = list->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
free (buffer);
|
|
|
|
free (data_buffer);
|
|
|
|
data_buffer = NULL;
|
|
|
|
}
|
|
|
|
|
2008-04-10 14:45:18 +02:00
|
|
|
/* Print time stamp in ISO format: yyyy-mm-ddThh:mm:ss.ss+/-zzzz. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
print_timestamp (void)
|
|
|
|
{
|
|
|
|
const time_t now = time (NULL);
|
2008-04-11 11:06:02 +02:00
|
|
|
struct tm * timestamp;
|
2008-04-10 14:45:18 +02:00
|
|
|
char stampstr[MAX_DATELEN];
|
|
|
|
|
|
|
|
/* Any portable way to obtain subsecond values??? */
|
2008-04-11 11:06:02 +02:00
|
|
|
timestamp = localtime (&now);
|
|
|
|
strftime (stampstr, MAX_DATELEN, "%Y-%m-%dT%H:%M:%S.000%z", timestamp);
|
2008-04-10 14:45:18 +02:00
|
|
|
fprintf (list_file, _("\n time stamp \t: %s\n\n"), stampstr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
print_single_option (char * opt, int *pos)
|
|
|
|
{
|
|
|
|
int opt_len = strlen (opt);
|
|
|
|
|
|
|
|
if ((*pos + opt_len) < paper_width)
|
|
|
|
{
|
|
|
|
fprintf (list_file, _("%s "), opt);
|
|
|
|
*pos = *pos + opt_len;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
fprintf (list_file, _("\n\t%s "), opt);
|
|
|
|
*pos = opt_len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Print options passed to as. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
print_options (char ** argv)
|
|
|
|
{
|
|
|
|
const char *field_name = _("\n options passed\t: ");
|
|
|
|
int pos = strlen (field_name);
|
|
|
|
char **p;
|
|
|
|
|
2008-09-24 16:38:03 +02:00
|
|
|
fputs (field_name, list_file);
|
2008-04-10 14:45:18 +02:00
|
|
|
for (p = &argv[1]; *p != NULL; p++)
|
|
|
|
if (**p == '-')
|
|
|
|
{
|
|
|
|
/* Ignore these. */
|
|
|
|
if (strcmp (*p, "-o") == 0)
|
|
|
|
{
|
|
|
|
if (p[1] != NULL)
|
|
|
|
p++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (strcmp (*p, "-v") == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
print_single_option (*p, &pos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Print a first section with basic info like file names, as version,
|
|
|
|
options passed, target, and timestamp.
|
|
|
|
The format of this section is as follows:
|
|
|
|
|
|
|
|
AS VERSION
|
|
|
|
|
|
|
|
fieldname TAB ':' fieldcontents
|
|
|
|
{ TAB fieldcontents-cont } */
|
|
|
|
|
|
|
|
static void
|
|
|
|
listing_general_info (char ** argv)
|
|
|
|
{
|
|
|
|
/* Print the stuff on the first line. */
|
|
|
|
eject = 1;
|
2009-07-14 14:54:47 +02:00
|
|
|
listing_page (NULL);
|
2008-04-10 14:45:18 +02:00
|
|
|
|
|
|
|
fprintf (list_file,
|
|
|
|
_(" GNU assembler version %s (%s)\n\t using BFD version %s."),
|
|
|
|
VERSION, TARGET_ALIAS, BFD_VERSION_STRING);
|
|
|
|
print_options (argv);
|
|
|
|
fprintf (list_file, _("\n input file \t: %s"), fn);
|
|
|
|
fprintf (list_file, _("\n output file \t: %s"), out_file_name);
|
|
|
|
fprintf (list_file, _("\n target \t: %s"), TARGET_CANONICAL);
|
|
|
|
print_timestamp ();
|
|
|
|
}
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
void
|
2008-04-10 14:45:18 +02:00
|
|
|
listing_print (char *name, char **argv)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
int using_stdout;
|
2000-08-31 08:11:03 +02:00
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
title = "";
|
|
|
|
subtitle = "";
|
|
|
|
|
|
|
|
if (name == NULL)
|
|
|
|
{
|
|
|
|
list_file = stdout;
|
|
|
|
using_stdout = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2001-07-10 11:45:50 +02:00
|
|
|
list_file = fopen (name, FOPEN_WT);
|
1999-05-03 09:29:11 +02:00
|
|
|
if (list_file != NULL)
|
|
|
|
using_stdout = 0;
|
|
|
|
else
|
|
|
|
{
|
2006-09-22 13:35:14 +02:00
|
|
|
as_warn (_("can't open %s: %s"), name, xstrerror (errno));
|
1999-05-03 09:29:11 +02:00
|
|
|
list_file = stdout;
|
|
|
|
using_stdout = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (listing & LISTING_NOFORM)
|
2003-12-19 16:23:41 +01:00
|
|
|
paper_height = 0;
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2008-04-10 14:45:18 +02:00
|
|
|
if (listing & LISTING_GENERAL)
|
|
|
|
listing_general_info (argv);
|
|
|
|
|
1999-05-03 09:29:11 +02:00
|
|
|
if (listing & LISTING_LISTING)
|
2003-12-19 16:23:41 +01:00
|
|
|
listing_listing (name);
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
if (listing & LISTING_SYMBOLS)
|
2003-12-19 16:23:41 +01:00
|
|
|
list_symbol_table ();
|
1999-05-03 09:29:11 +02:00
|
|
|
|
|
|
|
if (! using_stdout)
|
|
|
|
{
|
|
|
|
if (fclose (list_file) == EOF)
|
2006-09-22 13:35:14 +02:00
|
|
|
as_warn (_("can't close %s: %s"), name, xstrerror (errno));
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (last_open_file)
|
2003-12-19 16:23:41 +01:00
|
|
|
fclose (last_open_file);
|
1999-05-03 09:29:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_file (const char *name)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
fn = name;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_eject (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
if (listing)
|
|
|
|
listing_tail->edict = EDICT_EJECT;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_list (int on)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
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
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_psize (int width_only)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
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
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_nopage (int ignore ATTRIBUTE_UNUSED)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
paper_height = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_title (int depth)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
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;
|
2009-09-11 17:27:38 +02:00
|
|
|
ttl = (char *) xmalloc (length + 1);
|
1999-05-03 09:29:11 +02:00
|
|
|
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')
|
|
|
|
{
|
* read.c: Standardize error/warning messages - don't capitalise, no
final period or newline, don't say "ignored" or "zero assumed" for
as_bad messages. In some cases, change the wording to that used
elsewhere for similar messages.
* app.c, as.c, atof-generic.c, cgen.c, cond.c, depend.c, dwarf2dbg.c,
ecoff.c, expr.c, frags.c, input-file.c, input-scrub.c, listing.c,
output-file.c, stabs.c, subsegs.c, symbols.c, write.c: Likewise.
* ecoff.c (ecoff_directive_end): Test for missing name by
comparing input line pointers rather than reading string.
(ecoff_directive_ent): Likewise.
* read.c (s_set): Likewise.
(s_align): Report a warning rather than an error for
alignment too large.
(s_comm): Check for missing symbol name.
(s_lcomm_internal): Likewise.
(s_lsym): Likewise.
(s_globl): Use is_end_of_line instead of looking for '\n'.
(s_lcomm_internal): Likewise.
(ignore_rest_of_line): Report a warning rather than an error.
2001-08-01 03:44:25 +02:00
|
|
|
as_bad (_("new line in title"));
|
1999-05-03 09:29:11 +02:00
|
|
|
demand_empty_rest_of_line ();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
input_line_pointer++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_source_line (unsigned int line)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
if (listing)
|
|
|
|
{
|
|
|
|
new_frag ();
|
|
|
|
listing_tail->hll_line = line;
|
|
|
|
new_frag ();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_source_file (const char *file)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
if (listing)
|
|
|
|
listing_tail->hll_file = file_info (file);
|
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
/* Dummy functions for when compiled without listing enabled. */
|
1999-05-03 09:29:11 +02:00
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_list (int on)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
s_ignore (0);
|
|
|
|
}
|
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_eject (int ignore)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
s_ignore (0);
|
|
|
|
}
|
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_psize (int ignore)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
s_ignore (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_nopage (int ignore)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
s_ignore (0);
|
|
|
|
}
|
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_title (int depth)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
s_ignore (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_file (const char *name)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_newline (char *name)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2000-08-31 08:11:03 +02:00
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_source_line (unsigned int n)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
}
|
2000-08-31 08:11:03 +02:00
|
|
|
|
|
|
|
void
|
2003-11-24 18:52:33 +01:00
|
|
|
listing_source_file (const char *n)
|
1999-05-03 09:29:11 +02:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|