From nobody Wed Nov 5 17:23:38 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 1496796384952250.81391376324575; Tue, 6 Jun 2017 17:46:24 -0700 (PDT) Received: from localhost ([::1]:40621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIP79-0007cs-GB for importer@patchew.org; Tue, 06 Jun 2017 20:46:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33819) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOtC-0002hy-Mv for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOtB-00020A-PD for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:58 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:33776) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOtB-0001zv-Ll for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:57 -0400 Received: by mail-qk0-x243.google.com with SMTP id c206so15445036qkb.0 for ; Tue, 06 Jun 2017 17:31:57 -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.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:56 -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=hIr7Vxi0+LOwmFvkRW2SNgHOuHOhgdRi91E28ZqpajA=; b=jwfyg/+Rzx9yMh4ayZ0/PpZ3IdkstYu4XP85UsDRj8em/K+LMaxg45AGipdtxvnsN7 JdYgsTn1ahQQDd9p2WK6xkooiJjnzqyCUkILTsqUblXvJ8FnuX5KAsjOJt5/q9vYIVI1 k4b78wa/AbaiFusf1OQjzpnPoXYMN47NCvRtcb9DXUgDlzKw+dxsBhmdVBgIlEKTlxkG kR6eGi2X0/1RoG8+/ERbDduITJBS5cc5rdqxHP9WgWnnfgCneEiqPe2z8VG70k1gSOm2 KnraasVO/tQNab48wSlPKk03H+/xJz12QzBSfuLo+3//0lItaU/4zl/OOujuowjLoQGd 7H6A== 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=hIr7Vxi0+LOwmFvkRW2SNgHOuHOhgdRi91E28ZqpajA=; b=t6i9I25TNaWwPy/kFD+lvWBoNI1tHhdUAFeH5UWCmCb5hMQoZaKx29QKUT6/DYpozI bxzf0M80Lr3KxbRqNs5UwLnQe1Ra4wAg8HnDS4BzqtM58w29hmCAdSHDFdJAANB5zmy4 FC9RPb06AAirl+9rKnHPQ9FQ7xrOVX7frdzzqmOQyJCDMdo9Fj1WHVAL0ffwppwlNUgG N0IhfcxkRGgDcj0q+aFyAJVqZfa5JBQ2eoD7tyFi2l4Zt4QdWlfLQmRpM49VYfNkdKTW Hj8qBentJV5lNgNIQdAN6SkxwdoxplrxDDo4wEISoMwkhMVA2ZpaAfNZ3MKm/SzqDhFa A6cQ== X-Gm-Message-State: AODbwcCM6B/z8w3IPVbs6o4Lzg0KziPRjYIItfIYvkAOio61msTqEclj 0Wo1xYEWrUoQ/sHlLqo= X-Received: by 10.55.15.26 with SMTP id z26mr34607814qkg.114.1496795516992; Tue, 06 Jun 2017 17:31:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:34 -0700 Message-Id: <20170607003119.14778-26-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:c09::243 Subject: [Qemu-devel] [PULL v2 25/70] target/s390x: Use unwind data for helper_lctl 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 68e3817..614cdb2 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -878,18 +878,19 @@ void HELPER(lctlg)(CPUS390XState *env, uint32_t r1, u= int64_t a2, uint32_t r3) =20 void HELPER(lctl)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r= 3) { + uintptr_t ra =3D GETPC(); S390CPU *cpu =3D s390_env_get_cpu(env); bool PERchanged =3D false; - int i; uint64_t src =3D a2; - uint32_t val; + uint32_t i; =20 for (i =3D r1;; i =3D (i + 1) % 16) { - val =3D cpu_ldl_data(env, src); + uint32_t val =3D cpu_ldl_data_ra(env, src, ra); if ((uint32_t)env->cregs[i] !=3D val && i >=3D 9 && i <=3D 11) { PERchanged =3D true; } - env->cregs[i] =3D (env->cregs[i] & 0xFFFFFFFF00000000ULL) | val; + env->cregs[i] =3D deposit64(env->cregs[i], 0, 32, val); + HELPER_LOG("load ctl %d from 0x%" PRIx64 " =3D=3D 0x%x\n", i, src,= val); src +=3D sizeof(uint32_t); =20 if (i =3D=3D r3) { diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 2386c41..3a98c57 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2545,7 +2545,6 @@ static ExitStatus op_lctl(DisasContext *s, DisasOps *= o) TCGv_i32 r1 =3D tcg_const_i32(get_field(s->fields, r1)); TCGv_i32 r3 =3D tcg_const_i32(get_field(s->fields, r3)); check_privileged(s); - potential_page_fault(s); gen_helper_lctl(cpu_env, r1, o->in2, r3); tcg_temp_free_i32(r1); tcg_temp_free_i32(r3); --=20 2.9.4