From patchwork Wed Sep 9 11:27:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 249448 Delivered-To: patch@linaro.org Received: by 2002:a92:5b9c:0:0:0:0:0 with SMTP id c28csp307587ilg; Wed, 9 Sep 2020 04:28:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxu9aLnlWlmlf7DmsEaOVnXaoIW02iEJ/n3w8x2SIVW8VMfs5AK7D2hjzRU1Wo+ifq7dSbz X-Received: by 2002:a25:424d:: with SMTP id p74mr4954802yba.362.1599650913674; Wed, 09 Sep 2020 04:28:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599650913; cv=none; d=google.com; s=arc-20160816; b=ejuWKzPMROsTEh+9jm9m0FHDI1Mt6Cm0NLCl99LU2fFOOk3K8sfZhw2VZOCOno/Ml6 jw2bWqEdRkIlvjceDQYqzS0h7yg2vRAsesaagCTDl/uOWzOofnyHr8pn9yoRd5NgTG2T GcCCgIfcLJ/mtwybFJA2Ni6nUeEc3dohBp2PKHpNQOhXKrJR74QMw1quONwWuizm6Lvn LT0KBdHvICGQZQQigNtL30NZ66UOqddeWjS1m8Gj/6UBAn4WwwKfE8LbqkHHfuoCas8n rGj6Bu6/IRLueuFwf1m21cBLnZeHuxBitMWKrKdy06sZN2v/dbu3sBbGdbyHhTygkEZL uvYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ZzCEYnGWgPjxCaNwaNwG2qZVWCUrnK8YFhM61o4jjX0=; b=APVvjvmzrLT1hdU5uQy8aDXRkrLPKv77NtXG9wgwySZSvP8KILYwSPzN7ysGVtdb8T P2+E0QgWBlQwIL6YFM0J3gG8p2MD7/ZQbCy3zsb7FhHIYt+0IayVeI/18PapEqqd5rPM cbh96xw0LkKNVAQRbfam9xo8Vc3M8o6OWlHXUvn73X2JFE/3sDJTdjd7cBOlOxN+pbn7 AfT0BHusflnVu3+6zqpCl8+TlsgOKsHlnOJIvHYOdcDVFT5wLeElIeFypFu8jrwz+kef tgdjwAkdiE+5PTCSoFEXlh5U9qC4Chf+3FOOn4VRgDp6GXlSgplts+SBJi+2+HoC/1H/ Ot5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="q6SDgx/I"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v66si2588426ybb.411.2020.09.09.04.28.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 09 Sep 2020 04:28:33 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="q6SDgx/I"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47088 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFyHB-00005v-4M for patch@linaro.org; Wed, 09 Sep 2020 07:28:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60378) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFyGX-0008V8-O0 for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:53 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:45431) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFyGV-0006X0-FA for qemu-devel@nongnu.org; Wed, 09 Sep 2020 07:27:53 -0400 Received: by mail-wr1-x444.google.com with SMTP id x14so2500908wrl.12 for ; Wed, 09 Sep 2020 04:27:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZzCEYnGWgPjxCaNwaNwG2qZVWCUrnK8YFhM61o4jjX0=; b=q6SDgx/IzGemaVDszgLVWJnrqv0FYZvGFWsd1ElvbftzFZs0gUsjt7cNcM6vwBVYVx 81WuF0Zuu5mFlxkvJH9lFa2eDX7+LhHshtn0wBFQUIMK0xH/G6JJ/AyM7cWbaibCJQZt ktyM56QS+pmpMdJZ1CQcKvENIpX4X7CwbyNzsWDiUX1qfyqo4aUUTk8vj/jlzoseNrpH uf8VZQ+hbsVN66nsos4fAdUy0P7Vm1z9iqWbtMFjRDkkIVtJHjpknEO+82te3Ad/7BZ7 t+UUkUHQx3O1MafFtpDlRmIqe0J6LqAqvjoui8/5uC8lGHsabg1IdhnfMspCOl26q+zD ROAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ZzCEYnGWgPjxCaNwaNwG2qZVWCUrnK8YFhM61o4jjX0=; b=WL9Qdufj2ljtEVj68Nu4PtZv4osQvXGAq7s5GCgMdU34/TbKgO7t+L+kwV78ajuiI7 JgmRH6tgPpL73g9UKd6LIl6J74esUvDNYjFym29QQems+u/nf1Htc+Jks4qoxTUobjBX NY6jqNRBtjlMvqqMSSQ5m5u/BXUp21ab6y359SLZ62n1523DQCpo/DWca3pC+DVHXnVq paaPun9g3T7dGkD8Sqvtj+HJtNZuJb6rPPKaAsTzYoe6G3NV9loXYOdTHyWPVklo1P1h 3AW5E47Q5HLvY/n+rBRz69kehXpJazZpjdV3lcI6c1n72y6hlfNM9QgIAGKDCepkkZm6 lYEQ== X-Gm-Message-State: AOAM531qfpeDQr8zYWu7EggIh5aeOCkJinkX4HD9qr0VxRqqR55puZTl ZH7cCSrAjkWjEIsLswjAPxmr/g== X-Received: by 2002:a5d:574e:: with SMTP id q14mr3213769wrw.281.1599650870093; Wed, 09 Sep 2020 04:27:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y1sm3882603wru.87.2020.09.09.04.27.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 04:27:47 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6B3AC1FF90; Wed, 9 Sep 2020 12:27:42 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 04/10] target/mips: simplify gen_compute_imm_branch logic Date: Wed, 9 Sep 2020 12:27:35 +0100 Message-Id: <20200909112742.25730-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200909112742.25730-1-alex.bennee@linaro.org> References: <20200909112742.25730-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::444; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x444.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Aleksandar Rikalo , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, Jiaxun Yang , Aleksandar Markovic , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" One of the Travis builds was complaining about: qemu/include/tcg/tcg.h:437:12: error: ‘cond’ may be used uninitialized in this function [-Werror=maybe-uninitialized] return (TCGCond)(c ^ 1); ../target/mips/translate.c:20031:13: note: ‘cond’ was declared here TCGCond cond; Rather than figure out exactly which one was causing the complaint I just defaulted to TCG_COND_ALWAYS and allowed that state to double up for the now defunct bcond_compute variable. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200903112107.27367-8-alex.bennee@linaro.org> --- target/mips/translate.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) -- 2.20.1 diff --git a/target/mips/translate.c b/target/mips/translate.c index 899b90ae0ff..398edf72898 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -20028,8 +20028,7 @@ static void gen_pool32axf_nanomips_insn(CPUMIPSState *env, DisasContext *ctx) static void gen_compute_imm_branch(DisasContext *ctx, uint32_t opc, int rt, int32_t imm, int32_t offset) { - TCGCond cond; - int bcond_compute = 0; + TCGCond cond = TCG_COND_ALWAYS; TCGv t0 = tcg_temp_new(); TCGv t1 = tcg_temp_new(); @@ -20046,7 +20045,6 @@ static void gen_compute_imm_branch(DisasContext *ctx, uint32_t opc, /* Treat as NOP */ goto out; } else { - bcond_compute = 1; cond = TCG_COND_EQ; } break; @@ -20065,7 +20063,6 @@ static void gen_compute_imm_branch(DisasContext *ctx, uint32_t opc, tcg_gen_shri_tl(t0, t0, imm); tcg_gen_andi_tl(t0, t0, 1); tcg_gen_movi_tl(t1, 0); - bcond_compute = 1; if (opc == NM_BBEQZC) { cond = TCG_COND_EQ; } else { @@ -20080,7 +20077,6 @@ static void gen_compute_imm_branch(DisasContext *ctx, uint32_t opc, } else if (rt == 0 && imm != 0) { /* Unconditional branch */ } else { - bcond_compute = 1; cond = TCG_COND_NE; } break; @@ -20088,24 +20084,20 @@ static void gen_compute_imm_branch(DisasContext *ctx, uint32_t opc, if (rt == 0 && imm == 0) { /* Unconditional branch */ } else { - bcond_compute = 1; cond = TCG_COND_GE; } break; case NM_BLTIC: - bcond_compute = 1; cond = TCG_COND_LT; break; case NM_BGEIUC: if (rt == 0 && imm == 0) { /* Unconditional branch */ } else { - bcond_compute = 1; cond = TCG_COND_GEU; } break; case NM_BLTIUC: - bcond_compute = 1; cond = TCG_COND_LTU; break; default: @@ -20118,7 +20110,7 @@ static void gen_compute_imm_branch(DisasContext *ctx, uint32_t opc, clear_branch_hflags(ctx); ctx->base.is_jmp = DISAS_NORETURN; - if (bcond_compute == 0) { + if (cond == TCG_COND_ALWAYS) { /* Uncoditional compact branch */ gen_goto_tb(ctx, 0, ctx->btarget); } else {