From patchwork Wed Oct 26 16:36:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 687287 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 3t3y2J5gh4z9s9c for ; Thu, 27 Oct 2016 04:39:36 +1100 (AEDT) Received: from localhost ([::1]:36368 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzSAm-0005P2-Bs for incoming@patchwork.ozlabs.org; Wed, 26 Oct 2016 13:39:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bzRBm-0002XM-2P for qemu-devel@nongnu.org; Wed, 26 Oct 2016 12:36:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bzRBi-00058b-CY for qemu-devel@nongnu.org; Wed, 26 Oct 2016 12:36:30 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:58350) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bzRBi-00056b-0K for qemu-devel@nongnu.org; Wed, 26 Oct 2016 12:36:26 -0400 Received: from Quad.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003) with ESMTPSA (Nemesis) id 0M3fG9-1cqIkt1cLR-00rFUw; Wed, 26 Oct 2016 18:36:18 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 26 Oct 2016 18:36:01 +0200 Message-Id: <1477499766-11722-12-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:MJyZCAPAWfhemnRbO64ZY6jeOcUmMb8FWqe0UYtbVC+Q3JwB7Yd m3Sd1emanCUifhBX6xntxo1KZQ3c63TOYKgNYD4lwyKJItFuD71uAMuE7lDQUWTELYWgigx VU25y5Mm/fd2ePJOKUkejRFxHJgn82W6fjuOSIW80Pr/5NL2JnJaVvhAgw0WurC9xI0nu4x xxaItyVhaL8TpF88mZi4w== X-UI-Out-Filterresults: notjunk:1; V01:K0:V49IeZVqJoM=:FuxEElQ0cWHGDBwj666Nob gMMzPfwKE8n1JeC5ij63ziGGuLAoK59QQFPPSLBppoLFvQfIJ1ZoVc6bigOb7BgBWC2wvNiE2 sFqeB9mI1F2rXg3K69HUtHl4fO3v68LAEGMvq56+Eml2etmwdhIl/dy09pOvZUoT1nJbbIwc0 sWM2sG02EbHxN00tQyjLgTMzssR8rC9XXPNRt0SmBFr7atciAMCGeXlbXD+prNfm6Buqwc2js JvdEdZp0l/rvcGzijmOCvQGqAln3demIfy0CfNUUPF878ppOMHSkoKJ6dWgFVKS4unh49kd0L TNFrUmrOe6eNFxO2t/08SrG0OSiSAiaY2H6g7iH26sd9GTtTsz7qsAoMeKJThmfMKXZ4tCDpo HP0XOhPmXbBDFVOnAGVumUtNpg8DCX/szj3Xns0KUHv7Li8bXo0PmGdX66JZrqng/jshDRees wxucAeXq3aSTA7P1JPM4/sxlcwiQ7KroHf7daZLDL3aB5zmz6mSl6GWbSAvutrWLPrHh8lUN+ PHYYqXJ+1CrPckPOEBQC0kTMbrK0Hzh49sVHVa6aeDdO+VIdrA0lfFjECQSqIkS55me3EmCNt IBsgngS33q3ODKQb9NMvUdHZoJphNROxuzLQIQcQZ5uvzWUmQxjbKxiPaofrQWCeIlz3xOA0U lyCNTDtGxhEIA/TJyOu85YqGfThBertwmk0AWFDYzkl9TDUtSWwA9GdxyXJEVn7Q9D1k= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PATCH 11/16] 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 557f671..1e473d8 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();