From patchwork Wed Oct 7 09:43:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 527272 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 5F723140D89 for ; Wed, 7 Oct 2015 22:28:02 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=dRManrjS; dkim-atps=neutral Received: from localhost ([::1]:56680 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjlRN-0002bJ-OB for incoming@patchwork.ozlabs.org; Wed, 07 Oct 2015 05:55:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50609) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjlH0-00021u-Qe for qemu-devel@nongnu.org; Wed, 07 Oct 2015 05:44:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZjlGz-0004Wv-Ni for qemu-devel@nongnu.org; Wed, 07 Oct 2015 05:44:34 -0400 Received: from mail-pa0-x22d.google.com ([2607:f8b0:400e:c03::22d]:33831) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZjlGz-0004Wi-F1 for qemu-devel@nongnu.org; Wed, 07 Oct 2015 05:44:33 -0400 Received: by padhy16 with SMTP id hy16so16779444pad.1 for ; Wed, 07 Oct 2015 02:44:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=9zdEbrkqEsCjwAcc2Vzn9EOYc3STobYmGEgQlD8PvSk=; b=dRManrjS1BOSCD5IFrKso3ee4RFLvzCb4V7j3c7r3ht2iYvr2g8tIAKoEipnd4FrDw TXL/OrvIC7LF5jbebdx6iAKkL2BCPGVteV7DQSlH7iQmutWkey+Gxtbu7pYpDi4TFOdL CV7yD1UAT4R2uWmPlzQ/dpcAs9RHHO0O9lH4UVL0DTcuYch/Q35y1zNjTBh3htrqGEvi +Yp5l18CVHvGNWXHNJgGii3+nmwcpLsnWnwUGx2B08IfUUfmaIpO/mUupxo4bghwqNJX pBIflT8VbxSq9CW+Z+g3LFm2/jZnLwbxZgw3/5WCiAGuqNu7hKD+IH5sZ8YmfNchMf/C leMA== X-Received: by 10.68.241.234 with SMTP id wl10mr58850pbc.27.1444211073048; Wed, 07 Oct 2015 02:44:33 -0700 (PDT) Received: from bigtime.twiddle.net ([1.144.13.196]) by smtp.gmail.com with ESMTPSA id l16sm38380188pbq.22.2015.10.07.02.44.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Oct 2015 02:44:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 7 Oct 2015 20:43:37 +1100 Message-Id: <1444211031-11624-13-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1444211031-11624-1-git-send-email-rth@twiddle.net> References: <1444211031-11624-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22d Cc: peter.maydell@linaro.org Subject: [Qemu-devel] [PULL 12/26] target-sparc: Tidy gen_branch_a interface X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We always pass pc2 == dc->npc and r_cond == cpu_cond, and always set is_br afterward. Infer all of that. Reviewed-by: Aurelien Jarno Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target-sparc/translate.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/target-sparc/translate.c b/target-sparc/translate.c index f359ac9..cbc90d8 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -955,17 +955,19 @@ static inline void gen_branch2(DisasContext *dc, target_ulong pc1, gen_goto_tb(dc, 1, pc2, pc2 + 4); } -static inline void gen_branch_a(DisasContext *dc, target_ulong pc1, - target_ulong pc2, TCGv r_cond) +static void gen_branch_a(DisasContext *dc, target_ulong pc1) { TCGLabel *l1 = gen_new_label(); + target_ulong npc = dc->npc; - tcg_gen_brcondi_tl(TCG_COND_EQ, r_cond, 0, l1); + tcg_gen_brcondi_tl(TCG_COND_EQ, cpu_cond, 0, l1); - gen_goto_tb(dc, 0, pc2, pc1); + gen_goto_tb(dc, 0, npc, pc1); gen_set_label(l1); - gen_goto_tb(dc, 1, pc2 + 4, pc2 + 8); + gen_goto_tb(dc, 1, npc + 4, npc + 8); + + dc->is_br = 1; } static inline void gen_generic_branch(DisasContext *dc) @@ -1398,8 +1400,7 @@ static void do_branch(DisasContext *dc, int32_t offset, uint32_t insn, int cc) flush_cond(dc); gen_cond(cpu_cond, cc, cond, dc); if (a) { - gen_branch_a(dc, target, dc->npc, cpu_cond); - dc->is_br = 1; + gen_branch_a(dc, target); } else { dc->pc = dc->npc; dc->jump_pc[0] = target; @@ -1447,8 +1448,7 @@ static void do_fbranch(DisasContext *dc, int32_t offset, uint32_t insn, int cc) flush_cond(dc); gen_fcond(cpu_cond, cc, cond); if (a) { - gen_branch_a(dc, target, dc->npc, cpu_cond); - dc->is_br = 1; + gen_branch_a(dc, target); } else { dc->pc = dc->npc; dc->jump_pc[0] = target; @@ -1476,8 +1476,7 @@ static void do_branch_reg(DisasContext *dc, int32_t offset, uint32_t insn, flush_cond(dc); gen_cond_reg(cpu_cond, cond, r_reg); if (a) { - gen_branch_a(dc, target, dc->npc, cpu_cond); - dc->is_br = 1; + gen_branch_a(dc, target); } else { dc->pc = dc->npc; dc->jump_pc[0] = target;