From nobody Wed Nov 5 18:23:07 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1496598299207308.85450632497304; Sun, 4 Jun 2017 10:44:59 -0700 (PDT) Received: from localhost ([::1]:57866 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZaD-0007t5-PY for importer@patchew.org; Sun, 04 Jun 2017 13:44:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZRF-0007T2-RL for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHZRF-00034M-0R for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:41 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:35037) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHZRE-000335-Qn for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:40 -0400 Received: by mail-pf0-x241.google.com with SMTP id u26so18118824pfd.2 for ; Sun, 04 Jun 2017 10:35:40 -0700 (PDT) Received: from bigtime.ASUS (cpe-98-155-27-246.hawaii.res.rr.com. [98.155.27.246]) by smtp.gmail.com with ESMTPSA id j191sm52854419pgc.53.2017.06.04.10.35.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 10:35:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=eTzekCYHqAkrjY8gv7bsRN3sPl4ig5ZZ5RSPrbUBMmg=; b=Lx7jShTFo8ZmHMgAfb7+hDqVEjmXujZOcN0inXxKhunn/cRbDsAoDB5klAr7EQwkTE piRAqzR/xoEtLjiuuZx/aP0RXxZbD6k/scLX3D22XdimcIQHQK+MH0JYzj3ktJWifyIf Ju3GyHpB0l6CWCpBToe1sydgUzKsW0/FeXgfGqz/HiHmsa89D25pP8Qlg1o7FAZGmDuL eReFSNJSLRkI4UdSrX+vQ2Un2cjTm72mXU3kKPgKGXD92cvT9ppvOG5JJWy1uQeFEQjy VhEVsteQxLroKWDX1+RFpv6NVvCk+6qvbA1BxFZ/t5rCoPB8zId0t52k9+wXwTHH0YZX 0I+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=eTzekCYHqAkrjY8gv7bsRN3sPl4ig5ZZ5RSPrbUBMmg=; b=EP0nB05uqafJHptm9d4UapaU+ZtGbg52fVffWzngOFT62QUIk58vn7cb+JpZE4VWj5 6dJ7nrwaOGyNx0+y6n5uAdYctOzmGc9ShyF0kkRe/QZftyyfEkhx5vOID1BljjgvIGlI B9u7WpGxXPn4JHktaNgUByrPakFVF5ZPbIvlVEDnN19ee5QTTj1a0blu4yQais9XF0+c qUT5NYn6TOVTnz5YR47RUm0aFBiwamRZ0TjzoRFmweGZRBpPHYta/WdwKSWtbttW2r0C oLi2LzaxXbWV7SUkifSrYppFw2qy9/7nMVd2zgfKXDxXOZOWesBgnLE6/XqpUK36O1nS z2FA== X-Gm-Message-State: AODbwcA7QIw1sosvPuI63H6Rad3oai9YOvjAIEcUUBiXl7rnOZHcTjor 81d+JB6q4z10fTFUimQ= X-Received: by 10.98.151.2 with SMTP id n2mr16597278pfe.29.1496597739770; Sun, 04 Jun 2017 10:35:39 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 10:34:20 -0700 Message-Id: <20170604173509.29684-21-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170604173509.29684-1-rth@twiddle.net> References: <20170604173509.29684-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PULL 20/69] target/s390x: Use unwind data for helper_unpk X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Reviewed-by: Thomas Huth Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/mem_helper.c | 9 +++++---- target/s390x/translate.c | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index d4ee364..0701e10 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -679,6 +679,7 @@ uint64_t HELPER(cksm)(CPUS390XState *env, uint64_t r1, void HELPER(unpk)(CPUS390XState *env, uint32_t len, uint64_t dest, uint64_t src) { + uintptr_t ra =3D GETPC(); int len_dest =3D len >> 4; int len_src =3D len & 0xf; uint8_t b; @@ -688,8 +689,8 @@ void HELPER(unpk)(CPUS390XState *env, uint32_t len, uin= t64_t dest, src +=3D len_src; =20 /* last byte is special, it only flips the nibbles */ - b =3D cpu_ldub_data(env, src); - cpu_stb_data(env, dest, (b << 4) | (b >> 4)); + b =3D cpu_ldub_data_ra(env, src, ra); + cpu_stb_data_ra(env, dest, (b << 4) | (b >> 4), ra); src--; len_src--; =20 @@ -699,7 +700,7 @@ void HELPER(unpk)(CPUS390XState *env, uint32_t len, uin= t64_t dest, uint8_t cur_byte =3D 0; =20 if (len_src > 0) { - cur_byte =3D cpu_ldub_data(env, src); + cur_byte =3D cpu_ldub_data_ra(env, src, ra); } =20 len_dest--; @@ -718,7 +719,7 @@ void HELPER(unpk)(CPUS390XState *env, uint32_t len, uin= t64_t dest, /* zone bits */ cur_byte |=3D 0xf0; =20 - cpu_stb_data(env, dest, cur_byte); + cpu_stb_data_ra(env, dest, cur_byte, ra); } } =20 diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 76910bc..4978f19 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4094,7 +4094,6 @@ static ExitStatus op_trt(DisasContext *s, DisasOps *o) static ExitStatus op_unpk(DisasContext *s, DisasOps *o) { TCGv_i32 l =3D tcg_const_i32(get_field(s->fields, l1)); - potential_page_fault(s); gen_helper_unpk(cpu_env, l, o->addr1, o->in2); tcg_temp_free_i32(l); return NO_EXIT; --=20 2.9.4