From nobody Wed Nov 5 18:39:28 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 1496598434126518.4384699714578; Sun, 4 Jun 2017 10:47:14 -0700 (PDT) Received: from localhost ([::1]:57877 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZcO-0001Qj-Hb for importer@patchew.org; Sun, 04 Jun 2017 13:47:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZRL-0007Yk-Ck for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHZRJ-00039w-Dx for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:47 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:35775) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHZRJ-00039V-7L for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:45 -0400 Received: by mail-pg0-x241.google.com with SMTP id f127so7255455pgc.2 for ; Sun, 04 Jun 2017 10:35:45 -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.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 10:35:43 -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=7I79L6I6TpavOVs+f5oRZ4z5nqdnvEqXk7Ftgu/D57o=; b=IXFGCny2hkH1KQekTWy0R3w2IgH7sGmPZhGtuJRDcXUnWWHSVkwlrUA8sRz0wJRGrF PjzE8KOMh2BaItglNuc+aKybhtU4oW3eK4zLdTP6o+vehu905olazOeE/N7O3Nn8M8qb Q+Kgl9ATxWxOh+CknMnqDoixX3OkLW4/fLyu8ioW4fuFN4FfFj6FRpIbib1qeL4sz7Al 4euXMYxgsaPUIEXaIQetZLsj4QooQE5o55E03gQNlmvaqbzkicCSTlMIyx1ztgj69XtR H0rkjHBaRW2aW1IwQAtjRzyNaXPtnejyAE7QSVNckSue7VB4vC6/FFrosqzaUGC1190b eHiQ== 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=7I79L6I6TpavOVs+f5oRZ4z5nqdnvEqXk7Ftgu/D57o=; b=egDnZmox+MT7V+xMNJvuR27S2W88V/2zGn+Q6CZp2eoXJAR7GzBCNXpoSAocB81IRg sQLcdq01ekDGeYP/gVMIoQAr5iLGGgvPQcMyuxpmqPX8SI6Vt3r7j3mNvkITtEpvs3Nv gQgSpCs8wJTqPDhQfkRAJCAa+168f1mHxKni0/HpVKopLrMqzWJpLqt2Wq4abi6IW+yX PzvS9mBTbssVV0/d9DlQqZHtzsO3NGsykm8bPj7h8TmlIrKm8H/Xvy7G7hVMT6qKlPg0 vtLEHIiorysrlGYNUZg9sESbYz9LFsCRj9/MuLH/W89q9nM117Yf+jUvJFhRoJne+3BI 5i1A== X-Gm-Message-State: AODbwcDV5EzS1dAODyinbK16hNqwuBIMaPv6wPu7h6eX86LHz4WAjhTh nwMRvfeJ18X6mBhY9IM= X-Received: by 10.84.215.23 with SMTP id k23mr10879646pli.104.1496597743884; Sun, 04 Jun 2017 10:35:43 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 10:34:23 -0700 Message-Id: <20170604173509.29684-24-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:c05::241 Subject: [Qemu-devel] [PULL 23/69] target/s390x: Use unwind data for helper_trt 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 | 28 ++++++++++++++++------------ target/s390x/translate.c | 1 - 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index fd6dbf7..ff12777 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -781,25 +781,29 @@ uint64_t HELPER(tre)(CPUS390XState *env, uint64_t arr= ay, return array + i; } =20 -uint32_t HELPER(trt)(CPUS390XState *env, uint32_t len, uint64_t array, - uint64_t trans) +static uint32_t do_helper_trt(CPUS390XState *env, uint32_t len, uint64_t a= rray, + uint64_t trans, uintptr_t ra) { - uint32_t cc =3D 0; - int i; + uint32_t i; =20 for (i =3D 0; i <=3D len; i++) { - uint8_t byte =3D cpu_ldub_data(env, array + i); - uint8_t sbyte =3D cpu_ldub_data(env, trans + byte); + uint8_t byte =3D cpu_ldub_data_ra(env, array + i, ra); + uint8_t sbyte =3D cpu_ldub_data_ra(env, trans + byte, ra); =20 if (sbyte !=3D 0) { env->regs[1] =3D array + i; - env->regs[2] =3D (env->regs[2] & ~0xff) | sbyte; - cc =3D (i =3D=3D len) ? 2 : 1; - break; + env->regs[2] =3D deposit64(env->regs[2], 0, 8, sbyte); + return (i =3D=3D len) ? 2 : 1; } } =20 - return cc; + return 0; +} + +uint32_t HELPER(trt)(CPUS390XState *env, uint32_t len, uint64_t array, + uint64_t trans) +{ + return do_helper_trt(env, len, array, trans, GETPC()); } =20 void HELPER(cdsg)(CPUS390XState *env, uint64_t addr, @@ -1275,8 +1279,8 @@ uint32_t HELPER(ex)(CPUS390XState *env, uint32_t cc, = uint64_t v1, get_address(env, 0, b2, d2), 0); return cc; case 0xd00: - cc =3D helper_trt(env, l, get_address(env, 0, b1, d1), - get_address(env, 0, b2, d2)); + cc =3D do_helper_trt(env, l, get_address(env, 0, b1, d1), + get_address(env, 0, b2, d2), 0); break; default: goto abort; diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 447ba07..fed9f17 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4082,7 +4082,6 @@ static ExitStatus op_tre(DisasContext *s, DisasOps *o) static ExitStatus op_trt(DisasContext *s, DisasOps *o) { TCGv_i32 l =3D tcg_const_i32(get_field(s->fields, l1)); - potential_page_fault(s); gen_helper_trt(cc_op, cpu_env, l, o->addr1, o->in2); tcg_temp_free_i32(l); set_cc_static(s); --=20 2.9.4