From: Andrew Burgess <aburgess@redhat.com>
To: binutils@sourceware.org
Cc: Andrew Burgess <aburgess@redhat.com>
Subject: [PATCH 1/2] opcodes/riscv: add styling support to print_reg_list
Date: Wed, 5 Jun 2024 13:21:40 +0100 [thread overview]
Message-ID: <7d81dac4693d176577d59a23b2348ebadcde8e3c.1717589992.git.aburgess@redhat.com> (raw)
In-Reply-To: <cover.1717589992.git.aburgess@redhat.com>
I noticed that some unstyled output had crept into the risc-v
disassembler in this commit:
commit 9132c8152b899a1683bc886f8ba76bedadb48aa1
Date: Tue Feb 27 11:48:11 2024 +0800
RISC-V: Support Zcmp push/pop instructions.
this commit adds styling support. The risc-v disassembler is now once
again, fully styled.
---
opcodes/riscv-dis.c | 51 ++++++++++++++++++++++++++++++++-------------
1 file changed, 37 insertions(+), 14 deletions(-)
diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c
index e6596c47423..d0d74c0a05a 100644
--- a/opcodes/riscv-dis.c
+++ b/opcodes/riscv-dis.c
@@ -223,26 +223,49 @@ print_reg_list (disassemble_info *info, insn_t l)
bool numeric = riscv_gpr_names == riscv_gpr_names_numeric;
unsigned reg_list = (int)EXTRACT_OPERAND (REG_LIST, l);
unsigned r_start = numeric ? X_S2 : X_S0;
- info->fprintf_func (info->stream, "%s", riscv_gpr_names[X_RA]);
+ info->fprintf_styled_func (info->stream, dis_style_register,
+ "%s", riscv_gpr_names[X_RA]);
if (reg_list == 5)
- info->fprintf_func (info->stream, ",%s",
- riscv_gpr_names[X_S0]);
+ {
+ info->fprintf_styled_func (info->stream, dis_style_text, ",");
+ info->fprintf_styled_func (info->stream, dis_style_register,
+ "%s", riscv_gpr_names[X_S0]);
+ }
else if (reg_list == 6 || (numeric && reg_list > 6))
- info->fprintf_func (info->stream, ",%s-%s",
- riscv_gpr_names[X_S0],
- riscv_gpr_names[X_S1]);
+ {
+ info->fprintf_styled_func (info->stream, dis_style_text, ",");
+ info->fprintf_styled_func (info->stream, dis_style_register,
+ "%s", riscv_gpr_names[X_S0]);
+ info->fprintf_styled_func (info->stream, dis_style_text, "-");
+ info->fprintf_styled_func (info->stream, dis_style_register,
+ "%s", riscv_gpr_names[X_S1]);
+ }
+
if (reg_list == 15)
- info->fprintf_func (info->stream, ",%s-%s",
- riscv_gpr_names[r_start],
- riscv_gpr_names[X_S11]);
+ {
+ info->fprintf_styled_func (info->stream, dis_style_text, ",");
+ info->fprintf_styled_func (info->stream, dis_style_register,
+ "%s", riscv_gpr_names[r_start]);
+ info->fprintf_styled_func (info->stream, dis_style_text, "-");
+ info->fprintf_styled_func (info->stream, dis_style_register,
+ "%s", riscv_gpr_names[X_S11]);
+ }
else if (reg_list == 7 && numeric)
- info->fprintf_func (info->stream, ",%s",
- riscv_gpr_names[X_S2]);
+ {
+ info->fprintf_styled_func (info->stream, dis_style_text, ",");
+ info->fprintf_styled_func (info->stream, dis_style_register,
+ "%s", riscv_gpr_names[X_S2]);
+ }
else if (reg_list > 6)
- info->fprintf_func (info->stream, ",%s-%s",
- riscv_gpr_names[r_start],
- riscv_gpr_names[reg_list + 11]);
+ {
+ info->fprintf_styled_func (info->stream, dis_style_text, ",");
+ info->fprintf_styled_func (info->stream, dis_style_register,
+ "%s", riscv_gpr_names[r_start]);
+ info->fprintf_styled_func (info->stream, dis_style_text, "-");
+ info->fprintf_styled_func (info->stream, dis_style_register,
+ "%s", riscv_gpr_names[reg_list + 11]);
+ }
}
/* Get Zcmp sp adjustment immediate. */
--
2.25.4
next prev parent reply other threads:[~2024-06-05 12:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-05 12:21 [PATCH 0/2] RISC-V styled disassembler output fixes Andrew Burgess
2024-06-05 12:21 ` Andrew Burgess [this message]
2024-06-05 12:21 ` [PATCH 2/2] opcodes/riscv: prevent future use of disassemble_info::fprintf_func Andrew Burgess
2024-06-06 1:01 ` [PATCH 0/2] RISC-V styled disassembler output fixes Nelson Chu
2024-06-06 9:35 ` Andrew Burgess
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=7d81dac4693d176577d59a23b2348ebadcde8e3c.1717589992.git.aburgess@redhat.com \
--to=aburgess@redhat.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).