From nobody Wed Nov 5 17:30:39 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 149679623708022.159279701121704; Tue, 6 Jun 2017 17:43:57 -0700 (PDT) Received: from localhost ([::1]:40604 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIP4l-0005Td-HS for importer@patchew.org; Tue, 06 Jun 2017 20:43:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33734) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOt6-0002cq-Kb for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOt5-0001xa-JO for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:52 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:34055) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOt5-0001xS-FR for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:51 -0400 Received: by mail-qt0-x242.google.com with SMTP id o21so22861841qtb.1 for ; Tue, 06 Jun 2017 17:31:51 -0700 (PDT) Received: from bigtime.twiddle.net.com (71-217-91-69.tukw.qwest.net. [71.217.91.69]) by smtp.gmail.com with ESMTPSA id m47sm29286qtc.36.2017.06.06.17.31.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:50 -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=mPE2h0S4CZqDOvT20HWH/txbcn+27tcxn2OSy9mwJ2g=; b=HTRJ4E949Zr2IpCH1xlSFcwlrXt02HEfoRTYvAhW/cl1wqSEnGUzMaNAIn0Zl5th/Z UcGl+Vn/IWnv8zbeIZflBAnG+DnK3brzPJSvdFqG14Ej5W9gCcOFYN8rW0XY7JWnTteI uAI1CLwlfgeIQIeZVof5HcBwUdR0Lr+HVp7PEG4YVHhm0rtK+B6PImyX+l8nU9olzNTB y8/WaKNb1OpvB/9OPaFkJw3iP0r3dzxT/GNFINa4bJr7EHD0YI89iuqQLkLMUkaoJ7E1 jRl2NokdjbgERuqXN+G8e4Z8rtztAS9UdSn9bEibM2u9vrKXRBQ8f4t77riWsNFSpBDQ bPYQ== 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=mPE2h0S4CZqDOvT20HWH/txbcn+27tcxn2OSy9mwJ2g=; b=jLAtud2A+gdYi7JZkKmaTooMw0575SASOUyMmQKTJlC2XIquOeD3cDVuObtB4TZkXU rvGlHguk11om4m3LNl5jN5tnOgbjePZz3ik2sAfaYDgS3up0p16tlCtzAgPtcxy9QjwA +BJqAOlSU2j2ppaqr35sNjT5Zv4e+GwTHp/r8WRx9wAtTN9HGzr/3WgWIcL/JqDxcGTv bYO1OYJOe3HS1yihys1wCdIvqfvfADZdDTtuoxttJsmG+Gh8Gt2aSZhytLqqNycE/VxF jejpZRix4RTjtLUrGFgXpEZx73a7DUjyS/LD/v835326xsc5HwqNr3gIpIOi1TktRt90 nqXw== X-Gm-Message-State: AODbwcB18pNqT0PaU1kSB3lcaOBHJjSNOXN+Dn1Remx3mX4L8gn5TQbp QqOHkDNWCBkoKEY7G3Y= X-Received: by 10.237.33.107 with SMTP id 98mr31332865qtc.116.1496795510802; Tue, 06 Jun 2017 17:31:50 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:29 -0700 Message-Id: <20170607003119.14778-21-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170607003119.14778-1-rth@twiddle.net> References: <20170607003119.14778-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PULL v2 20/70] 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 40965ea..10262f5 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4099,7 +4099,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