From patchwork Fri Oct 28 08:48:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 688305 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 3t4yZZ4fKxz9t0p for ; Fri, 28 Oct 2016 20:07:34 +1100 (AEDT) Received: from localhost ([::1]:47625 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c038O-00041O-5Y for incoming@patchwork.ozlabs.org; Fri, 28 Oct 2016 05:07:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c02qm-00060O-4O for qemu-devel@nongnu.org; Fri, 28 Oct 2016 04:49:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c02qi-0003HK-4g for qemu-devel@nongnu.org; Fri, 28 Oct 2016 04:49:20 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:57045) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c02qh-0003Gp-Ql for qemu-devel@nongnu.org; Fri, 28 Oct 2016 04:49:16 -0400 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0McvJJ-1cHREb2UzJ-00HvqO; Fri, 28 Oct 2016 10:48:44 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 28 Oct 2016 10:48:23 +0200 Message-Id: <1477644512-21716-10-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477644512-21716-1-git-send-email-laurent@vivier.eu> References: <1477644512-21716-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:Vr7EwF5YTY8x0AZbjUdPnhVxh0ZdzqHU42YXuqHO0CymTr4Ph7E B4HtrmAhwhGJv+xJc+z3WyyYYYN3wBvFd/UMH6bjnIo/qDZzMp8zQ0Ku4Tna9Xiyyi3+UaF GYyJDkSDSCJ9729MExT4hCD68vizsVE0TMn9BXSm1Hwy/mL0WHLaq+V+sHu4e3wYQadHD4m 5GK1ryQ+MHzmDuJN2vimQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:6O3eyawZ4JI=:ttCL6o1NHYvCklvdC6uUbS pq7lj4TbS7531bgCc46+7PprsRynuhgxvI7AIizdlVURxd425OgrTyL7l4HayWXU2Bl+MJE2O BVLQzNwCkzlhgo4yfZ24nY9CtPs2d0+RqQLRlMy2ZHyGq2/LycQcq0oeOXFIYsuf41LM6zlsm 2XBOUGzU+t6BhB4uT8JgeAeaiJQmfDLW8mgdwK4maYTHWdteu7nZQQTF9g+QFFHvxblnjSo0r K27H7kxb5a34XwfTPvUi/G5y6k+/ISupSndLfsOyfTvBPsAfArbkDVyfCxEVv2qNjVsGpv41A LpurwWKCB1czJUD+fDoMZPz55bMjA0F3HO8M9jDGXkzCzFWQb339QGjbYuM9I4sCC9cked4Nv TwspiVk04vXSiYLMQYxXgmEsup82KevBmu2MZx01IzfWl3WMKKjRn/6YME6QHCmu2dSHZAsXQ Ybe84dd/Cmx7flp9Z77+9Ed7wcR4deDLxeM3EV/wPayznVsC6pKIyBs6ln6MAB3wOJdbKYLon D7Jl1ynE/1egejuN+l4zFPYNm6/HS8twsv8vcjSPlpWXp7rwEeFYQ3Oh9s6XbUmLbNQlNgnAS V3qaoqJ1kJ13BIpoMm75lHpBjLhhWH5dTjtG7JICPdZ2WuuJHRGq1IXOq4AG45SiIydDelQGF /t2j6vvgzD0P4H3ig5wMQApoXzA6LDEWk0daARCq4HQ+Nc12t0qnM5BROBnVPSNWjF0g= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.133 Subject: [Qemu-devel] [PULL 09/18] target-m68k: or can manage word and byte operands 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 , gerg@uclinux.org, schwab@linux-m68k.org, agraf@suse.de, Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- target-m68k/translate.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 9734d05..a6aaf5e 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -1989,19 +1989,21 @@ DISAS_INSN(or) TCGv dest; TCGv src; TCGv addr; + int opsize; - reg = DREG(insn, 9); + opsize = insn_opsize(insn); + reg = gen_extend(DREG(insn, 9), opsize, 0); dest = tcg_temp_new(); if (insn & 0x100) { - SRC_EA(env, src, OS_LONG, 0, &addr); + SRC_EA(env, src, opsize, 0, &addr); tcg_gen_or_i32(dest, src, reg); - DEST_EA(env, insn, OS_LONG, dest, &addr); + DEST_EA(env, insn, opsize, dest, &addr); } else { - SRC_EA(env, src, OS_LONG, 0, NULL); + SRC_EA(env, src, opsize, 0, NULL); tcg_gen_or_i32(dest, src, reg); - tcg_gen_mov_i32(reg, dest); + gen_partset_reg(opsize, DREG(insn, 9), dest); } - gen_logic_cc(s, dest, OS_LONG); + gen_logic_cc(s, dest, opsize); } DISAS_INSN(suba)