From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: balaton@eik.bme.hu, philmd@linaro.org, sw@weilnetz.de
Subject: [PATCH v2 2/6] disas/nanomips: Merge insn{1,2,3} into words[3]
Date: Mon, 7 Nov 2022 08:28:48 +1100 [thread overview]
Message-ID: <20221106212852.152384-3-richard.henderson@linaro.org> (raw)
In-Reply-To: <20221106212852.152384-1-richard.henderson@linaro.org>
Since Disassemble wants the data in this format, collect
it that way. This allows using a loop to print the bytes.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
disas/nanomips.c | 44 +++++++++++++++++++++-----------------------
1 file changed, 21 insertions(+), 23 deletions(-)
diff --git a/disas/nanomips.c b/disas/nanomips.c
index ea3e9202ac..1645d6d7aa 100644
--- a/disas/nanomips.c
+++ b/disas/nanomips.c
@@ -21905,26 +21905,22 @@ static const Pool MAJOR[2] = {
0x0 }, /* P16 */
};
-static bool nanomips_dis(char **buf, Dis_info *info,
- unsigned short one,
- unsigned short two,
- unsigned short three)
+static bool nanomips_dis(const uint16_t *data, char **buf, Dis_info *info)
{
- uint16 bits[3] = {one, two, three};
TABLE_ENTRY_TYPE type;
/* Handle runtime errors. */
if (unlikely(sigsetjmp(info->buf, 0) != 0)) {
return false;
}
- return Disassemble(bits, buf, &type, MAJOR, ARRAY_SIZE(MAJOR), info) >= 0;
+ return Disassemble(data, buf, &type, MAJOR, ARRAY_SIZE(MAJOR), info) >= 0;
}
int print_insn_nanomips(bfd_vma memaddr, struct disassemble_info *info)
{
int status, length;
bfd_byte buffer[2];
- uint16_t insn1 = 0, insn2 = 0, insn3 = 0;
+ uint16_t words[3] = { };
g_autofree char *buf = NULL;
info->bytes_per_chunk = 2;
@@ -21948,15 +21944,14 @@ int print_insn_nanomips(bfd_vma memaddr, struct disassemble_info *info)
}
if (info->endian == BFD_ENDIAN_BIG) {
- insn1 = bfd_getb16(buffer);
+ words[0] = bfd_getb16(buffer);
} else {
- insn1 = bfd_getl16(buffer);
+ words[0] = bfd_getl16(buffer);
}
length = 2;
- (*info->fprintf_func)(info->stream, "%04x ", insn1);
/* Handle 32-bit opcodes. */
- if ((insn1 & 0x1000) == 0) {
+ if ((words[0] & 0x1000) == 0) {
status = (*info->read_memory_func)(memaddr + 2, buffer, 2, info);
if (status != 0) {
(*info->memory_error_func)(status, memaddr + 2, info);
@@ -21964,17 +21959,15 @@ int print_insn_nanomips(bfd_vma memaddr, struct disassemble_info *info)
}
if (info->endian == BFD_ENDIAN_BIG) {
- insn2 = bfd_getb16(buffer);
+ words[1] = bfd_getb16(buffer);
} else {
- insn2 = bfd_getl16(buffer);
+ words[1] = bfd_getl16(buffer);
}
length = 4;
- (*info->fprintf_func)(info->stream, "%04x ", insn2);
- } else {
- (*info->fprintf_func)(info->stream, " ");
}
+
/* Handle 48-bit opcodes. */
- if ((insn1 >> 10) == 0x18) {
+ if ((words[0] >> 10) == 0x18) {
status = (*info->read_memory_func)(memaddr + 4, buffer, 2, info);
if (status != 0) {
(*info->memory_error_func)(status, memaddr + 4, info);
@@ -21982,17 +21975,22 @@ int print_insn_nanomips(bfd_vma memaddr, struct disassemble_info *info)
}
if (info->endian == BFD_ENDIAN_BIG) {
- insn3 = bfd_getb16(buffer);
+ words[2] = bfd_getb16(buffer);
} else {
- insn3 = bfd_getl16(buffer);
+ words[2] = bfd_getl16(buffer);
}
length = 6;
- (*info->fprintf_func)(info->stream, "%04x ", insn3);
- } else {
- (*info->fprintf_func)(info->stream, " ");
}
- if (nanomips_dis(&buf, &disassm_info, insn1, insn2, insn3)) {
+ for (int i = 0; i < ARRAY_SIZE(words); i++) {
+ if (i * 2 < length) {
+ (*info->fprintf_func)(info->stream, "%04x ", words[i]);
+ } else {
+ (*info->fprintf_func)(info->stream, " ");
+ }
+ }
+
+ if (nanomips_dis(words, &buf, &disassm_info)) {
(*info->fprintf_func) (info->stream, "%s", buf);
}
--
2.34.1
next prev parent reply other threads:[~2022-11-06 21:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-06 21:28 [PATCH v2 0/6] Two -Wclobbered fixes, plus other cleanup Richard Henderson
2022-11-06 21:28 ` [PATCH v2 1/6] disas/nanomips: Move setjmp into nanomips_dis Richard Henderson
2022-11-06 21:28 ` Richard Henderson [this message]
2022-11-06 21:28 ` [PATCH v2 3/6] disas/nanomips: Split out read_u16 Richard Henderson
2022-11-06 21:28 ` [PATCH v2 4/6] disas/nanomips: Tidy read for 48-bit opcodes Richard Henderson
2022-11-06 21:28 ` [PATCH v2 5/6] tcg: Move TCG_TARGET_HAS_direct_jump init to tb_gen_code Richard Henderson
2022-11-06 21:28 ` [PATCH v2 6/6] accel/tcg: Split out setjmp_gen_code Richard Henderson
2022-11-07 10:30 ` [PATCH v2 0/6] Two -Wclobbered fixes, plus other cleanup Philippe Mathieu-Daudé
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=20221106212852.152384-3-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=balaton@eik.bme.hu \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.