OSDN Git Service

disas/nanomips: Tidy read for 48-bit opcodes
authorRichard Henderson <richard.henderson@linaro.org>
Sun, 6 Nov 2022 02:37:33 +0000 (13:37 +1100)
committerPhilippe Mathieu-Daudé <philmd@linaro.org>
Tue, 8 Nov 2022 00:04:25 +0000 (01:04 +0100)
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

index 3b99811..a025359 100644 (file)
@@ -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++) {