[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/14] disas/nanomips: Split out read_u16
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 12/14] disas/nanomips: Split out read_u16 |
Date: |
Tue, 8 Nov 2022 00:58:20 +0100 |
From: Richard Henderson <richard.henderson@linaro.org>
Split out a helper function for reading a uint16_t
with the correct endianness.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221106023735.5277-4-richard.henderson@linaro.org>
---
disas/nanomips.c | 48 +++++++++++++++++++-----------------------------
1 file changed, 19 insertions(+), 29 deletions(-)
diff --git a/disas/nanomips.c b/disas/nanomips.c
index e462256760..3b998118e3 100644
--- a/disas/nanomips.c
+++ b/disas/nanomips.c
@@ -21918,10 +21918,24 @@ static bool nanomips_dis(const uint16_t *data, char
**buf, Dis_info *info)
return Disassemble(data, buf, &type, MAJOR, ARRAY_SIZE(MAJOR), info) >= 0;
}
+static bool read_u16(uint16_t *ret, bfd_vma memaddr,
+ struct disassemble_info *info)
+{
+ int status = (*info->read_memory_func)(memaddr, (bfd_byte *)ret, 2, info);
+ if (status != 0) {
+ (*info->memory_error_func)(status, memaddr, info);
+ return false;
+ }
+
+ if ((info->endian == BFD_ENDIAN_BIG) != HOST_BIG_ENDIAN) {
+ bswap16s(ret);
+ }
+ return true;
+}
+
int print_insn_nanomips(bfd_vma memaddr, struct disassemble_info *info)
{
- int status, length;
- bfd_byte buffer[2];
+ int length;
uint16_t words[3] = { };
g_autofree char *buf = NULL;
@@ -21939,48 +21953,24 @@ int print_insn_nanomips(bfd_vma memaddr, struct
disassemble_info *info)
disassm_info.fprintf_func = info->fprintf_func;
disassm_info.stream = info->stream;
- status = (*info->read_memory_func)(memaddr, buffer, 2, info);
- if (status != 0) {
- (*info->memory_error_func)(status, memaddr, info);
+ if (!read_u16(&words[0], memaddr, info)) {
return -1;
}
-
- if (info->endian == BFD_ENDIAN_BIG) {
- words[0] = bfd_getb16(buffer);
- } else {
- words[0] = bfd_getl16(buffer);
- }
length = 2;
/* Handle 32-bit opcodes. */
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);
+ if (!read_u16(&words[1], memaddr + 2, info)) {
return -1;
}
-
- if (info->endian == BFD_ENDIAN_BIG) {
- words[1] = bfd_getb16(buffer);
- } else {
- words[1] = bfd_getl16(buffer);
- }
length = 4;
}
/* Handle 48-bit opcodes. */
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);
+ if (!read_u16(&words[1], memaddr + 4, info)) {
return -1;
}
-
- if (info->endian == BFD_ENDIAN_BIG) {
- words[2] = bfd_getb16(buffer);
- } else {
- words[2] = bfd_getl16(buffer);
- }
length = 6;
}
--
2.38.1
- [PULL 01/14] target/mips: Set CP0St_{KX, SX, UX} for Loongson-2F, (continued)
- [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é, 2022/11/07
- [PULL 12/14] disas/nanomips: Split out read_u16,
Philippe Mathieu-Daudé <=
- [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