From patchwork Sat Jul 2 06:02:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 586525 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5036:0:0:0:0 with SMTP id e22csp2075748mab; Fri, 1 Jul 2022 23:08:02 -0700 (PDT) X-Google-Smtp-Source: AGRyM1um214Vh/KdXtiH8lDiqSbgYw7vGtSWcBJ3bkxcqTxEukqmQETykd1lkTzzlEzSYOMlWjUd X-Received: by 2002:a25:9901:0:b0:651:e25e:febe with SMTP id z1-20020a259901000000b00651e25efebemr18858417ybn.58.1656742082054; Fri, 01 Jul 2022 23:08:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656742082; cv=none; d=google.com; s=arc-20160816; b=B6WH63OayP2u7VXGujomM/+JclEnMHS+RB7LMKK3kEOEOWNEncPMGH5vJTWBE6Ow0f 4lq03aFQgOG2xlz4Fp7GlmHPNUb9JGcnf4G99iaPwuA9FgUfzOL501zVZH+SbTTqIXbm +u7EhktvbnN77Qb5L8vQtnmn6KtfIcLKj0j4+TrgCtVSDF2bnvaLSHLnf1QtwNrGNLiq nn/qw4K2G4QJeelui7TAaJU/6khF+ikHMzMl8w3S9Tz+9JhYoArvcY1aQtmwaGEblMKD TRMiZMHR4xSbWLv8vLMTTXROd+ZTiEkM+4UotthQzKe3rKr1L3VpVVneqArGp9adNVaI h81Q== 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=Vr0uT7qqfwuP7HuZnNZDuuWBaqMj6lUxoak84Ik4zME=; b=QlDbsETHi3dC3GAeboWMkIedYVnIgX3beswBd/Wk0QAK4Wtsa6hIdL/xSSKEMjH/bi 0TZA/VTJtEpKEiNTqBxoqc0+qfVBKZBhA2YifOFbJ7hDsn6iS1bymM4rYHKFdOtcnQnI 2jrtIlj142dY1sQCJG5qmEi5l2g+UoJMoOvpbvbwK2JMmJ/5rifdCTT3MzOxtDRUSguI 4sRLmXqIQJHF5nCR1jkZVtSK+0udJYCm58AW8RRC9VS30ZzPJyDUzHqMObgRKtVD9kWX JyA/eG5CryoGEDjcUpARPed6m+9kRhj83imwjt4ySnJzy5302U5Dmf7sZwPfEXFLdmhW 79/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hGmD0boh; 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 m75-20020a25d44e000000b0066c810fc792si37419378ybf.369.2022.07.01.23.08.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 01 Jul 2022 23:08:02 -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=hGmD0boh; 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]:34956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o7WIT-0007Ld-Jt for patch@linaro.org; Sat, 02 Jul 2022 02:08:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o7WDM-0002vg-DR for qemu-devel@nongnu.org; Sat, 02 Jul 2022 02:02:44 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:43569) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o7WDJ-0004rd-M5 for qemu-devel@nongnu.org; Sat, 02 Jul 2022 02:02:44 -0400 Received: by mail-pf1-x431.google.com with SMTP id 136so4278044pfy.10 for ; Fri, 01 Jul 2022 23:02:41 -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=Vr0uT7qqfwuP7HuZnNZDuuWBaqMj6lUxoak84Ik4zME=; b=hGmD0bohoC0VPo05P9u4ltrv9bFX/2yzR7lgsy3Cx/rfF1EnpblQ6OCtXA8bkQ+1Jb cmaV9tAW+yYXZfwPjjG3PER12WJ80DgSxD9IX5Jhab7aYkj9/QbRXaH7JWqIjZWoZsuk FOakitBVCE8H6ecr0uOsItQb9gMH4GF3rzfcFoaeR2qNkxaKdFc0DUgQP1fC5qPpg31l dUeNGcwLEBfl7ScxywsNzOmGgWPDsYUOO2JPxd/TJKXfGZEg4M9pjmw8pnu2beumwzb/ /vKUMRmTdSen9saUOyTBOtOfTRH5CRQvWZAccd3sJYGQ7sLsNBUDzxjfuIU7BCOwWGl9 Fxlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Vr0uT7qqfwuP7HuZnNZDuuWBaqMj6lUxoak84Ik4zME=; b=PH7hgiqGWLOefaC0sRrCVCZSxbjVGhenJJBFYQCGGxY1iGcEyldioK5gk69ySkUK6v O+0yN+3enn6oD2+XTVQNO3OEDAcJ4X1ITzLzb4i3YzNv+miIIQt6Beuxflu60XTANcBZ btmNM1AaGDRy8x+bh4BDvwsdsOXuxAOKP7sd8Pg1i7NhbEol1+APJQaIEoWZCw9O4bec keu5lbf/iLBBdMVm66H31CDsZtT0PkoVOufBG7yi+noRos3uSWLz5dSBP/hTkFkQwfQn FehiW9P8Gv5Hoq7qvJkoVRp9kCP3DbOvcoWLz4GT7AekcPI5Fe+4f8ViwKvyy2ywj5co qQVw== X-Gm-Message-State: AJIora/sKjWOv2ZV7jW089IN0Q3NJoA6tCxmx7ZB97diw9uy2g0ZKr7L QDL46mu0/vqnxDloOwuEiuhzRryEkneM/GNR X-Received: by 2002:a63:d751:0:b0:401:9f40:3fcb with SMTP id w17-20020a63d751000000b004019f403fcbmr15373268pgi.311.1656741760085; Fri, 01 Jul 2022 23:02:40 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id z2-20020a17090a66c200b001ece55b938asm5232178pjl.32.2022.07.01.23.02.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Jul 2022 23:02:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: svens@linux.ibm.com, qemu-s390x@nongnu.org Subject: [PATCH v2 2/4] target/s390x: Remove DISAS_PC_STALE Date: Sat, 2 Jul 2022 11:32:26 +0530 Message-Id: <20220702060228.420454-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220702060228.420454-1-richard.henderson@linaro.org> References: <20220702060228.420454-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::431; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x431.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=unavailable 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" There is nothing to distinguish this from DISAS_TOO_MANY. Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand --- target/s390x/tcg/translate.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index e38ae9ce09..a3422c0eb0 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -1126,10 +1126,6 @@ typedef struct { /* We have updated the PC and CC values. */ #define DISAS_PC_CC_UPDATED DISAS_TARGET_2 -/* We are exiting the TB, but have neither emitted a goto_tb, nor - updated the PC for the next instruction to be executed. */ -#define DISAS_PC_STALE DISAS_TARGET_3 - /* We are exiting the TB to the main loop. */ #define DISAS_PC_STALE_NOCHAIN DISAS_TARGET_4 @@ -3993,7 +3989,7 @@ static DisasJumpType op_sacf(DisasContext *s, DisasOps *o) { gen_helper_sacf(cpu_env, o->in2); /* Addressing mode has changed, so end the block. */ - return DISAS_PC_STALE; + return DISAS_TOO_MANY; } #endif @@ -4029,7 +4025,7 @@ static DisasJumpType op_sam(DisasContext *s, DisasOps *o) tcg_temp_free_i64(tsam); /* Always exit the TB, since we (may have) changed execution mode. */ - return DISAS_PC_STALE; + return DISAS_TOO_MANY; } static DisasJumpType op_sar(DisasContext *s, DisasOps *o) @@ -6562,13 +6558,13 @@ static DisasJumpType translate_one(CPUS390XState *env, DisasContext *s) /* io should be the last instruction in tb when icount is enabled */ if (unlikely(icount && ret == DISAS_NEXT)) { - ret = DISAS_PC_STALE; + ret = DISAS_TOO_MANY; } #ifndef CONFIG_USER_ONLY if (s->base.tb->flags & FLAG_MASK_PER) { /* An exception might be triggered, save PSW if not already done. */ - if (ret == DISAS_NEXT || ret == DISAS_PC_STALE) { + if (ret == DISAS_NEXT || ret == DISAS_TOO_MANY) { tcg_gen_movi_i64(psw_addr, s->pc_tmp); } @@ -6634,7 +6630,6 @@ static void s390x_tr_tb_stop(DisasContextBase *dcbase, CPUState *cs) case DISAS_NORETURN: break; case DISAS_TOO_MANY: - case DISAS_PC_STALE: case DISAS_PC_STALE_NOCHAIN: update_psw_addr(dc); /* FALLTHRU */