From: binutils@emagii.com
To: binutils@sourceware.org
Cc: nickc@redhat.com, Ulf Samuelsson <binutils@emagii.com>
Subject: [PATCH v2 5/5] Use lang_add_data
Date: Mon, 13 Feb 2023 13:22:41 +0100 [thread overview]
Message-ID: <20230213122241.6144-6-binutils@emagii.com> (raw)
In-Reply-To: <20230213122241.6144-1-binutils@emagii.com>
From: Ulf Samuelsson <binutils@emagii.com>
Signed-off-by: Ulf Samuelsson <binutils@emagii.com>
---
ld/ldlang.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/ld/ldlang.c b/ld/ldlang.c
index 010e6e0fe22..b6d75fc446c 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -8363,7 +8363,6 @@ lang_add_data (int type, union etree_union *exp)
void
lang_add_string (bfd_vma size, char *s)
{
- lang_data_statement_type *new_stmt;
bfd_vma stringlen = strlen(s) + 1; /* Add one for terminating '\0' */
bfd_vma fill_len = 0;
int escape = 0;
@@ -8405,25 +8404,19 @@ lang_add_string (bfd_vma size, char *s)
} else {
/* whatever we have */
}
- new_stmt = new_stat (lang_data_statement, stat_ptr);
- new_stmt->exp = exp_intop(s[i]);
- new_stmt->type = BYTE;
+ lang_add_data (BYTE, exp_intop(s[i]));
escape = 0;
} else {
if (s[i] == '\\') {
escape = 1;
} else {
- new_stmt = new_stat (lang_data_statement, stat_ptr);
- new_stmt->exp = exp_intop(s[i]);
- new_stmt->type = BYTE;
+ lang_add_data (BYTE, exp_intop(s[i]));
}
}
}
/* Add byte expressions for filling to the end of the string */
for (bfd_vma i = 0 ; i < fill_len ; i++) {
- new_stmt = new_stat (lang_data_statement, stat_ptr);
- new_stmt->exp = exp_intop(0);
- new_stmt->type = BYTE;
+ lang_add_data (BYTE, exp_intop(s[i]));
}
}
--
2.17.1
prev parent reply other threads:[~2023-02-13 12:23 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 12:22 [PATCH v2 0/4] ASCIZ Command for output section binutils
2023-02-13 12:22 ` [PATCH v2 1/5] ldlex.l: Add ASCIZ token binutils
2023-02-13 12:22 ` [PATCH v2 2/5] ldgram.y: Add 'ASCIZ <string>' command binutils
2023-02-13 12:22 ` [PATCH v2 3/5] Parse ASCIZ command binutils
2023-02-13 12:29 ` Ulf Samuelsson
2023-02-13 12:22 ` [PATCH v2 4/5] Document the " binutils
2023-02-13 12:22 ` binutils [this message]
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=20230213122241.6144-6-binutils@emagii.com \
--to=binutils@emagii.com \
--cc=binutils@sourceware.org \
--cc=nickc@redhat.com \
/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).