From patchwork Tue Jun 29 18:54:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 468341 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp5256184jao; Tue, 29 Jun 2021 12:34:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzCdnCmLB94Sm91reAQBy7/F0BzBr09or21v2p0KCIE5wtNtghModAxgTNKTwPw5wQcVV+t X-Received: by 2002:a25:ec06:: with SMTP id j6mr40161568ybh.510.1624995285430; Tue, 29 Jun 2021 12:34:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1624995285; cv=none; d=google.com; s=arc-20160816; b=r0zWaslJ27uLqX+knZuetfUL3At0lvad4hUIiLOfiklJO0uwGWbC7GJgUCA16k+Bph KfBq0Hzrpn762LqlxlQMYOdXbxuktbw8VF4yHsJzxlw9rWSmcZcgv8TSeBi2sA+ksioL 9JvfawbTgekfsMFsvWx78tbBbn0zlz/cjEV0R3O1A25IJArmgB2u5xvWDGLgrjaiYLfm Sf3rQr9u0MykRRjS+0/4Q8ypVkTYhOaFR2lT7riM8D8RSgyeALbbsokC/ph631UXBmPT 7IzqudUuI/VUhvu64Y625Shqndr2JJ43ZD7mS5Qslxvz366DHv+Nhtz33ktyAyLwjjHt dvRw== 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=UpFFrLOSrARsKBhNwiFx6rXuoH136/XwhR/W6bC1nH0=; b=eKR+NGOqrxMncB9PQfJpHfzaFA74kDdolZWf7PdWK0JGBNbZaSbIgNjAe6X1wjSE53 131jSeGeSZhvtKDiVycwbm9z6F8ICrXNxXcFF7cyq+XClVZbrb2cxTeiqLpKH8V74mRA 6Mr4QzdVfx6fOLQbiC4kLesim3utnNnCON51KeuisDBJlFYmQJ+klOOwNjBEqw6P96a4 czF0BIaLNw5HqQ12dMVoTm3IqJi8EG8+CNZReNEPRcGZ4vn2i6RrVfRbOlx/EcHqEbmR iZoCFlXjIhbhfCXWqCxYNEDWEhS8403tQbvGLyPNrW8H/f5Mv/ifiRJKB0CDa45ZBO2N ocQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=W0xriqz1; 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=pass (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 w12si19367641ybj.381.2021.06.29.12.34.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 29 Jun 2021 12:34:45 -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=pass header.i=@linaro.org header.s=google header.b=W0xriqz1; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38254 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lyJVM-0003mE-U8 for patch@linaro.org; Tue, 29 Jun 2021 15:34:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lyItH-0008GT-4O for qemu-devel@nongnu.org; Tue, 29 Jun 2021 14:55:23 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]:39672) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lyItA-0000tf-3M for qemu-devel@nongnu.org; Tue, 29 Jun 2021 14:55:22 -0400 Received: by mail-pj1-x102a.google.com with SMTP id in17-20020a17090b4391b0290170ba0ec7fcso2259987pjb.4 for ; Tue, 29 Jun 2021 11:55:08 -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=UpFFrLOSrARsKBhNwiFx6rXuoH136/XwhR/W6bC1nH0=; b=W0xriqz1xkZ4oxC9IhK4EhE7b7kGmL+b89SaDo4xB+p2FVVdKZWv+JpeKPC14Ytn8V Ikimro5mWotU0LCXVJHm8d0l9MoP6QYEJxRbc1LJKYOUdMN85OfrnyMTKI8aLRAdDA6F jGD39QTpuKV1p/lU0rhLgS1vfYERLz8Hscj4YhOhfDTaUx4/bEHH2Ki8O1Ndu7rHOSue JSgcoFkjHHuZpXRy5Twbxp9VTG7YnpUu18/zMdPnhH563FWmsNyCe96uz26HTx1tAaPv 4BJAiedf9CYg8642fKpfPBjU6QdWV7C3YkfiZA9KMTX2dQuqj+oLxlRL8VJmAc1oaj5A Vy1Q== 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=UpFFrLOSrARsKBhNwiFx6rXuoH136/XwhR/W6bC1nH0=; b=NFn+MVX1Oa/kRbRn6ydUz7KW7ZmMh9cR4/KaCDEvQMgajtDQ5qnRQtf0Tqp8H0LY80 fzBC3NBAyzWLP4LIXGMPY1dV1rFCRoKrggHn+76yIS7xC05e1bw2cTSKI0RnpCwr1mGV sEbS7LcWPCJdW/G/Wb2Xuv9uoYMa6ba3ORDnJxw+QhDqkBIXtSECcMLjPBSxJd4IEFRq u8j+bcB0DtsJ+t1qviNVtkuNIATCYMO82XWBN6S1dPrbr3wp0gWNavoisKx6A7AHbHyO EnOL7mstVmB/0RISSmRDRNFUaq1nx5mnlqPrHOfjN3sJ7cMRfeapZjxpngpsvCyYaVJY gHTQ== X-Gm-Message-State: AOAM533JJKTerv/sC5ilNVya/nrK7VX8myqGrwROfMQbYc6gkMOCldSR l8XkStkjIUQjy0aD3kt8YB8BPuz3VDMsGQ== X-Received: by 2002:a17:902:8503:b029:127:8abc:191c with SMTP id bj3-20020a1709028503b02901278abc191cmr28932000plb.21.1624992907969; Tue, 29 Jun 2021 11:55:07 -0700 (PDT) Received: from localhost.localdomain ([71.212.149.176]) by smtp.gmail.com with ESMTPSA id j2sm18811253pfb.53.2021.06.29.11.55.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 11:55:07 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 21/63] target/cris: Fold unhandled X_FLAG changes into cpustate_changed Date: Tue, 29 Jun 2021 11:54:13 -0700 Message-Id: <20210629185455.3131172-22-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210629185455.3131172-1-richard.henderson@linaro.org> References: <20210629185455.3131172-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.google.com 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: "Edgar E . Iglesias" Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We really do this already, by including them into the same test. This just hoists the expression up a bit. Reviewed-by: Edgar E. Iglesias Tested-by: Edgar E. Iglesias Signed-off-by: Richard Henderson --- target/cris/translate.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) -- 2.25.1 diff --git a/target/cris/translate.c b/target/cris/translate.c index e14b7acb10..80276ae84d 100644 --- a/target/cris/translate.c +++ b/target/cris/translate.c @@ -3217,6 +3217,10 @@ static void cris_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) cris_clear_x_flag(dc); } + /* Fold unhandled changes to X_FLAG into cpustate_changed. */ + dc->cpustate_changed |= !dc->flagx_known; + dc->cpustate_changed |= dc->flags_x != (dc->base.tb->flags & X_FLAG); + /* * Check for delayed branches here. If we do it before * actually generating any host code, the simulator will just @@ -3227,9 +3231,7 @@ static void cris_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) t_gen_movi_env_TN(dslot, 0); } - if (dc->cpustate_changed - || !dc->flagx_known - || (dc->flags_x != (dc->base.tb->flags & X_FLAG))) { + if (dc->cpustate_changed) { cris_store_direct_jmp(dc); } @@ -3263,10 +3265,7 @@ static void cris_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) } /* Force an update if the per-tb cpu state has changed. */ - if (dc->base.is_jmp == DISAS_NEXT - && (dc->cpustate_changed - || !dc->flagx_known - || (dc->flags_x != (dc->base.tb->flags & X_FLAG)))) { + if (dc->base.is_jmp == DISAS_NEXT && dc->cpustate_changed) { dc->base.is_jmp = DISAS_UPDATE; tcg_gen_movi_tl(env_pc, dc->pc); }