From patchwork Sat Jan 14 09:07:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 715336 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 3v0v482xPrz9t1P for ; Sat, 14 Jan 2017 20:15:52 +1100 (AEDT) Received: from localhost ([::1]:47092 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSKRB-0001e6-Uo for incoming@patchwork.ozlabs.org; Sat, 14 Jan 2017 04:15:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50458) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cSKJp-00033P-IS for qemu-devel@nongnu.org; Sat, 14 Jan 2017 04:08:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cSKJl-00034s-KY for qemu-devel@nongnu.org; Sat, 14 Jan 2017 04:08:13 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:61983) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cSKJl-00032l-BJ for qemu-devel@nongnu.org; Sat, 14 Jan 2017 04:08:09 -0500 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MSYbs-1c2vfH00I8-00Rcka; Sat, 14 Jan 2017 10:08:07 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 14 Jan 2017 10:07:54 +0100 Message-Id: <1484384878-29179-6-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484384878-29179-1-git-send-email-laurent@vivier.eu> References: <1484384878-29179-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:+OtGFWnYGji+EU4VH6a8nBi1t7cSo0Qp0KYecAiKhH45PgXLDlQ ME/J+dk1/yzjZMH8euqpboWz5c1fpOuobTwqUL81UA6SbhEaBh8myaf9BluD9Y79wTiHJst QCHxfNNiYV3iKoo/kS72eARpLl2apex31/AlBBUaSbFxfhuQQfISHL2YMwIJWoT9wtYeRD0 3wJvDB196r2Gl4SND/DEw== X-UI-Out-Filterresults: notjunk:1; V01:K0:h4ditl5Ajbc=:gT6c0Q/jmUMXWQvMMNgvEy 5FwAn6ctFqWQIclYB47r4kz5c4X5WUcWlkMhgsoaUCLtezjqPgeYh47+1TsCf1k1y+PYq9f64 HVIi5sdlsY7Lwzu5R1MRPdcNVN3/P1JlA285FixHFzFex3NTdOua45IYgY6ZzppVwencqbDwu 1SLT9TfPCKOdoHqX/8wleswJe5gytgkvLgFOWFFg9Rf5v/Cvn8mI4+Mpm2AfJLNdJkGU4Fppf nDXQ+2KhUSLq2lbqlRasZk5PVLDsglU/wmOIfcr+lBcijVlgtKVNNJcFxaJAWumDx1UVmSKC0 HGTrd0A2DZtkh03W/9ayX4l0GMJp7iMLvpVo1lzt2ZlSPocvIkZvYBhiRJsb6Lw58TgLZOIgT cZJyTv7fYe6rnunzbppGpU3+yKMsi0dta04lb6eDCTRxdhmHsgkWEkeRyD3ChkcF0SPnKsSbc /8K7RbT6p/NDO/mAk0DC5yfenuf/C+GydCZijf/5C+gCXY4FdghgkSLlJKeuJ24BllNw98ceP 73lU+CZZUNCHK9kMq0i1O6SAZjwqpO6Nwk+lIGpno3SBqVHFydhOryRmER6b9gUtZ67aJeZpi tpB8VLvGstTv69Jrxq6NT+qhxzYJbA+5gPqS7uk9VxTNn4znpMp7x924EVGa7DfTcbK26WFa8 sJtUK89orLwwqIkE0TZT/QismpqVvjnOiffCV9lTLL8d06q1so0BqGU3sKgf7HxUslMs= 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] [PULL v2 5/9] 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: Laurent Vivier 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 Message-Id: <1484332593-16782-2-git-send-email-laurent@vivier.eu> --- 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);