From nobody Mon Feb 9 04:46:40 2026 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 1495654413322239.41412381977364; Wed, 24 May 2017 12:33:33 -0700 (PDT) Received: from localhost ([::1]:56492 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDc2F-0003Mu-Tn for importer@patchew.org; Wed, 24 May 2017 15:33:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45461) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDbsQ-00021P-7E for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDbsP-0001XY-7Z for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:22 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:34237) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dDbsP-0001We-1N for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:21 -0400 Received: by mail-qt0-x244.google.com with SMTP id l39so27575051qtb.1 for ; Wed, 24 May 2017 12:23:20 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id b23sm3296240qkb.31.2017.05.24.12.23.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 12:23:20 -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=kRuMj6zbSr/1GhM+MvOtCLdzqYBcDbB13Mk9fjoAPnFJPiJHMcaa7fFjHUgoqY+/Mu 7TXtQWPyYOY3fW/RrGWIXslAU6pZPZR4IhgSt2ZHJxewG+BUh/w9IC6Z3XmKTw8MMu/m YG3em2Vm+fLFy7biLXsec6+BilIPJK8GUb+deQyKCjnU/fjiOkmOqbhZ3usK6TLWAahb 6BuGcSnlI0Yc/dgqAFb+6X+j/3EMotTDujqKg+0OsElVJjBI2t7yWQh6tOk94AZiLmOc ArmZD3XzSzzRvs3NiMd17bGsz7FLpg0pYDWSvjPNJMOcNtLAvedg8ISqPBOiLEAWGtHc 9teA== 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=JnUSfw68zrr9rII4bn8z4Jg5p1oeb/+S+nxNi7Oregn5677u6p4cqE+1LevE8luP/u IpuZVB/5hOAc23wNOVBQHm3bFu2AdBPyunqN2UrGgsNBD1swIWlqjnd4umNUaRZ1vjwN qc9ymYlPObdzmw1RANDfWH84PnVBC8QW7L9v046EGJq/AHrhhjTbXA9cgaLzL4f4BZxp 4MA7CzVcaYwfomHxDGF+JGpvL44FBge6N8nEVdM+qfTRzPZWLQzv1oMVnWSGKO5ue9l3 JnXbXxs3OjRFMCEPj51QWi7wr7r/hwlthxrgKnNb0Hp1eKYX0DDHebNpP/mXAZuoSa6x BWcQ== X-Gm-Message-State: AODbwcBVWJBfsb+BdSEeDFOIOcHaWQgSxLFoWLVN50+N7n8kS7KUqxbs BiDJWhk7WM+4yQ== X-Received: by 10.200.52.221 with SMTP id x29mr36579364qtb.70.1495653800627; Wed, 24 May 2017 12:23:20 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 24 May 2017 12:22:35 -0700 Message-Id: <20170524192246.15905-23-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170524192246.15905-1-rth@twiddle.net> References: <20170524192246.15905-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::244 Subject: [Qemu-devel] [PATCH v2 22/33] 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: thuth@redhat.com, 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