From patchwork Fri Jan 13 12:51:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 715028 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3v0MyB3kxVz9t0w for ; Fri, 13 Jan 2017 23:53:54 +1100 (AEDT) Received: from localhost ([::1]:40693 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cS1Me-00079e-2K for incoming@patchwork.ozlabs.org; Fri, 13 Jan 2017 07:53:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35173) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cS1LA-00060w-D8 for qemu-devel@nongnu.org; Fri, 13 Jan 2017 07:52:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cS1L8-0002Nt-2M for qemu-devel@nongnu.org; Fri, 13 Jan 2017 07:52:20 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:61105) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cS1L7-0002NO-OP for qemu-devel@nongnu.org; Fri, 13 Jan 2017 07:52:18 -0500 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MhUQs-1c6WRG3nRS-00McLe; Fri, 13 Jan 2017 13:52:09 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 13 Jan 2017 13:51:59 +0100 Message-Id: <1484311923-28637-2-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484311923-28637-1-git-send-email-laurent@vivier.eu> References: <1484311923-28637-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:9xqQZ7lG0C3E7QUy/vDS7atnspV8NL0YsT4qmlqyYXLCkI2/dL2 kntxzXUMt6F+ICLUkUdUHDv4oVdJPNIZLouphoQGTIHXz9AG/NoAla8HCw398eTlCECjgSH g9lPnuxGOaMBUUEfN3aBg+hahHbf13Ug9M42hrbbCon+0yOHTvCU3iLSeZfFZ3TVbPU1zbT XMU3U90ss1soPSggD7XZw== X-UI-Out-Filterresults: notjunk:1; V01:K0:jDJVttMAnqI=:NeghRjr5Nl948Q9lNGaLGf cxazFr5ePyISkfsG05Z/sYZt6GVrbaWXJwCmNTBF2fdmKNYNa8bMkYEvnoFibx8PRR83A4k41 Sqjkrbg/iLDcbREK513NwvuEkLJleXhCNcwrqbX1Vf+F+W1JwD+fYbTYKt5MOO8+JX8REZwRK B9l46KkVXj6UVg2jxRjauzP5WZ6K/G0F/t/kojYfeP91gf6+lpMrHsedQKnnBjy5cX3NOvq6g JrTz2Mbkjl8NIoA9z47mvt5ELeya7tUWX0Mk5vgz7L/SVpzwUDFqBH3TBkpLlXxKBQgRJXXjK pLOXnI8KhtZ5T/jAR2kU5AfOJoiNzE4pvDVP2FZBkLAl+gO+OXYZc3n9OGZe8Xw3KotQjljeU FCQymmlB91WMAacUEHNj0oKkqs5+fefprSiVNtOGKEW38oquuJ8hD1Ug6WMXo8Xeews24jC58 K7gjyMlv4JCiT5ccItIUIHeHdGdFajFrfRBUuGFPmsj4mmExVoTWeHU0o90uqEbf5YnBgbszX KZTzxv4So/HCsBVT2+YCSfzcQFFMiOzihfqXHk2jJjUUYtarLqR50OBmtR2DJSD7StvG1XR8i jJlScsyuH+46RnOMhqbc1mIjVT4A8yyWiQ1fbI3pFC4eUDOOVg9LauG8Gigk4t8+qvPTMP2ZL FUdEpcXT0r/PduSaJApVgIcCHjW8ujqzMYeB4oj6h59G6amTsj/viLrLddsebLl40iz0= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.75 Subject: [Qemu-devel] [PATCH v2 1/5] target-m68k: fix bit operation with immediate value 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: Thomas Huth , Laurent Vivier , rth@twiddle.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" M680x0 bit operations with an immediate value use 9 bits of the 16bit value, while coldfire ones use only 8 bits. Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target/m68k/translate.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index 5f7357e..410f56a 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -1801,9 +1801,16 @@ DISAS_INSN(bitop_im) op = (insn >> 6) & 3; bitnum = read_im16(env, s); - if (bitnum & 0xff00) { - disas_undef(env, s, insn); - return; + if (m68k_feature(s->env, M68K_FEATURE_M68000)) { + if (bitnum & 0xfe00) { + disas_undef(env, s, insn); + return; + } + } else { + if (bitnum & 0xff00) { + disas_undef(env, s, insn); + return; + } } SRC_EA(env, src1, opsize, 0, op ? &addr: NULL);