From patchwork Fri Oct 28 08:48:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 688314 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 3t4ywT2hWXz9sdn for ; Fri, 28 Oct 2016 20:23:05 +1100 (AEDT) Received: from localhost ([::1]:47726 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c03NO-00078e-Vg for incoming@patchwork.ozlabs.org; Fri, 28 Oct 2016 05:23:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c0351-0001Ig-UH for qemu-devel@nongnu.org; Fri, 28 Oct 2016 05:04:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c034y-0000gM-QF for qemu-devel@nongnu.org; Fri, 28 Oct 2016 05:04:03 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:52373) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c034y-0000g1-CY for qemu-devel@nongnu.org; Fri, 28 Oct 2016 05:04:00 -0400 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue002) with ESMTPSA (Nemesis) id 0ME6mN-1c6x7Z2OSd-00HOyI; Fri, 28 Oct 2016 10:48:46 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Fri, 28 Oct 2016 10:48:26 +0200 Message-Id: <1477644512-21716-13-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:1KbNz0+5388u89/yOFlINUyyNxNZIs8glHt/MwZ2Txu+RyoaxMI L9I0th7ASgr8vP1nXCcg9iYaxlfqa6WoSXAtxXYKG5DvvXvMGnhV4aOXml4ReHDK0edTE5P ljneS+o7Ej4v7zgVeWPWst/jUSXByszNUBc3Q/Z3leuS+AS9Ka2d+jvQsQly3G9DFgd08xp i6V7eTC/uJDpWk2y+FKXA== X-UI-Out-Filterresults: notjunk:1; V01:K0:+M+pxn7vV48=:Vznjpg37/3hthaN02HyFif xz5fsO3jfgTEDNdxZPZEREY8T8ufVLHxfM7E0twwVStKXYPo36b0QjeR5jI8eAbDM2ycWJcWw U4aV/cvA7fN0rdzOJgp9AS981U0IUWXe4ttL0X9M2m+/bpRPqUWoM6o/QqYDKBQR2l94dVECP PgyiW2Lg1udV6a2Ju+dffKBsARwwKbpRfp6J3A7ORy1b2I/E0qR3DsuAAc4+hK4msMsXM++B5 5Bw9d3eiWwYL5euL9eH5TrZlB/b5evc7/g01WGpHpbR3egLA1Yrtpvf2rj7qnPeJOHXtULvlf l4VA0Fczb6tnutLJ/xSGc51WHgbb+PjurVAJuxxwsCpZWy78nvvjbudP7Ybhaoec5eR7nACmJ DFLs8LVBsfCV5mYhBqkeMpEg1jlHd0ffSjNCg2lcw4HIu9xgITw+5XDo9P/kDF3oB1Yj/6IbY Tbf8/lOeuybbZL8kxLGFLOWdIAy2zA97W/O9BCByEYbgibWPTsbtA7vuXtUor/EJ4NAXLtCzZ i/Y0qrx6XXM9gEqFTZ7Epwn9ltKJHNaxfTIHAGsjYCfPwJlretewMQR379iv+dLd8VoJbQrnj Se2Eu2hRjhDbI/2my80oVMUI5IhEQyRV6twUVN9rr7m3YWWxj9Hq5HC+dzF3dherxmXOq9Nz0 iMv6ZftVc3QT6eUYMTw5m4accXwBHcmMXgwtlRJEFdP6hIPonkwMZ1DP/3ePlXYg1J8I= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PULL 12/18] target-m68k: some bit ops cleanup 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 | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/target-m68k/translate.c b/target-m68k/translate.c index b82ebf3..cf9b228 100644 --- a/target-m68k/translate.c +++ b/target-m68k/translate.c @@ -1290,39 +1290,36 @@ DISAS_INSN(bitop_reg) else opsize = OS_LONG; op = (insn >> 6) & 3; - - gen_flush_flags(s); - SRC_EA(env, src1, opsize, 0, op ? &addr: NULL); - src2 = DREG(insn, 9); - dest = tcg_temp_new(); - tmp = tcg_temp_new(); + gen_flush_flags(s); + src2 = tcg_temp_new(); if (opsize == OS_BYTE) - tcg_gen_andi_i32(tmp, src2, 7); + tcg_gen_andi_i32(src2, DREG(insn, 9), 7); else - tcg_gen_andi_i32(tmp, src2, 31); + tcg_gen_andi_i32(src2, DREG(insn, 9), 31); - src2 = tcg_const_i32(1); - tcg_gen_shl_i32(src2, src2, tmp); - tcg_temp_free(tmp); + tmp = tcg_const_i32(1); + tcg_gen_shl_i32(tmp, tmp, src2); + tcg_temp_free(src2); - tcg_gen_and_i32(QREG_CC_Z, src1, src2); + tcg_gen_and_i32(QREG_CC_Z, src1, tmp); + dest = tcg_temp_new(); switch (op) { case 1: /* bchg */ - tcg_gen_xor_i32(dest, src1, src2); + tcg_gen_xor_i32(dest, src1, tmp); break; case 2: /* bclr */ - tcg_gen_andc_i32(dest, src1, src2); + tcg_gen_andc_i32(dest, src1, tmp); break; case 3: /* bset */ - tcg_gen_or_i32(dest, src1, src2); + tcg_gen_or_i32(dest, src1, tmp); break; default: /* btst */ break; } - tcg_temp_free(src2); + tcg_temp_free(tmp); if (op) { DEST_EA(env, insn, opsize, dest, &addr); } @@ -1406,17 +1403,16 @@ DISAS_INSN(bitop_im) return; } - gen_flush_flags(s); - SRC_EA(env, src1, opsize, 0, op ? &addr: NULL); + gen_flush_flags(s); if (opsize == OS_BYTE) bitnum &= 7; else bitnum &= 31; mask = 1 << bitnum; - tcg_gen_andi_i32(QREG_CC_Z, src1, mask); + tcg_gen_andi_i32(QREG_CC_Z, src1, mask); if (op) { tmp = tcg_temp_new();