aboutsummaryrefslogtreecommitdiff
path: root/disas
diff options
context:
space:
mode:
authorRichard Henderson <richard.henderson@linaro.org>2022-11-06 13:37:32 +1100
committerPhilippe Mathieu-Daudé <philmd@linaro.org>2022-11-08 01:04:25 +0100
commit1414e3f5657a9f0c66495eb347ffd00df7978b4c (patch)
tree8d70cc9ccb68480b14dabacc1cb89c5f3df9c5ae /disas
parentad120616edfe405e283a924fa3302b78605616d6 (diff)
disas/nanomips: Split out read_u16
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>
Diffstat (limited to 'disas')
-rw-r--r--disas/nanomips.c48
1 files 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;
}