From patchwork Wed Oct 26 16:35:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 687268 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 3t3xcf6V4hz9t0Z for ; Thu, 27 Oct 2016 04:20:50 +1100 (AEDT) Received: from localhost ([::1]:36251 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzRse-0006e2-Ia for incoming@patchwork.ozlabs.org; Wed, 26 Oct 2016 13:20:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzRBh-0002TI-MB for qemu-devel@nongnu.org; Wed, 26 Oct 2016 12:36:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzRBe-00055f-El for qemu-devel@nongnu.org; Wed, 26 Oct 2016 12:36:25 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:61830) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzRBe-00054r-6P for qemu-devel@nongnu.org; Wed, 26 Oct 2016 12:36:22 -0400 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003) with ESMTPSA (Nemesis) id 0MAAX7-1cAjjU0KFt-00BMGQ; Wed, 26 Oct 2016 18:36:17 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 26 Oct 2016 18:35:59 +0200 Message-Id: <1477499766-11722-10-git-send-email-laurent@vivier.eu> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477499766-11722-1-git-send-email-laurent@vivier.eu> References: <1477499766-11722-1-git-send-email-laurent@vivier.eu> X-Provags-ID: V03:K0:adgHkWcyf/QyPugZFS+YUcl1CfXnhzK7eXANa7LeSJAzW1r53fh m1Orp/wHcXodnqEGVZ788gmVXZoHHtFBF4AaiPR+hMrXCTl8D5r4DmTR0PUR8s3R79SMrQ1 3z9tLKQgFB4HD7NX7N1wzIq/z8VjEmgPDGx9prtc0cgEy4wFy5OXiLCxo5XiQWLnAoqt3tp Bcz+8WfYKwKOY2JqvpAMg== X-UI-Out-Filterresults: notjunk:1; V01:K0:NCgcQ3xnusY=:30cIr0RNse7e8FasLg1t9a KgSshoV3xmOJuPVA1fZVGv05hwn38x8hGSdM4QZTgeqoLgf/9Ekat2e83TipxORoGXAQpLwwX uhhZvnzMKzyyX2Sw7F92iSaT8S9fHRtCJxcpP/fw+HXANrf7OluZwtOxNJ629MRp9CYiyxJ46 zznbcWEhGItcCfXJo429HbnCjKb4jfr45l7kQJy6YkXwBigFT9LWP0orkGL4yrUqhTJ2CFQW7 VrzZiO60vhKoKTbvleGDgjRtj2RiydX8UlHlfbFDFjiENsfSoqQGAk9kMS49/5NlKf+3IM4cv mAGgHom2vtQz9q/mLrdQEDIQBR5NwA44HxBX4/KZwfJXMmF5MisZBluvl/ATPcGiVct7kBv8S bOMfkyJ6c+Jby4wFRa+dhj5CpJnz1NoNrwFwY2uLnfoqTRRxGpkXT+cO7JaXrLzKgfdoVDBlz 7Q/BJ+VqQJMSwOIxCx0gaIrQowNxG59CNcisoTTE+kjv3WW6aJ0okdPvFecfdxClJE1/LgfMQ Zet0ZycuF+0Mbe1wTa1PUgJX3LMWT/TqpmkYcYNjc0LnCR3bCrxBWJwL/j893w6ode7M8mnLZ UzWRv2BErZhOV271mqYkfuVrGzNiQd6ZDCQrpL92EkjoryhwUIFPpzYlF2jA7ELv5TRxw6gll nm1t8q3RaoCq9tgtv66hZ/mGF/QEpcq696H7k0Bl018cw/QeGPFfkFedsUHWWO8q+2fY= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PATCH 09/16] target-m68k: and 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 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/target-m68k/translate.c b/target-m68k/translate.c index 41994b3..28c6d93 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -2187,19 +2187,23 @@ DISAS_INSN(and) TCGv reg; TCGv dest; TCGv addr; + int opsize; - reg = DREG(insn, 9); dest = tcg_temp_new(); + + opsize = insn_opsize(insn); + reg = DREG(insn, 9); if (insn & 0x100) { - SRC_EA(env, src, OS_LONG, 0, &addr); + SRC_EA(env, src, opsize, 0, &addr); tcg_gen_and_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_and_i32(dest, src, reg); - tcg_gen_mov_i32(reg, dest); + gen_partset_reg(opsize, reg, dest); } - gen_logic_cc(s, dest, OS_LONG); + tcg_temp_free(dest); + gen_logic_cc(s, dest, opsize); } DISAS_INSN(adda)