2017-01-05 00:05:22 +08:00
|
|
|
|
%option nounput noyywrap
|
2009-11-19 13:06:35 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
%{
|
|
|
|
|
|
2022-01-02 06:30:17 +08:00
|
|
|
|
/* Copyright (C) 1991-2022 Free Software Foundation, Inc.
|
2007-07-06 22:09:45 +08:00
|
|
|
|
Written by Steve Chamberlain of Cygnus Support.
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2007-07-06 22:09:45 +08:00
|
|
|
|
This file is part of the GNU Binutils.
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2007-07-06 22:09:45 +08:00
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
2004-11-19 17:31:55 +08:00
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-07-06 22:09:45 +08:00
|
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
|
|
|
(at your option) any later version.
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2007-07-06 22:09:45 +08:00
|
|
|
|
This program is distributed in the hope that it will be useful,
|
2004-11-19 17:31:55 +08:00
|
|
|
|
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 15:29:11 +08:00
|
|
|
|
|
2004-11-19 17:31:55 +08:00
|
|
|
|
You should have received a copy of the GNU General Public License
|
2007-07-06 22:09:45 +08:00
|
|
|
|
along with this program; if not, write to the Free Software
|
|
|
|
|
Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
|
|
|
|
|
MA 02110-1301, USA. */
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2007-04-26 22:47:00 +08:00
|
|
|
|
#include "bfd.h"
|
2001-09-19 13:33:36 +08:00
|
|
|
|
#include "safe-ctype.h"
|
2002-07-01 16:07:31 +08:00
|
|
|
|
#include "bfdlink.h"
|
bfd, ld: add CTF section linking
This is quite complicated because the CTF section's contents depend on
the final contents of the symtab and strtab, because it has two sections
whose contents are shuffled to be in 1:1 correspondence with the symtab,
and an internal strtab that gets deduplicated against the ELF strtab
(with offsets adjusted to point into the ELF strtab instead). It is
also compressed if large enough, so its size depends on its contents!
So we cannot construct it as early as most sections: we cannot even
*begin* construction until after the symtab and strtab are finalized.
Thankfully there is already one section treated similarly: compressed
debugging sections: the only differences are that compressed debugging
sections have extra handling to deal with their changing name if
compressed (CTF sections are always called ".ctf" for now, though we
have reserved ".ctf.*" against future use), and that compressed
debugging sections have previously-uncompressed content which has to be
stashed away for later compression, while CTF sections have no content
at all until we generate it (very late).
BFD also cannot do the link itself: libctf knows how to do it, and BFD
cannot call libctf directly because libctf already depends on bfd for
file I/O. So we have to use a pair of callbacks, one, examine_strtab,
which allows a caller to examine the symtab and strtab after
finalization (called from elf_link_swap_symbols_out(), right before the
symtabs are written, and after the strtab has been finalized), and one
which actually does the emission (called emit_ctf simply because it is
grouped with a bunch of section-specific late-emission function calls at
the bottom of bfd_elf_final_link, and a section-specific name seems best
for that). emit_ctf is actually called *twice*: once from lang_process
if the emulation suggests that this bfd target does not examine the
symtab or strtab, and once via a bfd callback if it does. (This means
that non-ELF targets still get CTF emitted, even though the late CTF
emission stage is never called for them).
v2: merged with non-ELF support patch: slight commit message
adjustments.
v3: do not spend time merging CTF, or crash, if the CTF section is
explicitly discarded. Do not try to merge or compress CTF unless
linking.
v4: add CTF_COMPRESSION_THRESHOLD. Annul the freed input ctf_file_t's
after writeout: set SEC_IN_MEMORY on the output contents so a future
bfd enhancement knows it could free it. Add SEC_LINKER_CREATED |
SEC_KEEP to avoid having to add .ctf to the linker script. Drop
now-unnecessary ldlang.h-level elf-bfd.h include and hackery around
it. Adapt to elf32.em->elf.em and elf-generic.em->ldelf*.c
changes.
v5: fix tabdamage. Drop #inclusions in .h files: include in .c files,
.em files, and use struct forwards instead. Use bfd_section_is_ctf
inline function rather than SECTION_IS_CTF macro. Move a few
comments.
* Makefile.def (dependencies): all-ld depends on all-libctf.
* Makefile.in: Regenerated.
include/
* bfdlink.h (elf_strtab_hash): New forward.
(elf_sym_strtab): Likewise.
(struct bfd_link_callbacks <examine_strtab>): New.
(struct bfd_link_callbacks <emit_ctf>): Likewise.
bfd/
* elf-bfd.h (bfd_section_is_ctf): New inline function.
* elf.c (special_sections_c): Add ".ctf".
(assign_file_positions_for_non_load_sections): Note that
compressed debugging sections etc are not assigned here. Treat
CTF sections like SEC_ELF_COMPRESS sections when is_linker_output:
sh_offset -1.
(assign_file_positions_except_relocs): Likewise.
(find_section_in_list): Note that debugging and CTF sections, as
well as reloc sections, are assigned later.
(_bfd_elf_assign_file_positions_for_non_load): CTF sections get
their size and contents updated.
(_bfd_elf_set_section_contents): Skip CTF sections: unlike
compressed sections, they have no uncompressed content to copy at
this stage.
* elflink.c (elf_link_swap_symbols_out): Call the examine_strtab
callback right before the strtab is written out.
(bfd_elf_final_link): Don't cache the section contents of CTF
sections: they are not populated yet. Call the emit_ctf callback
right at the end, after all the symbols and strings are flushed
out.
ld/
* ldlang.h: (struct lang_input_statement_struct): Add the_ctf.
(struct elf_sym_strtab): Add forward.
(struct elf_strtab_hash): Likewise.
(ldlang_ctf_apply_strsym): Declare.
(ldlang_write_ctf_late): Likewise.
* ldemul.h (ldemul_emit_ctf_early): New.
(ldemul_examine_strtab_for_ctf): Likewise.
(ld_emulation_xfer_type) <emit_ctf_early>: Likewise.
(ld_emulation_xfer_type) <examine_strtab_for_ctf>: Likewise.
* ldemul.c (ldemul_emit_ctf_early): New.
(ldemul_examine_strtab_for_ctf): Likewise.
* ldlang.c: Include ctf-api.h.
(CTF_COMPRESSION_THRESHOLD): New.
(ctf_output): New. Initialized in...
(ldlang_open_ctf): ... this new function. Open all the CTF
sections in the input files: mark them non-loaded and empty
so as not to copy their contents to the output, but linker-created
so the section gets created in the target.
(ldlang_merge_ctf): New, merge types via ctf_link_add_ctf and
ctf_link.
(ldlang_ctf_apply_strsym): New, an examine_strtab callback: wrap
ldemul_examine_strtab_for_ctf.
(lang_write_ctf): New, write out the CTF section.
(ldlang_write_ctf_late): New, late call via bfd's emit_ctf hook.
(lang_process): Call ldlang_open_ctf, ldlang_merge_ctf, and
lang_write_ctf.
* ldmain.c (link_callbacks): Add ldlang_ctf_apply_strsym,
ldlang_write_ctf_late.
* emultempl/aix.em: Add ctf-api.h.
* emultempl/armcoff.em: Likewise.
* emultempl/beos.em: Likewise.
* emultempl/elf.em: Likewise.
* emultempl/generic.em: Likewise.
* emultempl/linux.em: Likewise.
* emultempl/msp430.em: Likewise.
* emultempl/pe.em: Likewise.
* emultempl/pep.em: Likewise.
* emultempl/ticoff.em: Likewise.
* emultempl/vanilla.em: Likewise.
* ldcref.c: Likewise.
* ldctor.c: Likewise.
* ldelf.c: Likewise.
* ldelfgen.c: Likewise.
* ldemul.c: Likewise.
* ldexp.c: Likewise.
* ldfile.c: Likewise.
* ldgram.c: Likewise.
* ldlex.l: Likewise.
* ldmain.c: Likewise.
* ldmisc.c: Likewise.
* ldver.c: Likewise.
* ldwrite.c: Likewise.
* lexsup.c: Likewise.
* mri.c: Likewise.
* pe-dll.c: Likewise.
* plugin.c: Likewise.
* ldelfgen.c (ldelf_emit_ctf_early): New.
(ldelf_examine_strtab_for_ctf): tell libctf about the symtab and
strtab.
(struct ctf_strsym_iter_cb_arg): New, state to do so.
(ldelf_ctf_strtab_iter_cb): New: tell libctf about
each string in the strtab in turn.
(ldelf_ctf_symbols_iter_cb): New, tell libctf
about each symbol in the symtab in turn.
* ldelfgen.h (struct elf_sym_strtab): Add forward.
(struct elf_strtab_hash): Likewise.
(struct ctf_file): Likewise.
(ldelf_emit_ctf_early): Declare.
(ldelf_examine_strtab_for_ctf): Likewise.
* emultempl/elf-generic.em (LDEMUL_EMIT_CTF_EARLY): Set it.
(LDEMUL_EXAMINE_STRTAB_FOR_CTF): Likewise.
* emultempl/aix.em (ld_${EMULATION_NAME}_emulation): Add
emit_ctf_early and examine_strtab_for_ctf, NULL by default.
* emultempl/armcoff.em (ld_${EMULATION_NAME}_emulation): Likewise.
* emultempl/beos.em (ld_${EMULATION_NAME}_emulation): Likewise.
* emultempl/elf.em (ld_${EMULATION_NAME}_emulation): Likewise.
* emultempl/generic.em (ld_${EMULATION_NAME}_emulation): Likewise.
* emultempl/linux.em (ld_${EMULATION_NAME}_emulation): Likewise.
* emultempl/msp430.em (ld_${EMULATION_NAME}_emulation): Likewise.
* emultempl/pe.em (ld_${EMULATION_NAME}_emulation): Likewise.
* emultempl/pep.em (ld_${EMULATION_NAME}_emulation): Likewise.
* emultempl/ticoff.em (ld_${EMULATION_NAME}_emulation): Likewise.
* emultempl/vanilla.em (ld_vanilla_emulation): Likewise.
* Makefile.am: Pull in libctf (and zlib, a transitive requirement
for compressed CTF section emission). Pass it on to DejaGNU.
* configure.ac: Add AM_ZLIB.
* aclocal.m4: Added zlib.m4.
* Makefile.in: Regenerated.
* testsuite/ld-bootstrap/bootstrap.exp: Use it when relinking ld.
2019-07-14 05:38:00 +08:00
|
|
|
|
#include "ctf-api.h"
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#include "ld.h"
|
|
|
|
|
#include "ldmisc.h"
|
|
|
|
|
#include "ldexp.h"
|
|
|
|
|
#include "ldlang.h"
|
2002-10-30 11:57:39 +08:00
|
|
|
|
#include <ldgram.h>
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#include "ldfile.h"
|
|
|
|
|
#include "ldlex.h"
|
|
|
|
|
#include "ldmain.h"
|
2001-05-03 00:42:55 +08:00
|
|
|
|
#include "libiberty.h"
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* The type of top-level parser input.
|
|
|
|
|
yylex and yyparse (indirectly) both check this. */
|
|
|
|
|
input_type parser_input;
|
|
|
|
|
|
2016-07-05 17:36:08 +08:00
|
|
|
|
/* Line number in the current input file. */
|
|
|
|
|
unsigned int lineno;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
/* The string we are currently lexing, or NULL if we are reading a
|
|
|
|
|
file. */
|
|
|
|
|
const char *lex_string = NULL;
|
|
|
|
|
|
|
|
|
|
/* Support for flex reading from more than one input file (stream).
|
|
|
|
|
`include_stack' is flex's input state for each open file;
|
|
|
|
|
`file_name_stack' is the file names. `lineno_stack' is the current
|
|
|
|
|
line numbers.
|
|
|
|
|
|
|
|
|
|
If `include_stack_ptr' is 0, we haven't started reading anything yet.
|
|
|
|
|
Otherwise, stack elements 0 through `include_stack_ptr - 1' are valid. */
|
|
|
|
|
|
|
|
|
|
#undef YY_INPUT
|
2009-10-14 18:54:27 +08:00
|
|
|
|
#define YY_INPUT(buf,result,max_size) result = yy_input (buf, max_size)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2011-03-28 19:18:27 +08:00
|
|
|
|
#ifndef YY_NO_UNPUT
|
2005-02-15 22:36:19 +08:00
|
|
|
|
#define YY_NO_UNPUT
|
2011-03-28 19:18:27 +08:00
|
|
|
|
#endif
|
2005-02-15 22:36:19 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
#define MAX_INCLUDE_DEPTH 10
|
|
|
|
|
static YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];
|
|
|
|
|
static const char *file_name_stack[MAX_INCLUDE_DEPTH];
|
|
|
|
|
static unsigned int lineno_stack[MAX_INCLUDE_DEPTH];
|
2012-03-08 13:29:33 +08:00
|
|
|
|
static unsigned int sysrooted_stack[MAX_INCLUDE_DEPTH];
|
1999-05-03 15:29:11 +08:00
|
|
|
|
static unsigned int include_stack_ptr = 0;
|
|
|
|
|
static int vers_node_nesting = 0;
|
|
|
|
|
|
2009-10-14 18:54:27 +08:00
|
|
|
|
static int yy_input (char *, int);
|
2003-06-28 13:28:54 +08:00
|
|
|
|
static void comment (void);
|
|
|
|
|
static void lex_warn_invalid (char *where, char *what);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2003-06-28 13:28:54 +08:00
|
|
|
|
/* STATES
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
EXPRESSION in an expression
|
|
|
|
|
SCRIPT in a script
|
|
|
|
|
INPUTLIST in a script, a filename-list
|
2017-10-12 18:58:30 +08:00
|
|
|
|
MRI in an MRI script
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
WILD inside the braces of an output section or overlay,
|
|
|
|
|
for input section wildcards
|
1999-05-03 15:29:11 +08:00
|
|
|
|
VERS_START starting a Sun style mapfile
|
|
|
|
|
VERS_SCRIPT a Sun style mapfile
|
|
|
|
|
VERS_NODE a node within a Sun style mapfile
|
|
|
|
|
*/
|
|
|
|
|
#define RTOKEN(x) { yylval.token = x; return x; }
|
|
|
|
|
|
|
|
|
|
%}
|
|
|
|
|
|
|
|
|
|
%a 4000
|
|
|
|
|
%o 5000
|
|
|
|
|
|
2019-04-03 08:58:17 +08:00
|
|
|
|
WILDCHAR [_a-zA-Z0-9\/\.\\\$\~\-\+\:\[\]\,\=\?\*\^\!]
|
|
|
|
|
FILENAMECHAR [_a-zA-Z0-9\/\.\\\$\~\-\+\:\[\]\,\=]
|
|
|
|
|
NOCFILENAMECHAR [_a-zA-Z0-9\/\.\\\$\~\-\+\:\[\]]
|
|
|
|
|
SYMBOLNAMECHAR [_a-zA-Z0-9\/\.\\\$\~]
|
|
|
|
|
FILENAMECHAR1 [_a-zA-Z\/\.\\\$\~]
|
2019-04-03 08:51:36 +08:00
|
|
|
|
SYMBOLNAMECHAR1 [_a-zA-Z\.\\\$]
|
2003-06-28 13:28:54 +08:00
|
|
|
|
WHITE [ \t\n\r]+
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
V_TAG [.$_a-zA-Z][._a-zA-Z0-9]*
|
2003-10-24 22:55:14 +08:00
|
|
|
|
V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^\\]([*?.$_a-zA-Z0-9\[\]\-\!\^\\]|::)*
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
%s SCRIPT
|
Allow unquoted = as the first character in ldscript input_list names
* ldlex.l (INPUTLIST): New start condition.
(comment pattern, ",", "(", ")", "AS_NEEDED")
({FILENAMECHAR1}{FILENAMECHAR}*, "-l"{FILENAMECHAR}+)
(quoted string pattern, whitespace pattern): Add INPUTLIST to
valid start conditions.
(<INPUTLIST>"="{FILENAMECHAR1}{FILENAMECHAR}*): New NAME rule.
(ldlex_inputlist): New start-condition-setter function.
* ldgram.y (input_list1): Rename from input_list. All recursive
use changed.
(input_list): New wrapper rule for input_list1, setting
INPUTLIST lexer state for the duration of parsing input_list1.
All this to say INPUT(=/path/to/file) and not be forced to use
INPUT("=/path/to/file") whenever there's a need to force a sysroot-
prefix. Still, IMHO it seems better to make use of a previously
invalid syntax and not only change the meaning of quoted =-prefixed
paths (though arguably that's not very useful before this patchset).
This got a little bit hairier than I'd expected: I had to add a new
lexer state (aka. start condition) to avoid a first "=" being lexed as
the token "=", despite that not making sense in constructs expecting
file-names in the first place. (The grammar doesn't allow for
expressions in any part of those lists.) I guess I *could* have made
it work using that token anyway, but I didn't like the idea that you
would be able to separate the "=" from the rest of the file-name with
whitespace.
2014-10-15 09:10:25 +08:00
|
|
|
|
%s INPUTLIST
|
1999-05-03 15:29:11 +08:00
|
|
|
|
%s EXPRESSION
|
|
|
|
|
%s MRI
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
%s WILD
|
1999-05-03 15:29:11 +08:00
|
|
|
|
%s VERS_START
|
|
|
|
|
%s VERS_SCRIPT
|
|
|
|
|
%s VERS_NODE
|
|
|
|
|
%%
|
|
|
|
|
|
|
|
|
|
if (parser_input != input_selected)
|
|
|
|
|
{
|
|
|
|
|
/* The first token of the input determines the initial parser state. */
|
|
|
|
|
input_type t = parser_input;
|
|
|
|
|
parser_input = input_selected;
|
|
|
|
|
switch (t)
|
|
|
|
|
{
|
|
|
|
|
case input_script: return INPUT_SCRIPT; break;
|
|
|
|
|
case input_mri_script: return INPUT_MRI_SCRIPT; break;
|
|
|
|
|
case input_version_script: return INPUT_VERSION_SCRIPT; break;
|
2006-09-08 01:16:34 +08:00
|
|
|
|
case input_dynamic_list: return INPUT_DYNAMIC_LIST; break;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case input_defsym: return INPUT_DEFSYM; break;
|
|
|
|
|
default: abort ();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<SCRIPT,EXPRESSION,VERS_START,VERS_NODE,VERS_SCRIPT,INPUTLIST>"/*" {
|
|
|
|
|
comment (); }
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
<MRI,EXPRESSION>"$"([0-9A-Fa-f])+ {
|
2017-10-12 18:58:30 +08:00
|
|
|
|
yylval.integer = bfd_scan_vma (yytext + 1, 0, 16);
|
2003-06-28 13:28:54 +08:00
|
|
|
|
yylval.bigint.str = NULL;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
return INT;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
<MRI,EXPRESSION>([0-9A-Fa-f])+(H|h|X|x|B|b|O|o|D|d) {
|
|
|
|
|
int ibase ;
|
2003-06-28 13:28:54 +08:00
|
|
|
|
switch (yytext[yyleng - 1]) {
|
|
|
|
|
case 'X':
|
1999-05-03 15:29:11 +08:00
|
|
|
|
case 'x':
|
|
|
|
|
case 'H':
|
|
|
|
|
case 'h':
|
|
|
|
|
ibase = 16;
|
|
|
|
|
break;
|
|
|
|
|
case 'O':
|
|
|
|
|
case 'o':
|
|
|
|
|
ibase = 8;
|
|
|
|
|
break;
|
|
|
|
|
case 'B':
|
|
|
|
|
case 'b':
|
|
|
|
|
ibase = 2;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
ibase = 10;
|
|
|
|
|
}
|
|
|
|
|
yylval.integer = bfd_scan_vma (yytext, 0,
|
|
|
|
|
ibase);
|
2003-06-28 13:28:54 +08:00
|
|
|
|
yylval.bigint.str = NULL;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
return INT;
|
|
|
|
|
}
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<SCRIPT,MRI,EXPRESSION>((("$"|0[xX])([0-9A-Fa-f])+)|(([0-9])+))(M|K|m|k)? {
|
1999-05-03 15:29:11 +08:00
|
|
|
|
char *s = yytext;
|
2002-02-15 10:11:05 +08:00
|
|
|
|
int ibase = 0;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
if (*s == '$')
|
2002-02-15 10:11:05 +08:00
|
|
|
|
{
|
|
|
|
|
++s;
|
|
|
|
|
ibase = 16;
|
|
|
|
|
}
|
|
|
|
|
yylval.integer = bfd_scan_vma (s, 0, ibase);
|
2003-06-28 13:28:54 +08:00
|
|
|
|
yylval.bigint.str = NULL;
|
|
|
|
|
if (yytext[yyleng - 1] == 'M'
|
|
|
|
|
|| yytext[yyleng - 1] == 'm')
|
2002-02-15 10:11:05 +08:00
|
|
|
|
{
|
|
|
|
|
yylval.integer *= 1024 * 1024;
|
|
|
|
|
}
|
2003-06-28 13:28:54 +08:00
|
|
|
|
else if (yytext[yyleng - 1] == 'K'
|
|
|
|
|
|| yytext[yyleng - 1]=='k')
|
2002-02-15 10:11:05 +08:00
|
|
|
|
{
|
|
|
|
|
yylval.integer *= 1024;
|
|
|
|
|
}
|
|
|
|
|
else if (yytext[0] == '0'
|
|
|
|
|
&& (yytext[1] == 'x'
|
|
|
|
|
|| yytext[1] == 'X'))
|
|
|
|
|
{
|
|
|
|
|
yylval.bigint.str = xstrdup (yytext + 2);
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
return INT;
|
|
|
|
|
}
|
2021-08-13 15:50:10 +08:00
|
|
|
|
|
|
|
|
|
/* Some tokens that only appear in expressions must be enabled for
|
|
|
|
|
states other than EXPRESSION, since parser lookahead means they
|
|
|
|
|
must be recognised before the parser switches the lexer out of
|
|
|
|
|
SCRIPT or WILD state into EXPRESSION state.
|
|
|
|
|
|
|
|
|
|
This sort of thing happens for example with NAME in ldgram.y
|
|
|
|
|
"section" rule, which is immediately followed by ldlex_expression.
|
|
|
|
|
However, if you follow the grammar from "sec_or_group_p1" you see
|
|
|
|
|
"assignment" appearing in "statement_anywhere". Now,
|
|
|
|
|
"assignment" also has NAME as its first token, just like
|
|
|
|
|
"section". So the parser can't know whether it is in the
|
|
|
|
|
"section" or the "assignment" rule until it has scanned the next
|
|
|
|
|
token to find an assignment operator. Thus the next token after
|
|
|
|
|
NAME in the "section" rule may be lexed before the lexer is
|
|
|
|
|
switched to EXPRESSION state, and there are quite a number of
|
|
|
|
|
optional components. The first token in all those components
|
|
|
|
|
must be able to be lexed in SCRIPT state, as well as the
|
|
|
|
|
assignment operators. In fact, due to "opt_exp_with_type",
|
|
|
|
|
anything that can appear on the left hand side of "exp" might
|
|
|
|
|
need to be lexed in SCRIPT state.
|
|
|
|
|
|
|
|
|
|
MRI mode tends to cover everything in MRI scripts.
|
|
|
|
|
*/
|
|
|
|
|
<MRI,WILD>"]" { RTOKEN(']'); }
|
|
|
|
|
<MRI,WILD>"[" { RTOKEN('['); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI,WILD>"<<=" { RTOKEN(LSHIFTEQ); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI,WILD>">>=" { RTOKEN(RSHIFTEQ); }
|
|
|
|
|
<EXPRESSION,MRI>"||" { RTOKEN(OROR); }
|
|
|
|
|
<EXPRESSION,MRI>"==" { RTOKEN(EQ); }
|
|
|
|
|
<EXPRESSION,MRI>"!=" { RTOKEN(NE); }
|
|
|
|
|
<EXPRESSION,MRI>">=" { RTOKEN(GE); }
|
|
|
|
|
<EXPRESSION,MRI>"<=" { RTOKEN(LE); }
|
|
|
|
|
<EXPRESSION,MRI>"<<" { RTOKEN(LSHIFT); }
|
|
|
|
|
<EXPRESSION,MRI>">>" { RTOKEN(RSHIFT); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI,WILD>"+=" { RTOKEN(PLUSEQ); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI,WILD>"-=" { RTOKEN(MINUSEQ); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI,WILD>"*=" { RTOKEN(MULTEQ); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI,WILD>"/=" { RTOKEN(DIVEQ); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI,WILD>"&=" { RTOKEN(ANDEQ); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI,WILD>"|=" { RTOKEN(OREQ); }
|
|
|
|
|
<EXPRESSION,MRI>"&&" { RTOKEN(ANDAND); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI>">" { RTOKEN('>'); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI,INPUTLIST>"," { RTOKEN(','); }
|
|
|
|
|
<EXPRESSION,MRI,WILD>"&" { RTOKEN('&'); }
|
|
|
|
|
<EXPRESSION,MRI>"|" { RTOKEN('|'); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI>"~" { RTOKEN('~'); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI>"!" { RTOKEN('!'); }
|
|
|
|
|
<EXPRESSION,MRI>"?" { RTOKEN('?'); }
|
|
|
|
|
<EXPRESSION,MRI>"*" { RTOKEN('*'); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI>"+" { RTOKEN('+'); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI>"-" { RTOKEN('-'); }
|
|
|
|
|
<EXPRESSION,MRI>"/" { RTOKEN('/'); }
|
|
|
|
|
<EXPRESSION,MRI>"%" { RTOKEN('%'); }
|
|
|
|
|
<EXPRESSION,MRI>"<" { RTOKEN('<'); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI,WILD>"=" { RTOKEN('='); }
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<SCRIPT,EXPRESSION,MRI,WILD>"}" { RTOKEN('}'); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI,WILD>"{" { RTOKEN('{'); }
|
2021-08-13 15:50:10 +08:00
|
|
|
|
<SCRIPT,EXPRESSION,MRI,WILD,INPUTLIST>")" { RTOKEN(')'); }
|
|
|
|
|
<SCRIPT,EXPRESSION,MRI,WILD,INPUTLIST>"(" { RTOKEN('('); }
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<SCRIPT,EXPRESSION,MRI>":" { RTOKEN(':'); }
|
2021-08-13 15:50:10 +08:00
|
|
|
|
<SCRIPT,EXPRESSION,MRI,WILD>";" { RTOKEN(';'); }
|
|
|
|
|
<SCRIPT>"MEMORY" { RTOKEN(MEMORY); }
|
|
|
|
|
<SCRIPT>"REGION_ALIAS" { RTOKEN(REGION_ALIAS); }
|
|
|
|
|
<SCRIPT>"LD_FEATURE" { RTOKEN(LD_FEATURE); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"ORIGIN" { RTOKEN(ORIGIN); }
|
|
|
|
|
<SCRIPT>"VERSION" { RTOKEN(VERSIONK); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"BLOCK" { RTOKEN(BLOCK); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"BIND" { RTOKEN(BIND); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"LENGTH" { RTOKEN(LENGTH); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"ALIGN" { RTOKEN(ALIGN_K); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"DATA_SEGMENT_ALIGN" { RTOKEN(DATA_SEGMENT_ALIGN); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"DATA_SEGMENT_RELRO_END" { RTOKEN(DATA_SEGMENT_RELRO_END); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"DATA_SEGMENT_END" { RTOKEN(DATA_SEGMENT_END); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"ADDR" { RTOKEN(ADDR); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"LOADADDR" { RTOKEN(LOADADDR); }
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<SCRIPT,EXPRESSION>"ALIGNOF" { RTOKEN(ALIGNOF); }
|
2021-08-13 21:08:31 +08:00
|
|
|
|
<SCRIPT,EXPRESSION>"ABSOLUTE" { RTOKEN(ABSOLUTE); }
|
2021-08-13 15:50:10 +08:00
|
|
|
|
<SCRIPT,EXPRESSION>"MAX" { RTOKEN(MAX_K); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"MIN" { RTOKEN(MIN_K); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"LOG2CEIL" { RTOKEN(LOG2CEIL); }
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<SCRIPT,EXPRESSION,WILD>"ASSERT" { RTOKEN(ASSERT_K); }
|
2021-08-13 15:50:10 +08:00
|
|
|
|
<SCRIPT>"ENTRY" { RTOKEN(ENTRY); }
|
|
|
|
|
<SCRIPT,MRI>"EXTERN" { RTOKEN(EXTERN); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"NEXT" { RTOKEN(NEXT); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"SIZEOF_HEADERS" { RTOKEN(SIZEOF_HEADERS); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"SEGMENT_START" { RTOKEN(SEGMENT_START); }
|
|
|
|
|
<SCRIPT>"MAP" { RTOKEN(MAP); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"SIZEOF" { RTOKEN(SIZEOF); }
|
|
|
|
|
<SCRIPT>"TARGET" { RTOKEN(TARGET_K); }
|
|
|
|
|
<SCRIPT>"SEARCH_DIR" { RTOKEN(SEARCH_DIR); }
|
|
|
|
|
<SCRIPT>"OUTPUT" { RTOKEN(OUTPUT); }
|
|
|
|
|
<SCRIPT>"INPUT" { RTOKEN(INPUT); }
|
|
|
|
|
<SCRIPT>"GROUP" { RTOKEN(GROUP); }
|
|
|
|
|
<INPUTLIST>"AS_NEEDED" { RTOKEN(AS_NEEDED); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"DEFINED" { RTOKEN(DEFINED); }
|
|
|
|
|
<WILD>"CREATE_OBJECT_SYMBOLS" { RTOKEN(CREATE_OBJECT_SYMBOLS); }
|
|
|
|
|
<WILD>"CONSTRUCTORS" { RTOKEN(CONSTRUCTORS); }
|
|
|
|
|
<SCRIPT>"FORCE_COMMON_ALLOCATION" { RTOKEN(FORCE_COMMON_ALLOCATION); }
|
|
|
|
|
<SCRIPT>"FORCE_GROUP_ALLOCATION" { RTOKEN(FORCE_GROUP_ALLOCATION); }
|
|
|
|
|
<SCRIPT>"INHIBIT_COMMON_ALLOCATION" { RTOKEN(INHIBIT_COMMON_ALLOCATION); }
|
|
|
|
|
<SCRIPT>"SECTIONS" { RTOKEN(SECTIONS); }
|
|
|
|
|
<SCRIPT>"INSERT" { RTOKEN(INSERT_K); }
|
|
|
|
|
<SCRIPT>"AFTER" { RTOKEN(AFTER); }
|
|
|
|
|
<SCRIPT>"BEFORE" { RTOKEN(BEFORE); }
|
|
|
|
|
<WILD>"FILL" { RTOKEN(FILL); }
|
|
|
|
|
<SCRIPT>"STARTUP" { RTOKEN(STARTUP); }
|
|
|
|
|
<SCRIPT>"OUTPUT_FORMAT" { RTOKEN(OUTPUT_FORMAT); }
|
|
|
|
|
<SCRIPT>"OUTPUT_ARCH" { RTOKEN(OUTPUT_ARCH); }
|
|
|
|
|
<SCRIPT>"HLL" { RTOKEN(HLL); }
|
|
|
|
|
<SCRIPT>"SYSLIB" { RTOKEN(SYSLIB); }
|
|
|
|
|
<SCRIPT>"FLOAT" { RTOKEN(FLOAT); }
|
|
|
|
|
<WILD>"QUAD" { RTOKEN(QUAD); }
|
|
|
|
|
<WILD>"SQUAD" { RTOKEN(SQUAD); }
|
|
|
|
|
<WILD>"LONG" { RTOKEN(LONG); }
|
|
|
|
|
<WILD>"SHORT" { RTOKEN(SHORT); }
|
|
|
|
|
<WILD>"BYTE" { RTOKEN(BYTE); }
|
|
|
|
|
<SCRIPT>"NOFLOAT" { RTOKEN(NOFLOAT); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"NOCROSSREFS" { RTOKEN(NOCROSSREFS); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"NOCROSSREFS_TO" { RTOKEN(NOCROSSREFS_TO); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"OVERLAY" { RTOKEN(OVERLAY); }
|
|
|
|
|
<WILD>"SORT_BY_NAME" { RTOKEN(SORT_BY_NAME); }
|
|
|
|
|
<WILD>"SORT_BY_ALIGNMENT" { RTOKEN(SORT_BY_ALIGNMENT); }
|
|
|
|
|
<WILD>"SORT" { RTOKEN(SORT_BY_NAME); }
|
|
|
|
|
<WILD>"SORT_BY_INIT_PRIORITY" { RTOKEN(SORT_BY_INIT_PRIORITY); }
|
|
|
|
|
<WILD>"SORT_NONE" { RTOKEN(SORT_NONE); }
|
|
|
|
|
<EXPRESSION>"NOLOAD" { RTOKEN(NOLOAD); }
|
|
|
|
|
<EXPRESSION>"READONLY" { RTOKEN(READONLY); }
|
|
|
|
|
<EXPRESSION>"DSECT" { RTOKEN(DSECT); }
|
|
|
|
|
<EXPRESSION>"COPY" { RTOKEN(COPY); }
|
|
|
|
|
<EXPRESSION>"INFO" { RTOKEN(INFO); }
|
2022-02-17 01:41:23 +08:00
|
|
|
|
<EXPRESSION>"TYPE" { RTOKEN(TYPE); }
|
2021-08-13 15:50:10 +08:00
|
|
|
|
<SCRIPT,EXPRESSION>"ONLY_IF_RO" { RTOKEN(ONLY_IF_RO); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"ONLY_IF_RW" { RTOKEN(ONLY_IF_RW); }
|
|
|
|
|
<SCRIPT,EXPRESSION>"SPECIAL" { RTOKEN(SPECIAL); }
|
|
|
|
|
<SCRIPT>"o" { RTOKEN(ORIGIN); }
|
|
|
|
|
<SCRIPT>"org" { RTOKEN(ORIGIN); }
|
|
|
|
|
<SCRIPT>"l" { RTOKEN(LENGTH); }
|
|
|
|
|
<SCRIPT>"len" { RTOKEN(LENGTH); }
|
|
|
|
|
<WILD>"INPUT_SECTION_FLAGS" { RTOKEN(INPUT_SECTION_FLAGS); }
|
|
|
|
|
<SCRIPT,EXPRESSION,WILD,MRI>"INCLUDE" { RTOKEN(INCLUDE);}
|
|
|
|
|
<SCRIPT>"PHDRS" { RTOKEN(PHDRS); }
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<SCRIPT,EXPRESSION,WILD>"AT" { RTOKEN(AT);}
|
|
|
|
|
<SCRIPT,EXPRESSION>"ALIGN_WITH_INPUT" { RTOKEN(ALIGN_WITH_INPUT);}
|
|
|
|
|
<SCRIPT,EXPRESSION>"SUBALIGN" { RTOKEN(SUBALIGN);}
|
|
|
|
|
<SCRIPT,EXPRESSION,WILD>"HIDDEN" { RTOKEN(HIDDEN); }
|
|
|
|
|
<SCRIPT,EXPRESSION,WILD>"PROVIDE" { RTOKEN(PROVIDE); }
|
|
|
|
|
<SCRIPT,EXPRESSION,WILD>"PROVIDE_HIDDEN" { RTOKEN(PROVIDE_HIDDEN); }
|
2021-08-13 15:50:10 +08:00
|
|
|
|
<WILD>"KEEP" { RTOKEN(KEEP); }
|
|
|
|
|
<WILD>"EXCLUDE_FILE" { RTOKEN(EXCLUDE_FILE); }
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<SCRIPT,EXPRESSION>"CONSTANT" { RTOKEN(CONSTANT);}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
<MRI>"#".*\n? { ++ lineno; }
|
2017-10-12 18:58:30 +08:00
|
|
|
|
<MRI>"\n" { ++ lineno; RTOKEN(NEWLINE); }
|
1999-05-03 15:29:11 +08:00
|
|
|
|
<MRI>"*".* { /* Mri comment line */ }
|
|
|
|
|
<MRI>";".* { /* Mri comment line */ }
|
2017-10-12 18:58:30 +08:00
|
|
|
|
<MRI>"END" { RTOKEN(ENDWORD); }
|
2021-08-13 21:08:31 +08:00
|
|
|
|
<MRI>"ABSOLUTE" { RTOKEN(ABSOLUTE); }
|
2004-11-19 17:31:55 +08:00
|
|
|
|
<MRI>"ALIGNMOD" { RTOKEN(ALIGNMOD);}
|
|
|
|
|
<MRI>"ALIGN" { RTOKEN(ALIGN_K);}
|
2017-10-12 18:58:30 +08:00
|
|
|
|
<MRI>"CHIP" { RTOKEN(CHIP); }
|
|
|
|
|
<MRI>"BASE" { RTOKEN(BASE); }
|
|
|
|
|
<MRI>"ALIAS" { RTOKEN(ALIAS); }
|
|
|
|
|
<MRI>"TRUNCATE" { RTOKEN(TRUNCATE); }
|
|
|
|
|
<MRI>"LOAD" { RTOKEN(LOAD); }
|
|
|
|
|
<MRI>"PUBLIC" { RTOKEN(PUBLIC); }
|
|
|
|
|
<MRI>"ORDER" { RTOKEN(ORDER); }
|
|
|
|
|
<MRI>"NAME" { RTOKEN(NAMEWORD); }
|
|
|
|
|
<MRI>"FORMAT" { RTOKEN(FORMAT); }
|
|
|
|
|
<MRI>"CASE" { RTOKEN(CASE); }
|
|
|
|
|
<MRI>"START" { RTOKEN(START); }
|
|
|
|
|
<MRI>"LIST".* { RTOKEN(LIST); /* LIST and ignore to end of line */ }
|
1999-05-03 15:29:11 +08:00
|
|
|
|
<MRI>"SECT" { RTOKEN(SECT); }
|
2017-10-12 18:58:30 +08:00
|
|
|
|
<MRI>"end" { RTOKEN(ENDWORD); }
|
2021-08-13 21:08:31 +08:00
|
|
|
|
<MRI>"absolute" { RTOKEN(ABSOLUTE); }
|
2004-11-19 17:31:55 +08:00
|
|
|
|
<MRI>"alignmod" { RTOKEN(ALIGNMOD);}
|
|
|
|
|
<MRI>"align" { RTOKEN(ALIGN_K);}
|
2017-10-12 18:58:30 +08:00
|
|
|
|
<MRI>"chip" { RTOKEN(CHIP); }
|
|
|
|
|
<MRI>"base" { RTOKEN(BASE); }
|
|
|
|
|
<MRI>"alias" { RTOKEN(ALIAS); }
|
|
|
|
|
<MRI>"truncate" { RTOKEN(TRUNCATE); }
|
|
|
|
|
<MRI>"load" { RTOKEN(LOAD); }
|
|
|
|
|
<MRI>"public" { RTOKEN(PUBLIC); }
|
|
|
|
|
<MRI>"order" { RTOKEN(ORDER); }
|
|
|
|
|
<MRI>"name" { RTOKEN(NAMEWORD); }
|
|
|
|
|
<MRI>"format" { RTOKEN(FORMAT); }
|
|
|
|
|
<MRI>"case" { RTOKEN(CASE); }
|
|
|
|
|
<MRI>"extern" { RTOKEN(EXTERN); }
|
|
|
|
|
<MRI>"start" { RTOKEN(START); }
|
|
|
|
|
<MRI>"list".* { RTOKEN(LIST); /* LIST and ignore to end of line */ }
|
1999-05-03 15:29:11 +08:00
|
|
|
|
<MRI>"sect" { RTOKEN(SECT); }
|
|
|
|
|
|
|
|
|
|
<MRI>{FILENAMECHAR1}{NOCFILENAMECHAR}* {
|
|
|
|
|
/* Filename without commas, needed to parse mri stuff */
|
2019-04-03 08:58:17 +08:00
|
|
|
|
yylval.name = xstrdup (yytext);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
return NAME;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<SCRIPT,INPUTLIST>{FILENAMECHAR1}{FILENAMECHAR}* {
|
2019-04-03 08:58:17 +08:00
|
|
|
|
yylval.name = xstrdup (yytext);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
return NAME;
|
|
|
|
|
}
|
Allow unquoted = as the first character in ldscript input_list names
* ldlex.l (INPUTLIST): New start condition.
(comment pattern, ",", "(", ")", "AS_NEEDED")
({FILENAMECHAR1}{FILENAMECHAR}*, "-l"{FILENAMECHAR}+)
(quoted string pattern, whitespace pattern): Add INPUTLIST to
valid start conditions.
(<INPUTLIST>"="{FILENAMECHAR1}{FILENAMECHAR}*): New NAME rule.
(ldlex_inputlist): New start-condition-setter function.
* ldgram.y (input_list1): Rename from input_list. All recursive
use changed.
(input_list): New wrapper rule for input_list1, setting
INPUTLIST lexer state for the duration of parsing input_list1.
All this to say INPUT(=/path/to/file) and not be forced to use
INPUT("=/path/to/file") whenever there's a need to force a sysroot-
prefix. Still, IMHO it seems better to make use of a previously
invalid syntax and not only change the meaning of quoted =-prefixed
paths (though arguably that's not very useful before this patchset).
This got a little bit hairier than I'd expected: I had to add a new
lexer state (aka. start condition) to avoid a first "=" being lexed as
the token "=", despite that not making sense in constructs expecting
file-names in the first place. (The grammar doesn't allow for
expressions in any part of those lists.) I guess I *could* have made
it work using that token anyway, but I didn't like the idea that you
would be able to separate the "=" from the rest of the file-name with
whitespace.
2014-10-15 09:10:25 +08:00
|
|
|
|
<INPUTLIST>"="{FILENAMECHAR1}{FILENAMECHAR}* {
|
2017-05-18 22:07:59 +08:00
|
|
|
|
/* Filename to be prefixed by --sysroot or when non-sysrooted, nothing. */
|
2019-04-03 08:58:17 +08:00
|
|
|
|
yylval.name = xstrdup (yytext);
|
Allow unquoted = as the first character in ldscript input_list names
* ldlex.l (INPUTLIST): New start condition.
(comment pattern, ",", "(", ")", "AS_NEEDED")
({FILENAMECHAR1}{FILENAMECHAR}*, "-l"{FILENAMECHAR}+)
(quoted string pattern, whitespace pattern): Add INPUTLIST to
valid start conditions.
(<INPUTLIST>"="{FILENAMECHAR1}{FILENAMECHAR}*): New NAME rule.
(ldlex_inputlist): New start-condition-setter function.
* ldgram.y (input_list1): Rename from input_list. All recursive
use changed.
(input_list): New wrapper rule for input_list1, setting
INPUTLIST lexer state for the duration of parsing input_list1.
All this to say INPUT(=/path/to/file) and not be forced to use
INPUT("=/path/to/file") whenever there's a need to force a sysroot-
prefix. Still, IMHO it seems better to make use of a previously
invalid syntax and not only change the meaning of quoted =-prefixed
paths (though arguably that's not very useful before this patchset).
This got a little bit hairier than I'd expected: I had to add a new
lexer state (aka. start condition) to avoid a first "=" being lexed as
the token "=", despite that not making sense in constructs expecting
file-names in the first place. (The grammar doesn't allow for
expressions in any part of those lists.) I guess I *could* have made
it work using that token anyway, but I didn't like the idea that you
would be able to separate the "=" from the rest of the file-name with
whitespace.
2014-10-15 09:10:25 +08:00
|
|
|
|
return NAME;
|
|
|
|
|
}
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<INPUTLIST>"-l"{FILENAMECHAR}+ {
|
2007-05-24 17:24:09 +08:00
|
|
|
|
yylval.name = xstrdup (yytext + 2);
|
|
|
|
|
return LNAME;
|
|
|
|
|
}
|
2021-02-01 06:45:41 +08:00
|
|
|
|
<EXPRESSION>{SYMBOLNAMECHAR1}{SYMBOLNAMECHAR}* {
|
2019-04-03 08:58:17 +08:00
|
|
|
|
yylval.name = xstrdup (yytext);
|
2007-05-24 17:24:09 +08:00
|
|
|
|
return NAME;
|
|
|
|
|
}
|
2021-08-13 15:50:10 +08:00
|
|
|
|
/* The following rule is to prevent a fill expression on the output
|
|
|
|
|
section before /DISCARD/ interpreting the '/' as a divide. */
|
2019-04-03 08:51:36 +08:00
|
|
|
|
<EXPRESSION>"/DISCARD/" {
|
|
|
|
|
yylval.name = xstrdup (yytext);
|
|
|
|
|
return NAME;
|
|
|
|
|
}
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<WILD>{WILDCHAR}* {
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* Annoyingly, this pattern can match comments, and we have
|
|
|
|
|
longest match issues to consider. So if the first two
|
|
|
|
|
characters are a comment opening, put the input back and
|
|
|
|
|
try again. */
|
|
|
|
|
if (yytext[0] == '/' && yytext[1] == '*')
|
|
|
|
|
{
|
2003-06-28 13:28:54 +08:00
|
|
|
|
yyless (2);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
comment ();
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2003-06-28 13:28:54 +08:00
|
|
|
|
yylval.name = xstrdup (yytext);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
return NAME;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<SCRIPT,EXPRESSION,WILD,VERS_NODE,INPUTLIST>"\""[^\"]*"\"" {
|
2021-11-03 13:51:42 +08:00
|
|
|
|
/* No matter the state, quotes give what's inside. */
|
|
|
|
|
yylval.name = xmemdup (yytext + 1, yyleng - 2, yyleng - 1);
|
|
|
|
|
return NAME;
|
|
|
|
|
}
|
2021-08-11 16:46:35 +08:00
|
|
|
|
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<SCRIPT,EXPRESSION,WILD,VERS_START,VERS_NODE,VERS_SCRIPT,INPUTLIST>"\n" {
|
2021-08-11 16:46:35 +08:00
|
|
|
|
lineno++; }
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<MRI,SCRIPT,EXPRESSION,WILD,VERS_START,VERS_NODE,VERS_SCRIPT,INPUTLIST>[ \t\r]+ {
|
2021-08-11 16:46:35 +08:00
|
|
|
|
/* Eat up whitespace */ }
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<SCRIPT,EXPRESSION,WILD,VERS_START,VERS_NODE,VERS_SCRIPT>#.* {
|
2021-08-11 16:46:35 +08:00
|
|
|
|
/* Eat up comments */ }
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
<VERS_NODE,VERS_SCRIPT>[:,;] { return *yytext; }
|
|
|
|
|
|
|
|
|
|
<VERS_NODE>global { RTOKEN(GLOBAL); }
|
|
|
|
|
|
|
|
|
|
<VERS_NODE>local { RTOKEN(LOCAL); }
|
|
|
|
|
|
|
|
|
|
<VERS_NODE>extern { RTOKEN(EXTERN); }
|
|
|
|
|
|
2001-05-03 00:42:55 +08:00
|
|
|
|
<VERS_NODE>{V_IDENTIFIER} { yylval.name = xstrdup (yytext);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
return VERS_IDENTIFIER; }
|
|
|
|
|
|
2001-05-03 00:42:55 +08:00
|
|
|
|
<VERS_SCRIPT>{V_TAG} { yylval.name = xstrdup (yytext);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
return VERS_TAG; }
|
|
|
|
|
|
|
|
|
|
<VERS_START>"{" { BEGIN(VERS_SCRIPT); return *yytext; }
|
|
|
|
|
|
2003-06-28 13:28:54 +08:00
|
|
|
|
<VERS_SCRIPT>"{" { BEGIN(VERS_NODE);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
vers_node_nesting = 0;
|
|
|
|
|
return *yytext;
|
|
|
|
|
}
|
|
|
|
|
<VERS_SCRIPT>"}" { return *yytext; }
|
|
|
|
|
<VERS_NODE>"{" { vers_node_nesting++; return *yytext; }
|
|
|
|
|
<VERS_NODE>"}" { if (--vers_node_nesting < 0)
|
|
|
|
|
BEGIN(VERS_SCRIPT);
|
|
|
|
|
return *yytext;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
<<EOF>> {
|
|
|
|
|
include_stack_ptr--;
|
2003-06-28 13:28:54 +08:00
|
|
|
|
if (include_stack_ptr == 0)
|
2016-07-05 17:36:08 +08:00
|
|
|
|
{
|
|
|
|
|
lineno = 0;
|
|
|
|
|
yyterminate ();
|
|
|
|
|
}
|
2003-06-28 13:28:54 +08:00
|
|
|
|
else
|
|
|
|
|
yy_switch_to_buffer (include_stack[include_stack_ptr]);
|
2001-10-20 21:49:00 +08:00
|
|
|
|
|
|
|
|
|
lineno = lineno_stack[include_stack_ptr];
|
2012-03-08 13:29:33 +08:00
|
|
|
|
input_flags.sysrooted = sysrooted_stack[include_stack_ptr];
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
return END;
|
|
|
|
|
}
|
|
|
|
|
|
2021-08-13 15:50:10 +08:00
|
|
|
|
<SCRIPT,WILD,MRI,VERS_START,VERS_SCRIPT,VERS_NODE>. lex_warn_invalid (" in script", yytext);
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
<EXPRESSION>. lex_warn_invalid (" in expression", yytext);
|
2003-06-28 13:28:54 +08:00
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
%%
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* Switch flex to reading script file NAME, open on FILE,
|
|
|
|
|
saving the current input info on the include stack. */
|
|
|
|
|
|
|
|
|
|
void
|
2012-03-08 13:29:33 +08:00
|
|
|
|
lex_push_file (FILE *file, const char *name, unsigned int sysrooted)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2003-06-28 13:28:54 +08:00
|
|
|
|
if (include_stack_ptr >= MAX_INCLUDE_DEPTH)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2017-10-11 12:18:45 +08:00
|
|
|
|
einfo (_("%F:includes nested too deeply\n"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
file_name_stack[include_stack_ptr] = name;
|
2001-10-20 21:49:00 +08:00
|
|
|
|
lineno_stack[include_stack_ptr] = lineno;
|
2012-03-08 13:29:33 +08:00
|
|
|
|
sysrooted_stack[include_stack_ptr] = input_flags.sysrooted;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
include_stack[include_stack_ptr] = YY_CURRENT_BUFFER;
|
|
|
|
|
|
|
|
|
|
include_stack_ptr++;
|
2001-10-20 21:49:00 +08:00
|
|
|
|
lineno = 1;
|
2012-03-08 13:29:33 +08:00
|
|
|
|
input_flags.sysrooted = sysrooted;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
yyin = file;
|
2003-06-28 13:28:54 +08:00
|
|
|
|
yy_switch_to_buffer (yy_create_buffer (yyin, YY_BUF_SIZE));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Return a newly created flex input buffer containing STRING,
|
|
|
|
|
which is SIZE bytes long. */
|
|
|
|
|
|
2003-06-28 13:28:54 +08:00
|
|
|
|
static YY_BUFFER_STATE
|
|
|
|
|
yy_create_string_buffer (const char *string, size_t size)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
YY_BUFFER_STATE b;
|
|
|
|
|
|
2020-08-03 09:29:38 +08:00
|
|
|
|
b = xmalloc (sizeof (struct yy_buffer_state));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
b->yy_input_file = 0;
|
|
|
|
|
b->yy_buf_size = size;
|
|
|
|
|
|
|
|
|
|
/* yy_ch_buf has to be 2 characters longer than the size given because
|
|
|
|
|
we need to put in 2 end-of-buffer characters. */
|
2020-08-03 09:29:38 +08:00
|
|
|
|
b->yy_ch_buf = xmalloc ((size_t) b->yy_buf_size + 3);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
b->yy_ch_buf[0] = '\n';
|
|
|
|
|
strcpy (b->yy_ch_buf+1, string);
|
|
|
|
|
b->yy_ch_buf[size+1] = YY_END_OF_BUFFER_CHAR;
|
|
|
|
|
b->yy_ch_buf[size+2] = YY_END_OF_BUFFER_CHAR;
|
|
|
|
|
b->yy_n_chars = size+1;
|
|
|
|
|
b->yy_buf_pos = &b->yy_ch_buf[1];
|
|
|
|
|
|
2000-11-05 14:27:15 +08:00
|
|
|
|
b->yy_is_our_buffer = 1;
|
|
|
|
|
b->yy_is_interactive = 0;
|
|
|
|
|
b->yy_at_bol = 1;
|
|
|
|
|
b->yy_fill_buffer = 0;
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
/* flex 2.4.7 changed the interface. FIXME: We should not be using
|
|
|
|
|
a flex internal interface in the first place! */
|
|
|
|
|
#ifdef YY_BUFFER_NEW
|
|
|
|
|
b->yy_buffer_status = YY_BUFFER_NEW;
|
|
|
|
|
#else
|
|
|
|
|
b->yy_eof_status = EOF_NOT_SEEN;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
return b;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Switch flex to reading from STRING, saving the current input info
|
|
|
|
|
on the include stack. */
|
|
|
|
|
|
|
|
|
|
void
|
PR ld/13343
* ld.h (parsing_defsym): Delete.
* ldexp.c (exp_intop, exp_bigintop, exp_relop): Set type.filename.
(fold_binary, fold_name, exp_fold_tree_1, exp_get_vma, exp_get_fill,
exp_get_abs_int): Add tree arg for %S in error messages. Don't
fudge lineno.
(exp_binop, exp_unop, exp_nameop, exp_assop, exp_assert): Copy
type.filename from sub-tree.
(exp_trinop): Likewise, and use "cond" rather than "lhs".
* ldexp.h (node_type): Add filename field to struct.
* ldfile.c (ldfile_input_filename): Delete. Remove all refs.
* ldfile.h (ldfile_input_filename): Delete.
* ldgram.y (phdr_type, phdr_qualifiers, yyerror): Add NULL arg for
%S in error messages.
* ldemul.c (syslib_default, hll_default): Likewise.
* ldlang.c (lang_memory_region_lookup, lang_memory_region_alias,
lang_get_regions, lang_new_phdr): Likewise.
(lang_size_sections_1): Pass addr_tree for %S.
* ldlex.h (lex_redirect): Update prototype.
(ldlex_filename): Declare.
* ldlex.l (<EOF>): Don't set ldfile_input_filename.
(lex_redirect): Add fake_filename and count params. Push
fake_filename to file_name_stack and init lineno from count.
(ldlex_filename): New function.
(lex_warn_invalid): Use above.
* ldmain.c (main): Update lex_redirect call.
* ldmisc.c (vfinfo <%S>): Take file name and line number from
etree_type arg, or use current if arg is NULL.
* lexsup.c (parsing_defsym): Delete.
(parse_args <OPTION_DEFSYM>): Update lex_redirect call.
2012-02-17 22:09:57 +08:00
|
|
|
|
lex_redirect (const char *string, const char *fake_filename, unsigned int count)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
YY_BUFFER_STATE tmp;
|
|
|
|
|
|
|
|
|
|
yy_init = 0;
|
2003-06-28 13:28:54 +08:00
|
|
|
|
if (include_stack_ptr >= MAX_INCLUDE_DEPTH)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2017-10-11 12:18:45 +08:00
|
|
|
|
einfo (_("%F: macros nested too deeply\n"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
PR ld/13343
* ld.h (parsing_defsym): Delete.
* ldexp.c (exp_intop, exp_bigintop, exp_relop): Set type.filename.
(fold_binary, fold_name, exp_fold_tree_1, exp_get_vma, exp_get_fill,
exp_get_abs_int): Add tree arg for %S in error messages. Don't
fudge lineno.
(exp_binop, exp_unop, exp_nameop, exp_assop, exp_assert): Copy
type.filename from sub-tree.
(exp_trinop): Likewise, and use "cond" rather than "lhs".
* ldexp.h (node_type): Add filename field to struct.
* ldfile.c (ldfile_input_filename): Delete. Remove all refs.
* ldfile.h (ldfile_input_filename): Delete.
* ldgram.y (phdr_type, phdr_qualifiers, yyerror): Add NULL arg for
%S in error messages.
* ldemul.c (syslib_default, hll_default): Likewise.
* ldlang.c (lang_memory_region_lookup, lang_memory_region_alias,
lang_get_regions, lang_new_phdr): Likewise.
(lang_size_sections_1): Pass addr_tree for %S.
* ldlex.h (lex_redirect): Update prototype.
(ldlex_filename): Declare.
* ldlex.l (<EOF>): Don't set ldfile_input_filename.
(lex_redirect): Add fake_filename and count params. Push
fake_filename to file_name_stack and init lineno from count.
(ldlex_filename): New function.
(lex_warn_invalid): Use above.
* ldmain.c (main): Update lex_redirect call.
* ldmisc.c (vfinfo <%S>): Take file name and line number from
etree_type arg, or use current if arg is NULL.
* lexsup.c (parsing_defsym): Delete.
(parse_args <OPTION_DEFSYM>): Update lex_redirect call.
2012-02-17 22:09:57 +08:00
|
|
|
|
file_name_stack[include_stack_ptr] = fake_filename;
|
2001-10-20 21:49:00 +08:00
|
|
|
|
lineno_stack[include_stack_ptr] = lineno;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
include_stack[include_stack_ptr] = YY_CURRENT_BUFFER;
|
|
|
|
|
include_stack_ptr++;
|
PR ld/13343
* ld.h (parsing_defsym): Delete.
* ldexp.c (exp_intop, exp_bigintop, exp_relop): Set type.filename.
(fold_binary, fold_name, exp_fold_tree_1, exp_get_vma, exp_get_fill,
exp_get_abs_int): Add tree arg for %S in error messages. Don't
fudge lineno.
(exp_binop, exp_unop, exp_nameop, exp_assop, exp_assert): Copy
type.filename from sub-tree.
(exp_trinop): Likewise, and use "cond" rather than "lhs".
* ldexp.h (node_type): Add filename field to struct.
* ldfile.c (ldfile_input_filename): Delete. Remove all refs.
* ldfile.h (ldfile_input_filename): Delete.
* ldgram.y (phdr_type, phdr_qualifiers, yyerror): Add NULL arg for
%S in error messages.
* ldemul.c (syslib_default, hll_default): Likewise.
* ldlang.c (lang_memory_region_lookup, lang_memory_region_alias,
lang_get_regions, lang_new_phdr): Likewise.
(lang_size_sections_1): Pass addr_tree for %S.
* ldlex.h (lex_redirect): Update prototype.
(ldlex_filename): Declare.
* ldlex.l (<EOF>): Don't set ldfile_input_filename.
(lex_redirect): Add fake_filename and count params. Push
fake_filename to file_name_stack and init lineno from count.
(ldlex_filename): New function.
(lex_warn_invalid): Use above.
* ldmain.c (main): Update lex_redirect call.
* ldmisc.c (vfinfo <%S>): Take file name and line number from
etree_type arg, or use current if arg is NULL.
* lexsup.c (parsing_defsym): Delete.
(parse_args <OPTION_DEFSYM>): Update lex_redirect call.
2012-02-17 22:09:57 +08:00
|
|
|
|
lineno = count;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
tmp = yy_create_string_buffer (string, strlen (string));
|
|
|
|
|
yy_switch_to_buffer (tmp);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Functions to switch to a different flex start condition,
|
|
|
|
|
saving the current start condition on `state_stack'. */
|
|
|
|
|
|
|
|
|
|
static int state_stack[MAX_INCLUDE_DEPTH * 2];
|
|
|
|
|
static int *state_stack_p = state_stack;
|
|
|
|
|
|
|
|
|
|
void
|
2003-06-28 13:28:54 +08:00
|
|
|
|
ldlex_script (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
*(state_stack_p)++ = yy_start;
|
|
|
|
|
BEGIN (SCRIPT);
|
|
|
|
|
}
|
|
|
|
|
|
Allow unquoted = as the first character in ldscript input_list names
* ldlex.l (INPUTLIST): New start condition.
(comment pattern, ",", "(", ")", "AS_NEEDED")
({FILENAMECHAR1}{FILENAMECHAR}*, "-l"{FILENAMECHAR}+)
(quoted string pattern, whitespace pattern): Add INPUTLIST to
valid start conditions.
(<INPUTLIST>"="{FILENAMECHAR1}{FILENAMECHAR}*): New NAME rule.
(ldlex_inputlist): New start-condition-setter function.
* ldgram.y (input_list1): Rename from input_list. All recursive
use changed.
(input_list): New wrapper rule for input_list1, setting
INPUTLIST lexer state for the duration of parsing input_list1.
All this to say INPUT(=/path/to/file) and not be forced to use
INPUT("=/path/to/file") whenever there's a need to force a sysroot-
prefix. Still, IMHO it seems better to make use of a previously
invalid syntax and not only change the meaning of quoted =-prefixed
paths (though arguably that's not very useful before this patchset).
This got a little bit hairier than I'd expected: I had to add a new
lexer state (aka. start condition) to avoid a first "=" being lexed as
the token "=", despite that not making sense in constructs expecting
file-names in the first place. (The grammar doesn't allow for
expressions in any part of those lists.) I guess I *could* have made
it work using that token anyway, but I didn't like the idea that you
would be able to separate the "=" from the rest of the file-name with
whitespace.
2014-10-15 09:10:25 +08:00
|
|
|
|
void
|
|
|
|
|
ldlex_inputlist (void)
|
|
|
|
|
{
|
|
|
|
|
*(state_stack_p)++ = yy_start;
|
|
|
|
|
BEGIN (INPUTLIST);
|
|
|
|
|
}
|
|
|
|
|
|
1999-05-03 15:29:11 +08:00
|
|
|
|
void
|
2003-06-28 13:28:54 +08:00
|
|
|
|
ldlex_mri_script (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
*(state_stack_p)++ = yy_start;
|
|
|
|
|
BEGIN (MRI);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2003-06-28 13:28:54 +08:00
|
|
|
|
ldlex_version_script (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
*(state_stack_p)++ = yy_start;
|
|
|
|
|
BEGIN (VERS_START);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2003-06-28 13:28:54 +08:00
|
|
|
|
ldlex_version_file (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
*(state_stack_p)++ = yy_start;
|
|
|
|
|
BEGIN (VERS_SCRIPT);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2003-06-28 13:28:54 +08:00
|
|
|
|
ldlex_expression (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
*(state_stack_p)++ = yy_start;
|
|
|
|
|
BEGIN (EXPRESSION);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
ldlex_wild (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
*(state_stack_p)++ = yy_start;
|
PR28217, Syntax error when memory region contains a hyphen
The saga of commit 40726f16a8d7 continues. This attacks the problem
of switching between SCRIPT and EXPRESSION state lexing by removing
the need to do so for phdrs like ":text". Instead {WILDCHAR}*
matching, the reason why ":text" lexed as one token, is restricted to
within the braces of a section or overlay statement. The new WILD
lexer state is switched at the non-optional brace tokens, so
ldlex_backup is no longer needed. I've also removed the BOTH state,
which doesn't seem to be needed any more. Besides rules involving
error reporting, there was just one place where SCRIPT appeared
without BOTH, the {WILDCHAR}* rule, three where BOTH appears without
SCRIPT for tokens that only need EXPRESSION state, and two where BOTH
appears alongside INPUT_LIST. (Since I'm editing the wild and
filename rules, removing BOTH and adding WILD can also be seen as
renaming the old BOTH state to SCRIPT and renaming the old SCRIPT
state to WILD with a reduced scope.)
As a followup, I'll look at removing EXPRESSION state from some lexer
rules that no longer need it due to this cleanup.
PR 28217
* ldgram.y (exp <ORIGIN, LENGTH>): Use paren_script_name.
(section): Parse within braces of section in wild mode, and
after brace back in script mode. Remove ldlex_backup call.
Similarly for OVERLAY.
(overlay_section): Similarly.
(script_file): Replace ldlex_both with ldlex_script.
* ldlex.h (ldlex_wild): Declare.
(ldlex_both): Delete.
* ldlex.l (BOTH): Delete. Remove state from all rules.
(WILD): New state. Enable many tokens in this state.
Enable filename match in SCRIPT mode. Enable WILDCHAR match
in WILD state, disable in SCRIPT mode.
(ldlex_wild): New function.
* ldfile.c (ldfile_try_open_bfd): Replace ldlex_both call with
ldlex_script.
2021-08-13 10:20:16 +08:00
|
|
|
|
BEGIN (WILD);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2003-06-28 13:28:54 +08:00
|
|
|
|
ldlex_popstate (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
yy_start = *(--state_stack_p);
|
|
|
|
|
}
|
PR ld/13343
* ld.h (parsing_defsym): Delete.
* ldexp.c (exp_intop, exp_bigintop, exp_relop): Set type.filename.
(fold_binary, fold_name, exp_fold_tree_1, exp_get_vma, exp_get_fill,
exp_get_abs_int): Add tree arg for %S in error messages. Don't
fudge lineno.
(exp_binop, exp_unop, exp_nameop, exp_assop, exp_assert): Copy
type.filename from sub-tree.
(exp_trinop): Likewise, and use "cond" rather than "lhs".
* ldexp.h (node_type): Add filename field to struct.
* ldfile.c (ldfile_input_filename): Delete. Remove all refs.
* ldfile.h (ldfile_input_filename): Delete.
* ldgram.y (phdr_type, phdr_qualifiers, yyerror): Add NULL arg for
%S in error messages.
* ldemul.c (syslib_default, hll_default): Likewise.
* ldlang.c (lang_memory_region_lookup, lang_memory_region_alias,
lang_get_regions, lang_new_phdr): Likewise.
(lang_size_sections_1): Pass addr_tree for %S.
* ldlex.h (lex_redirect): Update prototype.
(ldlex_filename): Declare.
* ldlex.l (<EOF>): Don't set ldfile_input_filename.
(lex_redirect): Add fake_filename and count params. Push
fake_filename to file_name_stack and init lineno from count.
(ldlex_filename): New function.
(lex_warn_invalid): Use above.
* ldmain.c (main): Update lex_redirect call.
* ldmisc.c (vfinfo <%S>): Take file name and line number from
etree_type arg, or use current if arg is NULL.
* lexsup.c (parsing_defsym): Delete.
(parse_args <OPTION_DEFSYM>): Update lex_redirect call.
2012-02-17 22:09:57 +08:00
|
|
|
|
|
2021-02-01 06:45:41 +08:00
|
|
|
|
/* In cases where the parser needs to look ahead and the context
|
|
|
|
|
changes from expression to script or vice-versa, throw away a
|
|
|
|
|
NAME. What constitutes a NAME depends on context. */
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
ldlex_backup (void)
|
|
|
|
|
{
|
|
|
|
|
yyless (0);
|
|
|
|
|
}
|
|
|
|
|
|
PR ld/13343
* ld.h (parsing_defsym): Delete.
* ldexp.c (exp_intop, exp_bigintop, exp_relop): Set type.filename.
(fold_binary, fold_name, exp_fold_tree_1, exp_get_vma, exp_get_fill,
exp_get_abs_int): Add tree arg for %S in error messages. Don't
fudge lineno.
(exp_binop, exp_unop, exp_nameop, exp_assop, exp_assert): Copy
type.filename from sub-tree.
(exp_trinop): Likewise, and use "cond" rather than "lhs".
* ldexp.h (node_type): Add filename field to struct.
* ldfile.c (ldfile_input_filename): Delete. Remove all refs.
* ldfile.h (ldfile_input_filename): Delete.
* ldgram.y (phdr_type, phdr_qualifiers, yyerror): Add NULL arg for
%S in error messages.
* ldemul.c (syslib_default, hll_default): Likewise.
* ldlang.c (lang_memory_region_lookup, lang_memory_region_alias,
lang_get_regions, lang_new_phdr): Likewise.
(lang_size_sections_1): Pass addr_tree for %S.
* ldlex.h (lex_redirect): Update prototype.
(ldlex_filename): Declare.
* ldlex.l (<EOF>): Don't set ldfile_input_filename.
(lex_redirect): Add fake_filename and count params. Push
fake_filename to file_name_stack and init lineno from count.
(ldlex_filename): New function.
(lex_warn_invalid): Use above.
* ldmain.c (main): Update lex_redirect call.
* ldmisc.c (vfinfo <%S>): Take file name and line number from
etree_type arg, or use current if arg is NULL.
* lexsup.c (parsing_defsym): Delete.
(parse_args <OPTION_DEFSYM>): Update lex_redirect call.
2012-02-17 22:09:57 +08:00
|
|
|
|
/* Return the current file name, or the previous file if no file is
|
|
|
|
|
current. */
|
|
|
|
|
|
|
|
|
|
const char*
|
|
|
|
|
ldlex_filename (void)
|
|
|
|
|
{
|
|
|
|
|
return file_name_stack[include_stack_ptr - (include_stack_ptr != 0)];
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
|
|
|
|
|
2009-10-14 18:54:27 +08:00
|
|
|
|
/* Place up to MAX_SIZE characters in BUF and return
|
1999-05-03 15:29:11 +08:00
|
|
|
|
either the number of characters read, or 0 to indicate EOF. */
|
|
|
|
|
|
2009-10-14 18:54:27 +08:00
|
|
|
|
static int
|
|
|
|
|
yy_input (char *buf, int max_size)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2009-10-14 18:54:27 +08:00
|
|
|
|
int result = 0;
|
2003-04-15 22:50:29 +08:00
|
|
|
|
if (YY_CURRENT_BUFFER->yy_input_file)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
if (yyin)
|
|
|
|
|
{
|
2009-10-14 18:54:27 +08:00
|
|
|
|
result = fread (buf, 1, max_size, yyin);
|
|
|
|
|
if (result < max_size && ferror (yyin))
|
2017-10-11 12:18:45 +08:00
|
|
|
|
einfo (_("%F%P: read in flex scanner failed\n"));
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
2009-10-14 18:54:27 +08:00
|
|
|
|
return result;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Eat the rest of a C-style comment. */
|
|
|
|
|
|
|
|
|
|
static void
|
2003-06-28 13:28:54 +08:00
|
|
|
|
comment (void)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
int c;
|
|
|
|
|
|
|
|
|
|
while (1)
|
|
|
|
|
{
|
|
|
|
|
c = input();
|
2019-07-20 09:17:20 +08:00
|
|
|
|
while (c != '*' && c != 0)
|
2017-10-11 12:18:45 +08:00
|
|
|
|
{
|
|
|
|
|
if (c == '\n')
|
|
|
|
|
lineno++;
|
|
|
|
|
c = input();
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2017-10-11 12:18:45 +08:00
|
|
|
|
if (c == '*')
|
|
|
|
|
{
|
|
|
|
|
c = input();
|
|
|
|
|
while (c == '*')
|
|
|
|
|
c = input();
|
|
|
|
|
if (c == '/')
|
|
|
|
|
break; /* found the end */
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2017-10-11 12:18:45 +08:00
|
|
|
|
if (c == '\n')
|
|
|
|
|
lineno++;
|
1999-05-03 15:29:11 +08:00
|
|
|
|
|
2019-07-20 09:17:20 +08:00
|
|
|
|
if (c == 0)
|
2017-10-11 12:18:45 +08:00
|
|
|
|
{
|
|
|
|
|
einfo (_("%F%P: EOF in comment\n"));
|
|
|
|
|
break;
|
|
|
|
|
}
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Warn the user about a garbage character WHAT in the input
|
|
|
|
|
in context WHERE. */
|
|
|
|
|
|
|
|
|
|
static void
|
2003-06-28 13:28:54 +08:00
|
|
|
|
lex_warn_invalid (char *where, char *what)
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
|
|
|
|
char buf[5];
|
|
|
|
|
|
|
|
|
|
/* If we have found an input file whose format we do not recognize,
|
|
|
|
|
and we are therefore treating it as a linker script, and we find
|
|
|
|
|
an invalid character, then most likely this is a real object file
|
|
|
|
|
of some different format. Treat it as such. */
|
|
|
|
|
if (ldfile_assumed_script)
|
|
|
|
|
{
|
|
|
|
|
bfd_set_error (bfd_error_file_not_recognized);
|
2017-10-11 12:18:45 +08:00
|
|
|
|
einfo (_("%F%s: file not recognized: %E\n"), ldlex_filename ());
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|
|
|
|
|
|
2001-09-19 13:33:36 +08:00
|
|
|
|
if (! ISPRINT (*what))
|
1999-05-03 15:29:11 +08:00
|
|
|
|
{
|
2011-03-29 10:52:36 +08:00
|
|
|
|
sprintf (buf, "\\%03o", *(unsigned char *) what);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
what = buf;
|
|
|
|
|
}
|
|
|
|
|
|
Use %pI, %pR, %pS, %pT in place of %I, %R, %S and %T.
bfd/
* elf32-arm.c, * elf32-hppa.c, * elf32-lm32.c, * elf32-m32r.c,
* elf32-metag.c, * elf32-nds32.c, * elf32-or1k.c, * elf32-ppc.c,
* elf32-s390.c, * elf32-sh.c, * elf32-tic6x.c, * elf32-tilepro.c,
* elf64-ppc.c, * elf64-s390.c, * elflink.c, * elfnn-aarch64.c,
* elfnn-riscv.c, * elfxx-sparc.c, * elfxx-tilegx.c, * elfxx-x86.c,
* reloc.c: Replace use of %R and %T in format strings passed to
einfo and friends by %pR and %pT.
ld/
* ldmisc.c (vfinfo) Handle %pI, %pR, %pS and %pT in place of
%I, %R, %S and %T.
* ldcref.c, * ldctor.c, * ldemul.c, * ldexp.c, * ldgram.y,
* ldlang.c, * ldlex.l, * ldmain.c, * ldmisc.c, * pe-dll.c,
* emultempl/sh64elf.em: Replace use of of %I, %R, %S and %T in
format strings passed to einfo and friends by %pI, %pR, %pS and %pT.
2018-02-19 16:00:41 +08:00
|
|
|
|
einfo (_("%P:%pS: ignoring invalid character `%s'%s\n"), NULL, what, where);
|
1999-05-03 15:29:11 +08:00
|
|
|
|
}
|