From patchwork Thu May 2 05:44:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 794101 Delivered-To: patch@linaro.org Received: by 2002:adf:a153:0:b0:34d:5089:5a9e with SMTP id r19csp78376wrr; Wed, 1 May 2024 22:47:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW5O2sOI0efYNlQyWnUCcQuNR2TbXe4H0HJMvyQpAhWX13Vv1Zyjjino5MbawRKCn6g/eXx0Iy00xQ5luLvXtoF X-Google-Smtp-Source: AGHT+IEWRlI1fBynWK2f/aW74/kenCiRdUjuGF4+JgP9jf1vNmnkqE06qjUyQufxF3JTXKHLNFv9 X-Received: by 2002:ac8:5782:0:b0:43b:1546:f899 with SMTP id v2-20020ac85782000000b0043b1546f899mr4940714qta.12.1714628860103; Wed, 01 May 2024 22:47:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714628860; cv=none; d=google.com; s=arc-20160816; b=nUY72v/QtZ/RZvQBbFPPpbOAafsjbxDsqn30FeKH/ogmXSSEqbpNfXI8Jyu0RbGeEK vJvug6vra9Wt44cvLxkpGx4D2x6H7+ohFrfi62kAa92n2MWugLhV5BfmMDD3uhugTy/h hA/Hwq/rrWokID65qjv6dT2WpeTnrm6b8aL7eg/HOup9YnA0Bt3HMS6cfl1qpvNS+Ga8 RGF6j+ANpJe1V1P6PR6rvFUcvbmD/WnKNP8LI98uCpYIBe+n5frAJlMKOOO7ngRqQphl xueR3jkMPZqeCI2gizEHkMhvaCxFh/K9yZtJCROiqqDXHXIKZyRfwW7VAdKxzvxMbpd7 ynDw== 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=Vaaa9XarhFGZUE0t2SjhtfY2cRwW+ttdC8tie4SkVgY=; fh=vvIHVEExtoxBacLa1w/xvEOdET6IjbTxlMJ0GExg4HQ=; b=RirXOdn0dCKZPZEK2uubL4TgadmzUMxLk+QSnEOmvjCKYaf6jHYdxVG1f1JDQLXNyo mr1CZoIMn27AME5Q+ReIB56SNZ3aLTOg1G9pkbplI41N8jnMIdWj4en/L3+7xDdkjnyX KnBG62mebwBTwQ0W5ln4+ruUnQG0r9mYRT1xgGP3Ltca7cxi63vbx90SGB08Zq/mNUdK d4C+abNdQCgpxibaswfXKTU0hzEediNo0Nsfx5CxnFD+xouZvJD5YnwGiiI0VFly+ghI z5Q3c5ow/cyUAlYUfb7XIMi0Ml8RQUZGRq1DxZ/cEIp+g3XOti9Rw/Qyx14wBsgSDUN8 TElg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=C8fpeXoM; 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 y12-20020ac85f4c000000b0043adede73aasi273634qta.656.2024.05.01.22.47.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 May 2024 22:47:40 -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=C8fpeXoM; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s2PFP-00005e-09; Thu, 02 May 2024 01:44:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s2PFD-0008Oj-JR for qemu-devel@nongnu.org; Thu, 02 May 2024 01:44:36 -0400 Received: from mail-oo1-xc34.google.com ([2607:f8b0:4864:20::c34]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1s2PF7-0002dX-ME for qemu-devel@nongnu.org; Thu, 02 May 2024 01:44:35 -0400 Received: by mail-oo1-xc34.google.com with SMTP id 006d021491bc7-5aa20adda1dso4763077eaf.1 for ; Wed, 01 May 2024 22:44:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1714628668; x=1715233468; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Vaaa9XarhFGZUE0t2SjhtfY2cRwW+ttdC8tie4SkVgY=; b=C8fpeXoMjFJB/YbKrn0M8KsZ0g36rwW/3kpBh3nio2eouoJhUp4DJqRuY8DXiBb6ud gTZ+rezNj4K+ytgNmPcbKYHcWeL+M5wFXtxSGMt0XBM8BP8R96jfV1NyhWE1gB/F8Xs/ W01x5T5ItSuRqfwKjCrUbVrVc+8HhH5HC8XWXGjoy33793sFQKn7S/DuWi5mM/Xk/uTM t+cWbz1CsenUuwTeAyuN1+hgpY+DQoqLpJH8alLpJmcUxZiAgRknfYz/DABr4DWK1SV+ ifnB/O1YeLqNIh4rzuXqqSshd6VqwfF5Ht362YYsMaiz3A2gkp4hlwOf4zg/N0hjdkus Naxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714628668; x=1715233468; 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:message-id:reply-to; bh=Vaaa9XarhFGZUE0t2SjhtfY2cRwW+ttdC8tie4SkVgY=; b=Dsj6Gis1wZWnSkFb2Fl8iUd863vTIVev7dv9xiMrN4pcaEE4zhJ4k3/CpTPNjp253P pSQRLTKRrcSi/R4Yx58YWr083AgB6UYXEqozu1PxaBxep5I9D/UasrVj1sPsvr4utzOZ qArdYS/qO32J2nM5gVHdU4mue4DHmhJF8Fm20hNL7maOnaYpqiw/cJrYU+BRtTojRoNZ 8L4JlMx6pWj6N8w+Ly1qwIfZP9p+vqNPTTkWGYiHB1TrYCQZR8UNpE/yNGF21g7K85c8 YXEH51bOB6OanHcWxlZOHgVQ+1c9dNZglv34ASkiI2OwpcIIXFwECC+cej4FM8TtTXk3 5Quw== X-Gm-Message-State: AOJu0Yztk33avNdicblNoB01HxInzJozS6kW0MI8OY9e7FiPA82eH4bp qVyse1TiMiKd0eU2RqQtpvBBocADD748aiiIGd5nxm6ttF7PM7xBjsZzKKpV1KhI5l0QKmw2ya4 s X-Received: by 2002:a05:6358:2799:b0:17e:f422:5e48 with SMTP id l25-20020a056358279900b0017ef4225e48mr5188538rwb.13.1714628667845; Wed, 01 May 2024 22:44:27 -0700 (PDT) Received: from stoup.. (174-21-72-5.tukw.qwest.net. [174.21.72.5]) by smtp.gmail.com with ESMTPSA id e18-20020a656492000000b006089cf2cde5sm294401pgv.26.2024.05.01.22.44.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 May 2024 22:44:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, iii@linux.ibm.com, david@redhat.com, thuth@redhat.com Subject: [PATCH 08/14] target/s390x: Split per_breaking_event from per_branch_* Date: Wed, 1 May 2024 22:44:11 -0700 Message-Id: <20240502054417.234340-9-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240502054417.234340-1-richard.henderson@linaro.org> References: <20240502054417.234340-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::c34; envelope-from=richard.henderson@linaro.org; helo=mail-oo1-xc34.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=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-bounces+patch=linaro.org@nongnu.org The breaking-event-address register is updated regardless of PER being enabled. Reviewed-by: Ilya Leoshkevich Signed-off-by: Richard Henderson --- target/s390x/tcg/translate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target/s390x/tcg/translate.c b/target/s390x/tcg/translate.c index e77660ee50..a384192d15 100644 --- a/target/s390x/tcg/translate.c +++ b/target/s390x/tcg/translate.c @@ -346,8 +346,6 @@ static void update_psw_addr(DisasContext *s) static void per_branch(DisasContext *s, bool to_next) { #ifndef CONFIG_USER_ONLY - tcg_gen_movi_i64(gbea, s->base.pc_next); - if (s->base.tb->flags & FLAG_MASK_PER_BRANCH) { TCGv_i64 next_pc = to_next ? tcg_constant_i64(s->pc_tmp) : psw_addr; gen_helper_per_branch(tcg_env, gbea, next_pc); @@ -1083,13 +1081,13 @@ struct DisasInsn { static DisasJumpType help_goto_direct(DisasContext *s, uint64_t dest) { + per_breaking_event(s); if (dest == s->pc_tmp) { per_branch(s, true); return DISAS_NEXT; } if (use_goto_tb(s, dest)) { update_cc_op(s); - per_breaking_event(s); tcg_gen_goto_tb(0); tcg_gen_movi_i64(psw_addr, dest); tcg_gen_exit_tb(s->base.tb, 0); @@ -1103,6 +1101,7 @@ static DisasJumpType help_goto_direct(DisasContext *s, uint64_t dest) static DisasJumpType help_goto_indirect(DisasContext *s, TCGv_i64 dest) { + per_breaking_event(s); tcg_gen_mov_i64(psw_addr, dest); per_branch(s, false); return DISAS_PC_UPDATED; @@ -1161,6 +1160,7 @@ static DisasJumpType help_branch(DisasContext *s, DisasCompare *c, } /* Branch taken. */ + per_breaking_event(s); if (is_imm) { tcg_gen_movi_i64(psw_addr, dest); } else {