1999-05-03 15:29:11 +08:00
|
|
|
|
/* input_scrub.c - Break up input buffers into whole numbers of lines.
|
2020-01-01 15:57:01 +08:00
|
|
|
|
Copyright (C) 1987-2020 Free Software Foundation, Inc.
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
This file is part of GAS, the GNU Assembler.
|
|
|
|
|
|
|
|
|
|
GAS is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-07-03 19:01:12 +08:00
|
|
|
|
the Free Software Foundation; either version 3, or (at your option)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
any later version.
|
|
|
|
|
|
|
|
|
|
GAS is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with GAS; see the file COPYING. If not, write to the Free
|
2005-05-05 17:13:19 +08:00
|
|
|
|
Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA
|
|
|
|
|
02110-1301, USA. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
#include "as.h"
|
2011-03-01 02:32:52 +08:00
|
|
|
|
#include "filenames.h"
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#include "input-file.h"
|
|
|
|
|
#include "sb.h"
|
|
|
|
|
#include "listing.h"
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* O/S independent module to supply buffers of sanitised source code
|
|
|
|
|
* to rest of assembler. We get sanitised input data of arbitrary length.
|
|
|
|
|
* We break these buffers on line boundaries, recombine pieces that
|
|
|
|
|
* were broken across buffers, and return a buffer of full lines to
|
|
|
|
|
* the caller.
|
|
|
|
|
* The last partial line begins the next buffer we build and return to caller.
|
2003-10-27 20:45:17 +08:00
|
|
|
|
* The buffer returned to caller is preceded by BEFORE_STRING and followed
|
1999-05-03 15:29:11 +08:00
|
|
|
|
* by AFTER_STRING, as sentinels. The last character before AFTER_STRING
|
|
|
|
|
* is a newline.
|
|
|
|
|
* Also looks after line numbers, for e.g. error messages.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* We don't care how filthy our buffers are, but our callers assume
|
|
|
|
|
* that the following sanitation has already been done.
|
|
|
|
|
*
|
|
|
|
|
* No comments, reduce a comment to a space.
|
|
|
|
|
* Reduce a tab to a space unless it is 1st char of line.
|
|
|
|
|
* All multiple tabs and spaces collapsed into 1 char. Tab only
|
|
|
|
|
* legal if 1st char of line.
|
|
|
|
|
* # line file statements converted to .line x;.file y; statements.
|
|
|
|
|
* Escaped newlines at end of line: remove them but add as many newlines
|
|
|
|
|
* to end of statement as you removed in the middle, to synch line numbers.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#define BEFORE_STRING ("\n")
|
2000-09-08 04:28:45 +08:00
|
|
|
|
#define AFTER_STRING ("\0") /* memcpy of 0 chars might choke. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#define BEFORE_SIZE (1)
|
|
|
|
|
#define AFTER_SIZE (1)
|
|
|
|
|
|
2006-10-16 20:02:40 +08:00
|
|
|
|
#ifndef TC_EOL_IN_INSN
|
|
|
|
|
#define TC_EOL_IN_INSN(P) 0
|
|
|
|
|
#endif
|
|
|
|
|
|
2000-09-08 04:28:45 +08:00
|
|
|
|
static char *buffer_start; /*->1st char of full buffer area. */
|
|
|
|
|
static char *partial_where; /*->after last full line in buffer. */
|
2016-11-04 11:42:23 +08:00
|
|
|
|
static size_t partial_size; /* >=0. Number of chars in partial line in buffer. */
|
2000-11-07 05:55:46 +08:00
|
|
|
|
|
|
|
|
|
/* Because we need AFTER_STRING just after last full line, it clobbers
|
|
|
|
|
1st part of partial line. So we preserve 1st part of partial line
|
|
|
|
|
here. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static char save_source[AFTER_SIZE];
|
2000-11-07 05:55:46 +08:00
|
|
|
|
|
2016-11-04 11:42:23 +08:00
|
|
|
|
/* The size of the input buffer we concatenate
|
|
|
|
|
input_file_give_next_buffer chunks into. Excludes the BEFORE and
|
|
|
|
|
AFTER counts. */
|
|
|
|
|
static size_t buffer_length;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* The index into an sb structure we are reading from. -1 if none. */
|
PR gas/14201
* sb.h (sb_max_power_two): Delete.
(struct sb): Delete "item" and "pot". Make "len" a size_t. Add "max".
(sb_element): Delete.
(sb_add_char, sb_add_buffer, sb_skip_comma, sb_skip_write): Update
prototypes.
* sb.c (string_count, free_list): Delete.
(sb_build, sb_kill, sb_check): Rewrite.
(scrub_from_sb, sb_add_char, sb_add_string, sb_add_buffer,
sb_skip_white, sb_skip_comma): Replace assorted int params,
vars and return types with size_t.
* input-scrub.c: Likewise.
* macro.c: Likewise.
* macro.h: Likewise.
* as.c: Likewise.
* as.h: Likewise.
* input-file.h: Likewise.
* input-file.c: Likewise.
* read.c: Likewise.
* app.c: ..or ptrdiff_t.
* input-file.c (input_file_get): Use ferror.
(input_file_give_next_buffer): Use input_file_get.
2012-06-07 20:47:23 +08:00
|
|
|
|
static size_t sb_index = -1;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* If we are reading from an sb structure, this is it. */
|
|
|
|
|
static sb from_sb;
|
|
|
|
|
|
2000-03-26 22:47:33 +08:00
|
|
|
|
/* Should we do a conditional check on from_sb? */
|
|
|
|
|
static int from_sb_is_expansion = 1;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* The number of nested sb structures we have included. */
|
|
|
|
|
int macro_nest;
|
|
|
|
|
|
|
|
|
|
/* We can have more than one source file open at once, though the info for all
|
|
|
|
|
but the latest one are saved off in a struct input_save. These files remain
|
|
|
|
|
open, so we are limited by the number of open files allowed by the
|
|
|
|
|
underlying OS. We may also sequentially read more than one source file in an
|
2000-09-08 04:28:45 +08:00
|
|
|
|
assembly. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* We must track the physical file and line number for error messages. We also
|
|
|
|
|
track a "logical" file and line number corresponding to (C?) compiler
|
|
|
|
|
source line numbers. Whenever we open a file we must fill in
|
2000-09-08 04:28:45 +08:00
|
|
|
|
physical_input_file. So if it is NULL we have not opened any files yet. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2016-02-22 22:11:27 +08:00
|
|
|
|
static const char *physical_input_file;
|
|
|
|
|
static const char *logical_input_file;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2011-03-18 19:16:28 +08:00
|
|
|
|
/* 1-origin line number in a source file. */
|
2000-09-08 04:28:45 +08:00
|
|
|
|
/* A line ends in '\n' or eof. */
|
2011-03-18 19:16:28 +08:00
|
|
|
|
static unsigned int physical_input_line;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static int logical_input_line;
|
|
|
|
|
|
|
|
|
|
/* Struct used to save the state of the input handler during include files */
|
2000-12-14 09:12:43 +08:00
|
|
|
|
struct input_save {
|
2000-12-13 03:29:24 +08:00
|
|
|
|
char * buffer_start;
|
|
|
|
|
char * partial_where;
|
2016-11-04 11:42:23 +08:00
|
|
|
|
size_t partial_size;
|
2000-12-13 03:29:24 +08:00
|
|
|
|
char save_source[AFTER_SIZE];
|
PR gas/14201
* sb.h (sb_max_power_two): Delete.
(struct sb): Delete "item" and "pot". Make "len" a size_t. Add "max".
(sb_element): Delete.
(sb_add_char, sb_add_buffer, sb_skip_comma, sb_skip_write): Update
prototypes.
* sb.c (string_count, free_list): Delete.
(sb_build, sb_kill, sb_check): Rewrite.
(scrub_from_sb, sb_add_char, sb_add_string, sb_add_buffer,
sb_skip_white, sb_skip_comma): Replace assorted int params,
vars and return types with size_t.
* input-scrub.c: Likewise.
* macro.c: Likewise.
* macro.h: Likewise.
* as.c: Likewise.
* as.h: Likewise.
* input-file.h: Likewise.
* input-file.c: Likewise.
* read.c: Likewise.
* app.c: ..or ptrdiff_t.
* input-file.c (input_file_get): Use ferror.
(input_file_give_next_buffer): Use input_file_get.
2012-06-07 20:47:23 +08:00
|
|
|
|
size_t buffer_length;
|
2016-02-22 22:11:27 +08:00
|
|
|
|
const char * physical_input_file;
|
|
|
|
|
const char * logical_input_file;
|
2011-03-18 19:16:28 +08:00
|
|
|
|
unsigned int physical_input_line;
|
2000-12-13 03:29:24 +08:00
|
|
|
|
int logical_input_line;
|
PR gas/14201
* sb.h (sb_max_power_two): Delete.
(struct sb): Delete "item" and "pot". Make "len" a size_t. Add "max".
(sb_element): Delete.
(sb_add_char, sb_add_buffer, sb_skip_comma, sb_skip_write): Update
prototypes.
* sb.c (string_count, free_list): Delete.
(sb_build, sb_kill, sb_check): Rewrite.
(scrub_from_sb, sb_add_char, sb_add_string, sb_add_buffer,
sb_skip_white, sb_skip_comma): Replace assorted int params,
vars and return types with size_t.
* input-scrub.c: Likewise.
* macro.c: Likewise.
* macro.h: Likewise.
* as.c: Likewise.
* as.h: Likewise.
* input-file.h: Likewise.
* input-file.c: Likewise.
* read.c: Likewise.
* app.c: ..or ptrdiff_t.
* input-file.c (input_file_get): Use ferror.
(input_file_give_next_buffer): Use input_file_get.
2012-06-07 20:47:23 +08:00
|
|
|
|
size_t sb_index;
|
2000-12-13 03:29:24 +08:00
|
|
|
|
sb from_sb;
|
|
|
|
|
int from_sb_is_expansion; /* Should we do a conditional check? */
|
|
|
|
|
struct input_save * next_saved_file; /* Chain of input_saves. */
|
|
|
|
|
char * input_file_save; /* Saved state of input routines. */
|
|
|
|
|
char * saved_position; /* Caller's saved position in buf. */
|
2000-11-07 05:55:46 +08:00
|
|
|
|
};
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-11-24 11:37:58 +08:00
|
|
|
|
static struct input_save *input_scrub_push (char *saved_position);
|
|
|
|
|
static char *input_scrub_pop (struct input_save *arg);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* Saved information about the file that .include'd this one. When we hit EOF,
|
2000-09-08 04:28:45 +08:00
|
|
|
|
we automatically pop to that file. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
static struct input_save *next_saved_file;
|
|
|
|
|
|
2016-11-04 11:42:23 +08:00
|
|
|
|
/* Initialize input buffering. */
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
input_scrub_reinit (void)
|
|
|
|
|
{
|
|
|
|
|
input_file_begin (); /* Reinitialize! */
|
|
|
|
|
logical_input_line = -1;
|
|
|
|
|
logical_input_file = NULL;
|
|
|
|
|
|
|
|
|
|
buffer_length = input_file_buffer_size () * 2;
|
|
|
|
|
buffer_start = XNEWVEC (char, BEFORE_SIZE + AFTER_SIZE + 1 + buffer_length);
|
|
|
|
|
memcpy (buffer_start, BEFORE_STRING, (int) BEFORE_SIZE);
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* Push the state of input reading and scrubbing so that we can #include.
|
|
|
|
|
The return value is a 'void *' (fudged for old compilers) to a save
|
2000-09-08 04:28:45 +08:00
|
|
|
|
area, which can be restored by passing it to input_scrub_pop(). */
|
2000-11-07 05:55:46 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static struct input_save *
|
2003-11-24 11:37:58 +08:00
|
|
|
|
input_scrub_push (char *saved_position)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
Don't use register keyword
* expr.c (expr_symbol_where): Don't use register keyword.
* app.c (app_push, app_pop, do_scrub_chars): Likewise.
* ecoff.c (add_string, add_ecoff_symbol, add_aux_sym_symint,
add_aux_sym_rndx, add_aux_sym_tir, add_procedure, add_file,
ecoff_build_lineno, ecoff_setup_ext, allocate_cluster.
allocate_scope, allocate_vlinks, allocate_shash,
allocate_thash, allocate_tag, allocate_forward, allocate_thead,
allocate_lineno_list): Likewise.
* frags.c (frag_more, frag_var, frag_variant, frag_wane): Likewise.
* input-file.c (input_file_push, input_file_pop): Likewise.
* input-scrub.c (input_scrub_push, input_scrub_next_buffer): Likewise.
* subsegs.c (subseg_change): Likewise.
* symbols.c (colon, symbol_table_insert, symbol_find_or_make)
(dollar_label_name, fb_label_name): Likewise.
* write.c (relax_align): Likewise.
* config/tc-alpha.c (s_alpha_pdesc): Likewise.
* config/tc-bfin.c (bfin_s_bss): Likewise.
* config/tc-i860.c (md_estimate_size_before_relax): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-m68k.c (m68k_ip, crack_operand): Likewise.
(md_convert_frag_1, s_even): Likewise.
* config/tc-mips.c (mips_clear_insn_labels): Likewise.
* config/tc-mn10200.c (md_begin): Likewise.
* config/tc-s390.c (s390_setup_opcodes, md_begin): Likewise.
* config/tc-sh.c (sh_elf_cons): Likewise.
* config/tc-tic4x.c (tic4x_cons, tic4x_stringer): Likewise.
* config/m68k-parse.y (m68k_reg_parse): Likewise. Convert from K&R.
(yylex, m68k_ip_op, yyerror): Convert from K&R.
2014-11-04 13:01:09 +08:00
|
|
|
|
struct input_save *saved;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2016-04-07 04:26:46 +08:00
|
|
|
|
saved = XNEW (struct input_save);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
saved->saved_position = saved_position;
|
|
|
|
|
saved->buffer_start = buffer_start;
|
|
|
|
|
saved->partial_where = partial_where;
|
|
|
|
|
saved->partial_size = partial_size;
|
|
|
|
|
saved->buffer_length = buffer_length;
|
|
|
|
|
saved->physical_input_file = physical_input_file;
|
|
|
|
|
saved->logical_input_file = logical_input_file;
|
|
|
|
|
saved->physical_input_line = physical_input_line;
|
|
|
|
|
saved->logical_input_line = logical_input_line;
|
|
|
|
|
saved->sb_index = sb_index;
|
|
|
|
|
saved->from_sb = from_sb;
|
2000-03-26 22:47:33 +08:00
|
|
|
|
saved->from_sb_is_expansion = from_sb_is_expansion;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
memcpy (saved->save_source, save_source, sizeof (save_source));
|
|
|
|
|
saved->next_saved_file = next_saved_file;
|
|
|
|
|
saved->input_file_save = input_file_push ();
|
|
|
|
|
|
|
|
|
|
sb_index = -1;
|
|
|
|
|
|
2016-11-04 11:42:23 +08:00
|
|
|
|
input_scrub_reinit ();
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
return saved;
|
2000-11-07 05:55:46 +08:00
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
static char *
|
2003-11-24 11:37:58 +08:00
|
|
|
|
input_scrub_pop (struct input_save *saved)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
char *saved_position;
|
|
|
|
|
|
|
|
|
|
input_scrub_end (); /* Finish off old buffer */
|
|
|
|
|
|
|
|
|
|
input_file_pop (saved->input_file_save);
|
|
|
|
|
saved_position = saved->saved_position;
|
|
|
|
|
buffer_start = saved->buffer_start;
|
|
|
|
|
buffer_length = saved->buffer_length;
|
|
|
|
|
physical_input_file = saved->physical_input_file;
|
|
|
|
|
logical_input_file = saved->logical_input_file;
|
|
|
|
|
physical_input_line = saved->physical_input_line;
|
|
|
|
|
logical_input_line = saved->logical_input_line;
|
|
|
|
|
sb_index = saved->sb_index;
|
|
|
|
|
from_sb = saved->from_sb;
|
2000-03-26 22:47:33 +08:00
|
|
|
|
from_sb_is_expansion = saved->from_sb_is_expansion;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
partial_where = saved->partial_where;
|
|
|
|
|
partial_size = saved->partial_size;
|
|
|
|
|
next_saved_file = saved->next_saved_file;
|
|
|
|
|
memcpy (save_source, saved->save_source, sizeof (save_source));
|
|
|
|
|
|
|
|
|
|
free (saved);
|
|
|
|
|
return saved_position;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2003-11-24 11:37:58 +08:00
|
|
|
|
input_scrub_begin (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
know (strlen (BEFORE_STRING) == BEFORE_SIZE);
|
2000-11-07 05:55:46 +08:00
|
|
|
|
know (strlen (AFTER_STRING) == AFTER_SIZE
|
|
|
|
|
|| (AFTER_STRING[0] == '\0' && AFTER_SIZE == 1));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2000-09-08 04:28:45 +08:00
|
|
|
|
physical_input_file = NULL; /* No file read yet. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
next_saved_file = NULL; /* At EOF, don't pop to any other file */
|
2016-11-04 11:42:23 +08:00
|
|
|
|
input_scrub_reinit ();
|
1999-05-03 15:29:11 +08:00
|
|
|
|
do_scrub_begin (flag_m68k_mri);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2003-11-24 11:37:58 +08:00
|
|
|
|
input_scrub_end (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
if (buffer_start)
|
|
|
|
|
{
|
|
|
|
|
free (buffer_start);
|
|
|
|
|
buffer_start = 0;
|
|
|
|
|
input_file_end ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2000-11-07 05:55:46 +08:00
|
|
|
|
/* Start reading input from a new file.
|
|
|
|
|
Return start of caller's part of buffer. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2000-11-07 05:55:46 +08:00
|
|
|
|
char *
|
2016-02-22 22:11:27 +08:00
|
|
|
|
input_scrub_new_file (const char *filename)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
input_file_open (filename, !flag_no_comments);
|
|
|
|
|
physical_input_file = filename[0] ? filename : _("{standard input}");
|
|
|
|
|
physical_input_line = 0;
|
|
|
|
|
|
|
|
|
|
partial_size = 0;
|
|
|
|
|
return (buffer_start + BEFORE_SIZE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Include a file from the current file. Save our state, cause it to
|
|
|
|
|
be restored on EOF, and begin handling a new file. Same result as
|
2000-09-08 04:28:45 +08:00
|
|
|
|
input_scrub_new_file. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
char *
|
2016-02-22 22:11:27 +08:00
|
|
|
|
input_scrub_include_file (const char *filename, char *position)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
next_saved_file = input_scrub_push (position);
|
|
|
|
|
return input_scrub_new_file (filename);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Start getting input from an sb structure. This is used when
|
|
|
|
|
expanding a macro. */
|
|
|
|
|
|
|
|
|
|
void
|
2003-11-24 11:37:58 +08:00
|
|
|
|
input_scrub_include_sb (sb *from, char *position, int is_expansion)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2012-06-09 21:22:00 +08:00
|
|
|
|
int newline;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (macro_nest > max_macro_nest)
|
2000-05-30 04:25:14 +08:00
|
|
|
|
as_fatal (_("macros nested too deeply"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
++macro_nest;
|
|
|
|
|
|
2000-03-26 22:47:33 +08:00
|
|
|
|
#ifdef md_macro_start
|
|
|
|
|
if (is_expansion)
|
|
|
|
|
{
|
|
|
|
|
md_macro_start ();
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
next_saved_file = input_scrub_push (position);
|
|
|
|
|
|
2012-06-09 21:22:00 +08:00
|
|
|
|
/* Allocate sufficient space: from->len + optional newline. */
|
|
|
|
|
newline = from->len >= 1 && from->ptr[0] != '\n';
|
|
|
|
|
sb_build (&from_sb, from->len + newline);
|
2000-03-26 22:47:33 +08:00
|
|
|
|
from_sb_is_expansion = is_expansion;
|
2012-06-09 21:22:00 +08:00
|
|
|
|
if (newline)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
/* Add the sentinel required by read.c. */
|
|
|
|
|
sb_add_char (&from_sb, '\n');
|
|
|
|
|
}
|
include/elf:
* arm.h: Import complete list of official relocation names
and numbers from AAELF. Define FAKE_RELOCs for old names.
Remove a few old names no longer used anywhere.
bfd:
* elf32-arm.c: Wherever possible, use official reloc names
from AAELF.
(elf32_arm_howto_table, elf32_arm_tls_gd32_howto)
(elf32_arm_tls_ldo32_howto, elf32_arm_tls_ldm32_howto)
(elf32_arm_tls_le32_howto, elf32_arm_tls_ie32_howto)
(elf32_arm_vtinherit_howto, elf32_arm_vtentry_howto)
(elf32_arm_pc11_howto, elf32_arm_thm_pc9_howto, elf32_arm_got_prel)
(elf32_arm_r_howto): Replace with elf32_arm_howto_table_1,
elf32_arm_howto_table_2, and elf32_arm_howto_table_3.
Add many new relocations from AAELF.
(elf32_arm_howto_from_type): Update to match.
(elf32_arm_reloc_map): Add entries for R_ARM_THM_JUMP24,
R_ARM_THM_JUMP11, R_ARM_THM_JUMP19, R_ARM_THM_JUMP8,
R_ARM_THM_JUMP6, R_ARM_GNU_VTINHERIT, and R_ARM_GNU_VTENTRY.
(elf32_arm_reloc_type_lookup): Use elf32_arm_howto_from_type.
(elf32_arm_final_link_relocate): Add support for
R_ARM_THM_JUMP24, R_ARM_THM_JUMP19, R_ARM_THM_JUMP6. Remove
case entries redundant with default.
* reloc.c: Reorganize ARM relocations. Add Thumb
assembler-internal relocations BFD_RELOC_ARM_T32_OFFSET_U8,
BFD_RELOC_ARM_T32_OFFSET_IMM, BFD_RELOC_ARM_T32_IMMEDIATE.
Add visible relocations BFD_RELOC_THUMB_PCREL_BRANCH7,
BFD_RELOC_THUMB_BRANCH20, BFD_RELOC_THUMB_BRANCH25.
Delete unused relocations BFD_RELOC_ARM_GOT12, BFD_RELOC_ARM_COPY.
* bfd-in2.h, libbfd.h: Regenerate.
opcodes:
* arm-dis.c (thumb_opcodes): Add disassembly for V6T2 16-bit
instructions. Adjust disassembly of some opcodes to match
unified syntax.
(thumb32_opcodes): New table.
(print_insn_thumb): Rename print_insn_thumb16; don't handle
two-halfword branches here.
(print_insn_thumb32): New function.
(print_insn): Choose among print_insn_arm, print_insn_thumb16,
and print_insn_thumb32. Be consistent about order of
halfwords when printing 32-bit instructions.
gas:
* hash.c (hash_lookup): Add len parameter. All callers changed.
(hash_find_n): New interface.
* hash.h: Prototype hash_find_n.
* sb.c: Include as.h.
(scrub_from_sb, sb_to_scrub, scrub_position): New statics.
(sb_scrub_and_add_sb): New interface.
* sb.h: Prototype sb_scrub_and_add_sb.
* input-scrub.c (input_scrub_include_sb): Use sb_scrub_and_add_sb.
* config/tc-arm.h (TC_FORCE_RELOCATION_LOCAL): Remove
reference to BFD_RELOC_ARM_GOT12 which is never generated.
* config/tc-arm.c: Rewrite, adding Thumb-2 support.
gas/testsuite:
* gas/arm/arm.exp: Convert all existing "gas_test" tests to
"run_dump_test" tests. Run more tests unconditionally. Run new tests.
* gas/arm/arch4t.s, gas/arm/arch6zk.s, gas/arm/arm3.s, gas/arm/arm6.s
* gas/arm/arm7dm.s, gas/arm/bignum1.s, gas/arm/float.s
* gas/arm/immed.s, gas/arm/iwmmxt.s, gas/arm/offset.s, gas/arm/thumb.s:
Adjust to work as a dump test.
* gas/arm/arch4t.d, gas/arm/arch6zk.d, gas/arm/arm3.d, gas/arm/arm6.d
* gas/arm/arm7dm.d, gas/arm/bignum1.d, gas/arm/float.d
* gas/arm/immed.d, gas/arm/iwmmxt.d, gas/arm/offset.d, gas/arm/thumb.d:
New files.
* gas/arm/armv1-bad.l, gas/arm/armv1-bad.s: Remove tests for
diagnostics that don't happen in the first pass anymore.
* gas/arm/iwmmxt-bad.l, gas/arm/r15-bad.l, gas/arm/req.l
* gas/arm/vfp-bad.l:
Update expected diagnostics.
* gas/arm/pic.d: Update expected reloc name.
* gas/arm/thumbv6.d: CPY no longer appears in disassembly.
* gas/arm/r15-bad.s: Avoid two-argument mul.
* gas/arm/req.s: Adjust comments.
* gas/arm/maverick.d, gas/arm/maverick.s: Avoid inappropriate
use of PC.
* gas/arm/macro-1.d, gas/arm/macro1.s
* gas/arm/t16-bad.l, gas/arm/t16-bad.s
* gas/arm/tcompat.d, gas/arm/tcompat.s
* gas/arm/tcompat2.d, gas/arm/tcompat2.s
* gas/arm/thumb32.d, gas/arm/thumb32.s
New test pair.
ld/testsuite:
* ld-arm/mixed-app.d: Adjust expected disassembly a little.
2005-05-18 13:40:12 +08:00
|
|
|
|
sb_scrub_and_add_sb (&from_sb, from);
|
2008-11-12 10:42:46 +08:00
|
|
|
|
|
|
|
|
|
/* Make sure the parser looks at defined contents when it scans for
|
|
|
|
|
e.g. end-of-line at the end of a macro. */
|
2012-06-09 21:22:00 +08:00
|
|
|
|
sb_terminate (&from_sb);
|
2008-11-12 10:42:46 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
sb_index = 1;
|
|
|
|
|
|
|
|
|
|
/* These variables are reset by input_scrub_push. Restore them
|
|
|
|
|
since we are, after all, still at the same point in the file. */
|
|
|
|
|
logical_input_line = next_saved_file->logical_input_line;
|
|
|
|
|
logical_input_file = next_saved_file->logical_input_file;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2003-11-24 11:37:58 +08:00
|
|
|
|
input_scrub_close (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
input_file_close ();
|
2011-03-18 19:16:28 +08:00
|
|
|
|
physical_input_line = 0;
|
|
|
|
|
logical_input_line = -1;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
char *
|
2003-11-24 11:37:58 +08:00
|
|
|
|
input_scrub_next_buffer (char **bufp)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
Don't use register keyword
* expr.c (expr_symbol_where): Don't use register keyword.
* app.c (app_push, app_pop, do_scrub_chars): Likewise.
* ecoff.c (add_string, add_ecoff_symbol, add_aux_sym_symint,
add_aux_sym_rndx, add_aux_sym_tir, add_procedure, add_file,
ecoff_build_lineno, ecoff_setup_ext, allocate_cluster.
allocate_scope, allocate_vlinks, allocate_shash,
allocate_thash, allocate_tag, allocate_forward, allocate_thead,
allocate_lineno_list): Likewise.
* frags.c (frag_more, frag_var, frag_variant, frag_wane): Likewise.
* input-file.c (input_file_push, input_file_pop): Likewise.
* input-scrub.c (input_scrub_push, input_scrub_next_buffer): Likewise.
* subsegs.c (subseg_change): Likewise.
* symbols.c (colon, symbol_table_insert, symbol_find_or_make)
(dollar_label_name, fb_label_name): Likewise.
* write.c (relax_align): Likewise.
* config/tc-alpha.c (s_alpha_pdesc): Likewise.
* config/tc-bfin.c (bfin_s_bss): Likewise.
* config/tc-i860.c (md_estimate_size_before_relax): Likewise.
* config/tc-m68hc11.c (md_convert_frag): Likewise.
* config/tc-m68k.c (m68k_ip, crack_operand): Likewise.
(md_convert_frag_1, s_even): Likewise.
* config/tc-mips.c (mips_clear_insn_labels): Likewise.
* config/tc-mn10200.c (md_begin): Likewise.
* config/tc-s390.c (s390_setup_opcodes, md_begin): Likewise.
* config/tc-sh.c (sh_elf_cons): Likewise.
* config/tc-tic4x.c (tic4x_cons, tic4x_stringer): Likewise.
* config/m68k-parse.y (m68k_reg_parse): Likewise. Convert from K&R.
(yylex, m68k_ip_op, yyerror): Convert from K&R.
2014-11-04 13:01:09 +08:00
|
|
|
|
char *limit; /*->just after last char of buffer. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
PR gas/14201
* sb.h (sb_max_power_two): Delete.
(struct sb): Delete "item" and "pot". Make "len" a size_t. Add "max".
(sb_element): Delete.
(sb_add_char, sb_add_buffer, sb_skip_comma, sb_skip_write): Update
prototypes.
* sb.c (string_count, free_list): Delete.
(sb_build, sb_kill, sb_check): Rewrite.
(scrub_from_sb, sb_add_char, sb_add_string, sb_add_buffer,
sb_skip_white, sb_skip_comma): Replace assorted int params,
vars and return types with size_t.
* input-scrub.c: Likewise.
* macro.c: Likewise.
* macro.h: Likewise.
* as.c: Likewise.
* as.h: Likewise.
* input-file.h: Likewise.
* input-file.c: Likewise.
* read.c: Likewise.
* app.c: ..or ptrdiff_t.
* input-file.c (input_file_get): Use ferror.
(input_file_give_next_buffer): Use input_file_get.
2012-06-07 20:47:23 +08:00
|
|
|
|
if (sb_index != (size_t) -1)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
if (sb_index >= from_sb.len)
|
|
|
|
|
{
|
|
|
|
|
sb_kill (&from_sb);
|
PR gas/14201
* sb.h (sb_max_power_two): Delete.
(struct sb): Delete "item" and "pot". Make "len" a size_t. Add "max".
(sb_element): Delete.
(sb_add_char, sb_add_buffer, sb_skip_comma, sb_skip_write): Update
prototypes.
* sb.c (string_count, free_list): Delete.
(sb_build, sb_kill, sb_check): Rewrite.
(scrub_from_sb, sb_add_char, sb_add_string, sb_add_buffer,
sb_skip_white, sb_skip_comma): Replace assorted int params,
vars and return types with size_t.
* input-scrub.c: Likewise.
* macro.c: Likewise.
* macro.h: Likewise.
* as.c: Likewise.
* as.h: Likewise.
* input-file.h: Likewise.
* input-file.c: Likewise.
* read.c: Likewise.
* app.c: ..or ptrdiff_t.
* input-file.c (input_file_get): Use ferror.
(input_file_give_next_buffer): Use input_file_get.
2012-06-07 20:47:23 +08:00
|
|
|
|
if (from_sb_is_expansion)
|
2000-11-07 05:55:46 +08:00
|
|
|
|
{
|
|
|
|
|
cond_finish_check (macro_nest);
|
2000-03-26 22:47:33 +08:00
|
|
|
|
#ifdef md_macro_end
|
2000-11-07 05:55:46 +08:00
|
|
|
|
/* Allow the target to clean up per-macro expansion
|
|
|
|
|
data. */
|
|
|
|
|
md_macro_end ();
|
2000-03-26 22:47:33 +08:00
|
|
|
|
#endif
|
2000-11-07 05:55:46 +08:00
|
|
|
|
}
|
|
|
|
|
--macro_nest;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
partial_where = NULL;
|
2015-07-22 20:28:50 +08:00
|
|
|
|
partial_size = 0;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (next_saved_file != NULL)
|
|
|
|
|
*bufp = input_scrub_pop (next_saved_file);
|
|
|
|
|
return partial_where;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
partial_where = from_sb.ptr + from_sb.len;
|
|
|
|
|
partial_size = 0;
|
|
|
|
|
*bufp = from_sb.ptr + sb_index;
|
|
|
|
|
sb_index = from_sb.len;
|
|
|
|
|
return partial_where;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (partial_size)
|
|
|
|
|
{
|
2016-11-04 11:42:23 +08:00
|
|
|
|
memmove (buffer_start + BEFORE_SIZE, partial_where, partial_size);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
memcpy (buffer_start + BEFORE_SIZE, save_source, AFTER_SIZE);
|
|
|
|
|
}
|
2015-07-22 20:28:50 +08:00
|
|
|
|
|
|
|
|
|
while (1)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2015-07-22 20:28:50 +08:00
|
|
|
|
char *p;
|
2016-11-04 11:42:23 +08:00
|
|
|
|
char *start = buffer_start + BEFORE_SIZE + partial_size;
|
2015-07-22 20:28:50 +08:00
|
|
|
|
|
|
|
|
|
*bufp = buffer_start + BEFORE_SIZE;
|
2016-11-04 11:42:23 +08:00
|
|
|
|
limit = input_file_give_next_buffer (start);
|
2015-07-22 20:28:50 +08:00
|
|
|
|
if (!limit)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2016-11-04 11:42:23 +08:00
|
|
|
|
if (!partial_size)
|
|
|
|
|
/* End of this file. */
|
2015-07-22 20:28:50 +08:00
|
|
|
|
break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2015-07-22 20:28:50 +08:00
|
|
|
|
as_warn (_("end of file not at end of a line; newline inserted"));
|
|
|
|
|
p = buffer_start + BEFORE_SIZE + partial_size;
|
|
|
|
|
*p++ = '\n';
|
|
|
|
|
limit = p;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2006-10-16 20:02:40 +08:00
|
|
|
|
/* Terminate the buffer to avoid confusing TC_EOL_IN_INSN. */
|
|
|
|
|
*limit = '\0';
|
2015-07-22 20:28:50 +08:00
|
|
|
|
|
|
|
|
|
/* Find last newline. */
|
2006-10-16 20:02:40 +08:00
|
|
|
|
for (p = limit - 1; *p != '\n' || TC_EOL_IN_INSN (p); --p)
|
2016-11-04 11:42:23 +08:00
|
|
|
|
if (p < start)
|
|
|
|
|
goto read_more;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
++p;
|
|
|
|
|
}
|
|
|
|
|
|
2016-11-04 11:42:23 +08:00
|
|
|
|
/* We found a newline in the newly read chars. */
|
|
|
|
|
partial_where = p;
|
|
|
|
|
partial_size = limit - p;
|
|
|
|
|
|
|
|
|
|
/* Save the fragment after that last newline. */
|
|
|
|
|
memcpy (save_source, partial_where, (int) AFTER_SIZE);
|
|
|
|
|
memcpy (partial_where, AFTER_STRING, (int) AFTER_SIZE);
|
|
|
|
|
return partial_where;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2016-11-04 11:42:23 +08:00
|
|
|
|
read_more:
|
|
|
|
|
/* Didn't find a newline. Read more text. */
|
2015-07-22 20:28:50 +08:00
|
|
|
|
partial_size = limit - (buffer_start + BEFORE_SIZE);
|
2016-11-04 11:42:23 +08:00
|
|
|
|
if (buffer_length - input_file_buffer_size () < partial_size)
|
|
|
|
|
{
|
|
|
|
|
/* Increase the buffer when it doesn't have room for the
|
|
|
|
|
next block of input. */
|
|
|
|
|
buffer_length *= 2;
|
|
|
|
|
buffer_start = XRESIZEVEC (char, buffer_start,
|
|
|
|
|
(buffer_length
|
|
|
|
|
+ BEFORE_SIZE + AFTER_SIZE + 1));
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
2015-07-22 20:28:50 +08:00
|
|
|
|
|
|
|
|
|
/* Tell the listing we've finished the file. */
|
|
|
|
|
LISTING_EOF ();
|
|
|
|
|
|
|
|
|
|
/* If we should pop to another file at EOF, do it. */
|
|
|
|
|
partial_where = NULL;
|
|
|
|
|
if (next_saved_file)
|
|
|
|
|
*bufp = input_scrub_pop (next_saved_file);
|
|
|
|
|
|
|
|
|
|
return partial_where;
|
2000-11-07 05:55:46 +08:00
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2000-11-07 05:55:46 +08:00
|
|
|
|
/* The remaining part of this file deals with line numbers, error
|
|
|
|
|
messages and so on. Return TRUE if we opened any file. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
int
|
2003-11-24 11:37:58 +08:00
|
|
|
|
seen_at_least_1_file (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
return (physical_input_file != NULL);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2003-11-24 11:37:58 +08:00
|
|
|
|
bump_line_counters (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
PR gas/14201
* sb.h (sb_max_power_two): Delete.
(struct sb): Delete "item" and "pot". Make "len" a size_t. Add "max".
(sb_element): Delete.
(sb_add_char, sb_add_buffer, sb_skip_comma, sb_skip_write): Update
prototypes.
* sb.c (string_count, free_list): Delete.
(sb_build, sb_kill, sb_check): Rewrite.
(scrub_from_sb, sb_add_char, sb_add_string, sb_add_buffer,
sb_skip_white, sb_skip_comma): Replace assorted int params,
vars and return types with size_t.
* input-scrub.c: Likewise.
* macro.c: Likewise.
* macro.h: Likewise.
* as.c: Likewise.
* as.h: Likewise.
* input-file.h: Likewise.
* input-file.c: Likewise.
* read.c: Likewise.
* app.c: ..or ptrdiff_t.
* input-file.c (input_file_get): Use ferror.
(input_file_give_next_buffer): Use input_file_get.
2012-06-07 20:47:23 +08:00
|
|
|
|
if (sb_index == (size_t) -1)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
++physical_input_line;
|
|
|
|
|
if (logical_input_line >= 0)
|
|
|
|
|
++logical_input_line;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2000-11-07 05:55:46 +08:00
|
|
|
|
/* Tells us what the new logical line number and file are.
|
|
|
|
|
If the line_number is -1, we don't change the current logical line
|
|
|
|
|
number. If it is -2, we decrement the logical line number (this is
|
|
|
|
|
to support the .appfile pseudo-op inserted into the stream by
|
|
|
|
|
do_scrub_chars).
|
|
|
|
|
If the fname is NULL, we don't change the current logical file name.
|
|
|
|
|
Returns nonzero if the filename actually changes. */
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
int
|
2016-02-22 22:11:27 +08:00
|
|
|
|
new_logical_line_flags (const char *fname, /* DON'T destroy it! We point to it! */
|
2007-03-09 15:14:23 +08:00
|
|
|
|
int line_number,
|
|
|
|
|
int flags)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2007-03-09 15:14:23 +08:00
|
|
|
|
switch (flags)
|
|
|
|
|
{
|
|
|
|
|
case 0:
|
|
|
|
|
break;
|
|
|
|
|
case 1:
|
|
|
|
|
if (line_number != -1)
|
|
|
|
|
abort ();
|
|
|
|
|
break;
|
|
|
|
|
case 1 << 1:
|
|
|
|
|
case 1 << 2:
|
|
|
|
|
/* FIXME: we could check that include nesting is correct. */
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
if (line_number >= 0)
|
|
|
|
|
logical_input_line = line_number;
|
2007-03-09 15:14:23 +08:00
|
|
|
|
else if (line_number == -1 && fname && !*fname && (flags & (1 << 2)))
|
|
|
|
|
{
|
|
|
|
|
logical_input_file = physical_input_file;
|
|
|
|
|
logical_input_line = physical_input_line;
|
|
|
|
|
fname = NULL;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (fname
|
|
|
|
|
&& (logical_input_file == NULL
|
2011-03-01 02:32:52 +08:00
|
|
|
|
|| filename_cmp (logical_input_file, fname)))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
logical_input_file = fname;
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
2000-11-07 05:55:46 +08:00
|
|
|
|
}
|
2007-03-09 15:14:23 +08:00
|
|
|
|
|
|
|
|
|
int
|
2016-02-22 22:11:27 +08:00
|
|
|
|
new_logical_line (const char *fname, int line_number)
|
2007-03-09 15:14:23 +08:00
|
|
|
|
{
|
|
|
|
|
return new_logical_line_flags (fname, line_number, 0);
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2017-10-11 23:48:16 +08:00
|
|
|
|
/* Return the current physical input file name and line number, if known */
|
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
|
as_where_physical (unsigned int *linep)
|
|
|
|
|
{
|
|
|
|
|
if (physical_input_file != NULL)
|
|
|
|
|
{
|
|
|
|
|
if (linep != NULL)
|
|
|
|
|
*linep = physical_input_line;
|
|
|
|
|
return physical_input_file;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (linep != NULL)
|
|
|
|
|
*linep = 0;
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2016-02-22 22:11:27 +08:00
|
|
|
|
/* Return the current file name and line number. */
|
2000-11-07 05:55:46 +08:00
|
|
|
|
|
2016-02-22 22:11:27 +08:00
|
|
|
|
const char *
|
|
|
|
|
as_where (unsigned int *linep)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
if (logical_input_file != NULL
|
|
|
|
|
&& (linep == NULL || logical_input_line >= 0))
|
|
|
|
|
{
|
|
|
|
|
if (linep != NULL)
|
|
|
|
|
*linep = logical_input_line;
|
2016-02-22 22:11:27 +08:00
|
|
|
|
return logical_input_file;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
2017-10-11 23:48:16 +08:00
|
|
|
|
|
|
|
|
|
return as_where_physical (linep);
|
2000-11-07 05:55:46 +08:00
|
|
|
|
}
|
2017-10-11 23:48:16 +08:00
|
|
|
|
|