[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/14] disas/nanomips: Merge insn{1,2,3} into words[3]
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 11/14] disas/nanomips: Merge insn{1,2,3} into words[3] |
Date: |
Tue, 8 Nov 2022 00:58:19 +0100 |
From: Richard Henderson <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>
Message-Id: <20221106212852.152384-3-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 83a39a878c..e462256760 100644
--- a/disas/nanomips.c
+++ b/disas/nanomips.c
@@ -21907,26 +21907,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;
@@ -21950,15 +21946,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);
@@ -21966,17 +21961,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);
@@ -21984,17 +21977,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.38.1
- [PULL 02/14] target/mips: Cast offset field of Octeon BBIT to int16_t, (continued)
- [PULL 02/14] target/mips: Cast offset field of Octeon BBIT to int16_t, Philippe Mathieu-Daudé, 2022/11/07
- [PULL 01/14] target/mips: Set CP0St_{KX, SX, UX} for Loongson-2F, Philippe Mathieu-Daudé, 2022/11/07
- [PULL 03/14] target/mips: Enable LBX/LWX/* instructions for Octeon, Philippe Mathieu-Daudé, 2022/11/07
- [PULL 04/14] target/mips: Disable DSP ASE for Octeon68XX, Philippe Mathieu-Daudé, 2022/11/07
- [PULL 05/14] target/mips: Don't check COP1X for 64 bit FP mode, Philippe Mathieu-Daudé, 2022/11/07
- [PULL 06/14] disas/nanomips: Fix invalid PRId64 format calling img_format(), Philippe Mathieu-Daudé, 2022/11/07
- [PULL 07/14] disas/nanomips: Fix invalid PRIx64 format calling img_format(), Philippe Mathieu-Daudé, 2022/11/07
- [PULL 08/14] disas/nanomips: Use G_GNUC_PRINTF to avoid invalid string formats, Philippe Mathieu-Daudé, 2022/11/07
- [PULL 09/14] disas/nanomips: Remove headers already included by "qemu/osdep.h", Philippe Mathieu-Daudé, 2022/11/07
- [PULL 10/14] disas/nanomips: Move setjmp into nanomips_dis, Philippe Mathieu-Daudé, 2022/11/07
- [PULL 11/14] disas/nanomips: Merge insn{1,2,3} into words[3],
Philippe Mathieu-Daudé <=
- [PULL 12/14] disas/nanomips: Split out read_u16, Philippe Mathieu-Daudé, 2022/11/07
- [PULL 13/14] disas/nanomips: Tidy read for 48-bit opcodes, Philippe Mathieu-Daudé, 2022/11/07
- [PULL 14/14] MAINTAINERS: Inherit from nanoMIPS, Philippe Mathieu-Daudé, 2022/11/07
- Re: [PULL 00/14] MIPS patches for 2022-11-08, Stefan Hajnoczi, 2022/11/08