From patchwork Tue Sep 6 10:17:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 603035 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:4388:0:0:0:0 with SMTP id w8csp4462750mae; Tue, 6 Sep 2022 05:04:34 -0700 (PDT) X-Google-Smtp-Source: AA6agR5+cxdcwUbHKEWy05hYj2umazrw4wEoIPaPNtCEG0/y9oQU7Jyx+6fn4yDes0ehpdQVyHue X-Received: by 2002:a05:620a:4503:b0:6b4:6ae5:d524 with SMTP id t3-20020a05620a450300b006b46ae5d524mr34250615qkp.445.1662465874319; Tue, 06 Sep 2022 05:04:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662465874; cv=none; d=google.com; s=arc-20160816; b=EdnzVjWAF1q4gHOdIbSNhXIHodsBFBisaQptEF2UP6Xu9RG+UopnwX+V5FjtPp2tBi WUsvwYziiXQp8XDOIWMXOOGcJF2BKhYVsU7HcEggXK79y5kNf3uuxOYEihj5XRoVReB0 92Nyu7lciNeVOlbXNdVGpkddRpOPaCX8ZLjmA0r+XlFIN7pmQTMeUtJXFgIJ3i5cETOp g5xJArWx88pQGyC8dVpdgB9KYU5WnrilKkHkmMzF90sbWNqUlL5K1pph5ThN3WNiBaI7 zP1QvYyJGh8489iWMsJsYByLmWuh75h+ZgRvvsSoSBhoo0aGTdrZjSg2f+6lHydTNr1S HIeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=4KnyaNg03Q9A36I/gIWbI9OfpLPWp7gded3zO91Ecgk=; b=Tc8AdMb8B/7v1lZdPq6M9SVnmJ7YIugbfRJwu2kH0YzIcKE44lyG4z63vL1HQcrpuz nyMfN8zmj5kBS/I0/b5JixDFdA/wHmjzlrkbNRcAkD6an7j9FmeHCH3mQuZQZ/Xe6K0+ uGsB90sCASowCKbmSVLyPERsjCqNW7YTocApT7XyBOlV5f0Q4TVxRvjuFME1dDmR0HWO 5xgW9MgJ6JcddOt2ajf4xGjCEJihaKq/i7kpb1pyCxGOUQx+skcinq5bFKx7oxNoS3VQ r3pdf7r4gYyxdw+XfscLlE2LQPS1C0duIZQhnKU9t3uwgpqDwPy3s0r+PhybTDruiQWM QwWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=akLDEGLF; 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 3-20020a370a03000000b006b5768c51bcsi5555759qkk.225.2022.09.06.05.04.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Sep 2022 05:04:34 -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=akLDEGLF; 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]:45144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oVXJh-00034l-Qq for patch@linaro.org; Tue, 06 Sep 2022 08:04:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oVVex-0003cS-7e for qemu-devel@nongnu.org; Tue, 06 Sep 2022 06:18:23 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:54855) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oVVeq-0005Hl-DM for qemu-devel@nongnu.org; Tue, 06 Sep 2022 06:18:22 -0400 Received: by mail-wm1-x331.google.com with SMTP id s23so6612938wmj.4 for ; Tue, 06 Sep 2022 03:18:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=4KnyaNg03Q9A36I/gIWbI9OfpLPWp7gded3zO91Ecgk=; b=akLDEGLFHV2nNsOtdJC/YYgSU7Irayqy3+O659ai6EGeFHSkqGIM1WP4L60Vq6+VFp sAZLGILXi3JjuB4eSu9C41x+uLloXF2MUxubct0I98ILfEPc1fkhZWy4apT97wjbR9Ee uZS5c2j4biop7vZpgkLBpG1BHKw/Te+ly/LMKWdEMxyoaHrpSvhl7jsZSUiJfC1Vxxjm VQVN5hBn7qa7LNTpMOJ4kT45cbc+RELshwrJfJ3dr4FZFdEpNOomiLqdepHV6JCdly4G 0NRiRnOlU0u7BCNuQ2Cs2hZfmQ3TZdJOCNfHiwf+zXCtGcFtY4l+Jf4WWWi7WAnbZv8v tLqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=4KnyaNg03Q9A36I/gIWbI9OfpLPWp7gded3zO91Ecgk=; b=JPN81uhNLLllPsUxLx/4dm43SCv+F6E8haQ+7lAgGc3uQukano+PtBOYpzZph+kPdX JBjsarkQW3FKFqu2d01+eL9MoGorGe6DZdCJDfn8/tnxP3wvlZovWZGQYEIBrf+Gjj5z wLh8Z+vfYcwuKA2kqw1Pc72C0gf56rYjr7e65Y/i7cmTurH6SSbd9NGqiJOjpucXyo4E uVW1SEsh2eS3QE4ANTFO0s0Aluagm+CTp/sFG8gV/J52HXoTF01QErt4ZpyctUNPpMAw Vd6XL7krQRdZ1dIQCNeceohC1mF8puJkPSWpqXid83GCEuJqOfCodi+hIkZBZTNpY1eC EpVg== X-Gm-Message-State: ACgBeo2WYoyJhfptd8t0wlALfkjXrFUhR2J6PZUJl8t6UnICenbKi78M wDPoJs3dXukSbOnAp60y1XLBO4hSOG5ORQ79 X-Received: by 2002:a7b:cd11:0:b0:3a8:3f6c:9abf with SMTP id f17-20020a7bcd11000000b003a83f6c9abfmr13552375wmj.30.1662459491437; Tue, 06 Sep 2022 03:18:11 -0700 (PDT) Received: from localhost.localdomain ([2a02:8084:a5c0:5a80:ba98:3a71:8524:e0b1]) by smtp.gmail.com with ESMTPSA id y16-20020a05600c365000b003a62bc1735asm14094361wmq.9.2022.09.06.03.18.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 03:18:10 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org Subject: [PATCH v1 21/26] target/s390x: Remove PER check from use_goto_tb Date: Tue, 6 Sep 2022 11:17:42 +0100 Message-Id: <20220906101747.344559-22-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220906101747.344559-1-richard.henderson@linaro.org> References: <20220906101747.344559-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=richard.henderson@linaro.org; helo=mail-wm1-x331.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" While it is common for the PC update to happen in the shadow of a goto_tb, it is not required to be there. By moving it before the goto_tb, we can also place the call to helper_per_branch there, and then afterward chain to the next tb. Signed-off-by: Richard Henderson --- target/s390x/tcg/translate.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index a2315ac73e..e6c7c2a6ae 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -654,9 +654,6 @@ static void gen_op_calc_cc(DisasContext *s) static bool use_goto_tb(DisasContext *s, uint64_t dest) { - if (per_enabled(s)) { - return false; - } return translator_use_goto_tb(&s->base, dest); } @@ -1157,15 +1154,16 @@ static DisasJumpType help_goto_direct(DisasContext *s, int64_t disp) per_branch_disp(s, disp); return DISAS_NEXT; } + + update_psw_addr_disp(s, disp); + per_branch_dest(s, psw_addr); + if (use_goto_tb(s, s->base.pc_next + disp)) { update_cc_op(s); tcg_gen_goto_tb(0); - update_psw_addr_disp(s, disp); tcg_gen_exit_tb(s->base.tb, 0); return DISAS_NORETURN; } else { - update_psw_addr_disp(s, disp); - per_branch_dest(s, psw_addr); return DISAS_PC_UPDATED; } }