[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/14] disas/nanomips: Tidy read for 48-bit opcodes
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 13/14] disas/nanomips: Tidy read for 48-bit opcodes |
Date: |
Tue, 8 Nov 2022 00:58:21 +0100 |
From: Richard Henderson <richard.henderson@linaro.org>
There is no point in looking for a 48-bit opcode if we've
not read the second word for a 32-bit opcode.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221106023735.5277-5-richard.henderson@linaro.org>
---
disas/nanomips.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/disas/nanomips.c b/disas/nanomips.c
index 3b998118e3..a0253598dd 100644
--- a/disas/nanomips.c
+++ b/disas/nanomips.c
@@ -21964,14 +21964,14 @@ int print_insn_nanomips(bfd_vma memaddr, struct
disassemble_info *info)
return -1;
}
length = 4;
- }
- /* Handle 48-bit opcodes. */
- if ((words[0] >> 10) == 0x18) {
- if (!read_u16(&words[1], memaddr + 4, info)) {
- return -1;
+ /* Handle 48-bit opcodes. */
+ if ((words[0] >> 10) == 0x18) {
+ if (!read_u16(&words[1], memaddr + 4, info)) {
+ return -1;
+ }
+ length = 6;
}
- length = 6;
}
for (int i = 0; i < ARRAY_SIZE(words); i++) {
--
2.38.1
- [PULL 03/14] target/mips: Enable LBX/LWX/* instructions for Octeon, (continued)
- [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é, 2022/11/07
- [PULL 13/14] disas/nanomips: Tidy read for 48-bit opcodes,
Philippe Mathieu-Daudé <=
- [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