Commit 2d58e33e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-3.0-pull-request' into staging 



Fix move16 instruction disassembly

# gpg: Signature made Mon 02 Jul 2018 11:25:51 BST
# gpg:                using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg:                 aka "Laurent Vivier <laurent@vivier.eu>"
# gpg:                 aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F  5173 F30C 38BD 3F2F BE3C

* remotes/vivier/tags/m68k-for-3.0-pull-request:
  target/m68k: correctly disassemble move16

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 646f34fa d9345f1e

disas/m68k.c

+14 −0
Original line number Diff line number Diff line
@@ -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;