From patchwork Mon Jul 2 10:28:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 937781 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41K3RB749nz9s1B for ; Mon, 2 Jul 2018 20:29:57 +1000 (AEST) Received: from localhost ([::1]:59887 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZw5h-0000Ur-GW for incoming@patchwork.ozlabs.org; Mon, 02 Jul 2018 06:29:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZw5L-0000TY-Pe for qemu-devel@nongnu.org; Mon, 02 Jul 2018 06:29:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZw5H-0000Nb-5O for qemu-devel@nongnu.org; Mon, 02 Jul 2018 06:29:31 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:59291) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZw5G-0000NM-Qh for qemu-devel@nongnu.org; Mon, 02 Jul 2018 06:29:27 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MfHVi-1flOAR0EXa-00Ol99; Mon, 02 Jul 2018 12:29:25 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 2 Jul 2018 12:28:21 +0200 Message-Id: <20180702102821.22188-2-laurent@vivier.eu> X-Mailer: git-send-email 2.14.4 In-Reply-To: <20180702102821.22188-1-laurent@vivier.eu> References: <20180702102821.22188-1-laurent@vivier.eu> X-Provags-ID: V03:K1:5l3qlFJNvOQsosuJWTjheQvXyXf2PjDhdtTs/lTMVRlH/G9gdso 4GK4VWQh4F2by+XifpjiDBrcW7tKwzYjvHHGnKq9UBRjwXKIsQ3dxnv8H7QKfdoVYkv9oiA opIEKog9c3VdrA9cJ5leElBDGZD6834xTpO+e/qzefPzfuq8Gy50VY2mkL+oea/c1dzfb1x hi8z1d46W7v7OeHp9aQ5Q== X-UI-Out-Filterresults: notjunk:1; V01:K0:+gOWiPQt5I0=:QZ9fYEAogWRuq9A10tNFEM dlQITSr+4j1QNgbIfdn7j7TiglAzx5VCCSNF5pdSs9bxb/W6L5TDdFxWA8Eztu3OeixJkPV+o DUcQYSjhZb+DsDd6YFT+LyRe88UT+9mcwTvyeO34Oe+ro21ocpi/mLZ4I/WXo77zfyAX0h3AX nByoxMZwm/7K3+c+XSSLHuEhYbUyEI7NQ6sO/0A5rrvDzK8VuwRyqh//OqvrpVw4s+/+G6lf4 AWjf4bwedD6bYVH6cK+DJtv/FueA0nMcrOoszpFbUfcxwTjdkB9CqO2s5gwWLxxJ2UmhYGry5 m3TAGOpDyNzGveAVVumEhcGlQx94mhEpnYQxTknohLX/jqZhrBM8kF0/vGFlGnUD9Mso1vz0B GcaL0x43Cnf6lY6seq7ddlY5Ab+e1sioMcvFdU8hPzT1ouqkQyeyfM0OrIitL0W71w7AZDE6j 0tFKdCK+GaJgUDZfSngmUQSiuftEjppC+2WoFz3m34TMOSrLdxN61+SRtNgMKtsxPQzVFzskU YwDQmvtkdSAj75zBnjeVDZqN/HHZ4XLcUzE09TLVBvwcMutIgO4l5oAHxvDEW3RYI00Y+Uud1 1szqX+wmttnq4OpElp6RpR9wOVvG7MhBWt+FOhfELAZ9HrxeiTTDEBH+QuCgtevE3EdEy1kQO bqFaDRVnsbnrZKvbuGfIaR7S0iXHxfYdNFA69SQm6MjbWACFP80/J+oTjNi6qoI2uWPk= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PULL 1/1] target/m68k: correctly disassemble move16 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" "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 * m68k-dis.c (print_insn_m68k): Only match FPU insns with coprocessor ID 1. Reported-by: Thomas Huth Signed-off-by: Laurent Vivier Tested-by: Thomas Huth Message-Id: <20180625203559.21370-2-laurent@vivier.eu> --- disas/m68k.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/disas/m68k.c b/disas/m68k.c index 61b689ef3e..a687df437c 100644 --- a/disas/m68k.c +++ b/disas/m68k.c @@ -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;