From patchwork Thu Jul 7 07:54:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 588108 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:bb16:0:0:0:0 with SMTP id jd22csp327989mab; Thu, 7 Jul 2022 01:17:09 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sn47fTYRpl0QDmi5UPeduKqLYy91fXr/hv/e7CW0/M5nlTOmKzkrLp+2JM3AdipGwr25H/ X-Received: by 2002:ad4:5dcb:0:b0:470:46eb:3a1c with SMTP id m11-20020ad45dcb000000b0047046eb3a1cmr41748161qvh.69.1657181829160; Thu, 07 Jul 2022 01:17:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657181829; cv=none; d=google.com; s=arc-20160816; b=S/4bLa3DtAuZevpFxKfGyGgSeyPwmfXQ4JSI5CYQqmpNNwg/YRabI9zm/zeYW5zRoT TVac7CuFW5HCXjvPN2SArBIhsvmx0dsvurn08dkXzhHC4tmBH15VsbVuTd3XSyYgqQLY 4MhJgpMQjuk8YcEeZvP4GX15Ke80uAK+ZNRELYjN4Z7i/JaujpOeYyNMXvJiI5k3uS87 HnOJbfnzm3c00ajGRQsfCmeP39BEYX8UkQ36ENMQQGUQ8/ueBtahDlvFVV53HNKVuAes IV2wlhcX/AwjDADyXE+a8dRYvs6D/l7yR6HjSms/HlOdi4walNBiJGvee3L7AkizXJxK CUEg== 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=5wL0hgUDAenXher0J65sDriO5cdDWQ+loZqkbDpxz3s=; b=EAaREkwcXmSztCZLXVQV3TxWmXuvUduD7DZwk2UwMy1iiz2NJDwZL+ioOtPeVCToho DsDaSUnkZg6M4zOzlcnTXKmTLWO3sTo98YaxrU0X58coAYkIsW+jLWibxoNcGXhw6pKO C7mIu1P42obtnnTSBie9ZGAUN5IXefSvIIwId0ZWP6a8jUJAsOvhiyKLttTGwsN2JiXc BsHFvO6d0HjwjcftQ50ZtmyEWOwmCvwdB7CpdjpVpRv0ZeJDPdf/YpXv6gDU5ykvZMej KV49qmKZkTokwpOMbM0H5Y9b+9GUNvLk61RB88Gzh1wJ2owgBpTkif6etJyjkBlIV201 sLSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=g3dzi84H; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t11-20020a05622a180b00b0031e9aef5cfesi598106qtc.434.2022.07.07.01.17.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Jul 2022 01:17:09 -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=@redhat.com header.s=mimecast20190719 header.b=g3dzi84H; 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=redhat.com Received: from localhost ([::1]:50962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o9MhA-0000Zv-P1 for patch@linaro.org; Thu, 07 Jul 2022 04:17:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9MM0-0003ZL-2m for qemu-devel@nongnu.org; Thu, 07 Jul 2022 03:55:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24315) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o9MLu-0007b7-LB for qemu-devel@nongnu.org; Thu, 07 Jul 2022 03:55:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657180510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5wL0hgUDAenXher0J65sDriO5cdDWQ+loZqkbDpxz3s=; b=g3dzi84Hf7IsVfdu8b6XSc2adtwEyYz7yjiHDJMWK/ixIFmx+6haob9D+hm/k1YtXkpT0E caUh/M4XJmcK6keNKsYORWvk4SXLZFY6g+dIl1QCa7M+LGLjinU/KvnClmHHRLtmSoZhWS HGOWjgGtOx0qsqQBh4tZmrt2VaFE590= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-296-PrxLpx16OZqbbqmIZ3NGbg-1; Thu, 07 Jul 2022 03:54:56 -0400 X-MC-Unique: PrxLpx16OZqbbqmIZ3NGbg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 12B6685A582; Thu, 7 Jul 2022 07:54:56 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.84]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0ACBB40CF8E5; Thu, 7 Jul 2022 07:54:54 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: qemu-s390x@nongnu.org Subject: [PULL 16/18] target/s390x: Remove DISAS_PC_STALE Date: Thu, 7 Jul 2022 09:54:24 +0200 Message-Id: <20220707075426.1163210-17-thuth@redhat.com> In-Reply-To: <20220707075426.1163210-1-thuth@redhat.com> References: <20220707075426.1163210-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, 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" From: Richard Henderson There is nothing to distinguish this from DISAS_TOO_MANY. Signed-off-by: Richard Henderson Message-Id: <20220702060228.420454-3-richard.henderson@linaro.org> Signed-off-by: Thomas Huth --- 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 */