[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RESEND PATCH 3/6] disas/nanomips: Split out read_u16
From: |
Richard Henderson |
Subject: |
[RESEND PATCH 3/6] disas/nanomips: Split out read_u16 |
Date: |
Sun, 6 Nov 2022 13:37:32 +1100 |
Split out a helper function for reading a uint16_t
with the correct endianness.
Signed-off-by: Richard Henderson <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 5438def9af..52c7537379 100644
--- a/disas/nanomips.c
+++ b/disas/nanomips.c
@@ -21919,10 +21919,24 @@ static bool nanomips_dis(char **buf, Dis_info *info,
uint16_t words[3])
return ret >= 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;
@@ -21940,48 +21954,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.34.1
- [RESEND PATCH 0/6] Two -Wclobbered fixes, plus other cleanup, Richard Henderson, 2022/11/05
- [RESEND PATCH 1/6] disas/nanomips: Move setjmp into nanomips_dis, Richard Henderson, 2022/11/05
- [RESEND PATCH 2/6] disas/nanomips: Merge insn{1,2,3} into words[3], Richard Henderson, 2022/11/05
- [RESEND PATCH 3/6] disas/nanomips: Split out read_u16,
Richard Henderson <=
- [RESEND PATCH 4/6] disas/nanomips: Tidy read for 48-bit opcodes, Richard Henderson, 2022/11/05
- [RESEND PATCH 5/6] tcg: Move TCG_TARGET_HAS_direct_jump init to tb_gen_code, Richard Henderson, 2022/11/05
- [RESEND PATCH 6/6] accel/tcg: Split out setjmp_gen_code, Richard Henderson, 2022/11/05