From: Jan Beulich <jbeulich@suse.com>
To: Binutils <binutils@sourceware.org>
Cc: Alan Modra <amodra@gmail.com>
Subject: [PATCH] gas: improve interaction between read_a_source_file() and s_linefile()
Date: Mon, 13 Feb 2023 09:15:36 +0100 [thread overview]
Message-ID: <08d262e3-c736-85ff-c45e-db96e55cff4c@suse.com> (raw)
read_a_source_file() would bump line numbers only when seeing a newline,
whereas is_end_of_line[] indicates further end-of-line characters, in
particular the nul character. s_linefile() attempts to compensate for
the bump, but was too aggressive with this so far: It should only adjust
when a newline ends the line. To facilitate such a check, the check for
nothing else on the line needs to move ahead, which luckily is easily
possible: The relevant two conditions match, and the function can
simply return from the body of that earlier instance of the conditional.
The more strict treatment in s_linefile() then requires an adjustment
to buffer_and_nest()'s invocation of the function: The line terminator
now needs to be a newline, not nul.
--- a/gas/macro.c
+++ b/gas/macro.c
@@ -265,7 +265,7 @@ buffer_and_nest (const char *from, const
{
char saved_eol_char = ptr->ptr[ptr->len];
- ptr->ptr[ptr->len] = '\0';
+ ptr->ptr[ptr->len] = '\n';
temp_ilp (ptr->ptr + i + 8);
s_linefile (0);
restore_ilp ();
--- a/gas/read.c
+++ b/gas/read.c
@@ -2047,18 +2047,22 @@ s_linefile (int ignore ATTRIBUTE_UNUSED)
if (file || flags)
{
- linenum--;
+ demand_empty_rest_of_line ();
+
+ /* read_a_source_file() will bump the line number only if the line
+ is terminated by '\n'. */
+ if (input_line_pointer[-1] == '\n')
+ linenum--;
+
new_logical_line_flags (file, linenum, flags);
#ifdef LISTING
if (listing)
listing_source_line (linenum);
#endif
+ return;
}
}
- if (file || flags)
- demand_empty_rest_of_line ();
- else
- ignore_rest_of_line ();
+ ignore_rest_of_line ();
}
/* Handle the .end pseudo-op. Actually, the real work is done in
next reply other threads:[~2023-02-13 8:15 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 8:15 Jan Beulich [this message]
2023-02-13 10:31 ` Alan Modra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=08d262e3-c736-85ff-c45e-db96e55cff4c@suse.com \
--to=jbeulich@suse.com \
--cc=amodra@gmail.com \
--cc=binutils@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).