]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
target/m68k: correctly disassemble move16
authorLaurent Vivier <laurent@vivier.eu>
Mon, 25 Jun 2018 20:35:59 +0000 (22:35 +0200)
committerLaurent Vivier <laurent@vivier.eu>
Mon, 2 Jul 2018 10:02:00 +0000 (12:02 +0200)
"move16 %a0@+,%a1@" and "fmovel (cpid=3) %a0@-,%fpcr"
share the same opcode.

To fix that, backport the fix from binutils:

  2005-11-10  Andreas Schwab  <schwab@suse.de>

     * m68k-dis.c (print_insn_m68k): Only match FPU insns with
     coprocessor ID 1.

Reported-by: Thomas Huth <huth@tuxfamily.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Tested-by: Thomas Huth <huth@tuxfamily.org>
Message-Id: <20180625203559.21370-2-laurent@vivier.eu>

disas/m68k.c

index 61b689ef3ec1cea9e2c9071fafde2490b62b0a2e..a687df437c6227731daf86fd488e744c0eeec50a 100644 (file)
@@ -2017,6 +2017,20 @@ print_insn_m68k (bfd_vma memaddr, disassemble_info *info)
                }
            }
 
+          /* Don't match FPU insns with non-default coprocessor ID.  */
+          if (*d == '\0')
+            {
+              for (d = opc->args; *d; d += 2)
+                {
+                  if (d[0] == 'I')
+                    {
+                      val = fetch_arg (buffer, 'd', 3, info);
+                      if (val != 1)
+                        break;
+                    }
+                }
+            }
+
          if (*d == '\0')
            if ((val = match_insn_m68k (memaddr, info, opc, & priv)))
              return val;