From nobody Wed Nov 5 17:25:26 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 1496796384335333.23394430631583; Tue, 6 Jun 2017 17:46:24 -0700 (PDT) Received: from localhost ([::1]:40619 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIP78-0007bb-VK for importer@patchew.org; Tue, 06 Jun 2017 20:46:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOt7-0002cs-Ow for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOt6-0001y1-QU for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:53 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:34055) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOt6-0001xr-Mz for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:52 -0400 Received: by mail-qt0-x244.google.com with SMTP id o21so22861862qtb.1 for ; Tue, 06 Jun 2017 17:31:52 -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.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:51 -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=75bF8NT6LA3g7HaD5RH5HSWYpX6LZ4N25ol7Y9S9TKw=; b=iwJE5d98YLHMQFJ1sKAOmibfi9RoSbtIvdKpeinw4X31x60m5HdSL8PbzBiKBjf+q3 2vLkybgCLQFF4gikDikXnHrnsaP0kKx1WKSwV9NCtxVqs/J+sT6MXuICG/m4RH27pqgf xDkaeLpQ0b3XWttt+vA56zBCMFUcx3Dk4n6lFle0UD3IQlQHIm3kk1L4RKCCvmGFfBoF wy1EZOiUlKCbkXcZqwQWXbysd8i2wzZ6DGkL3mxK83yeXulQ66TSBCMXi7iR5fk15lib ArPc2JTibuJEYWDoeO968HXD4NWhCmzo5q0kKgptyU+FgtYq4ryQLyvJhK2kqQ8yGs+o K1TQ== 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=75bF8NT6LA3g7HaD5RH5HSWYpX6LZ4N25ol7Y9S9TKw=; b=XjrFzaTd037YPUWHhavVroqYR3r27KC9Cppio2K9IKmXf9PKjPXyuHv+JrOOEJfAlF ZIK3Gp1irsMKGC4h2iTCIuRBGZ2yQ2HWDjAgypdybwwAb7+b/AC2A8Jgzh2dL3wuLbrm eneXXori3FUzYy2lk3baQUw8gUf214YiQvhLML6TwimGuEgW75erAxXaHIK47PmfR3O+ 8PqEPUwXE0RT/RwojZHydjCVHfK9s5O77yOrzKbN06pZsn5Bf07gLR5cB8vSJA2PPnBw k088ZYtDy9cEoYvjP3ZKsj4NxoRws5tYJxQ58hBu3i8E5F0q4kRRV6jartKj8kZA7ekG fXAg== X-Gm-Message-State: AKS2vOzgiVOvgOgtWTkQwVrs1N96o53+okhSU4nAsGiMAtYM+AFswyZy TxBHmc/meKccAA4VYKU= X-Received: by 10.237.57.170 with SMTP id m39mr34131995qte.235.1496795512037; Tue, 06 Jun 2017 17:31:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:30 -0700 Message-Id: <20170607003119.14778-22-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::244 Subject: [Qemu-devel] [PULL v2 21/70] target/s390x: Use unwind data for helper_tr 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: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/mem_helper.c | 25 +++++++++++++++---------- target/s390x/translate.c | 1 - 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 0701e10..b37a963 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -723,19 +723,24 @@ void HELPER(unpk)(CPUS390XState *env, uint32_t len, u= int64_t dest, } } =20 -void HELPER(tr)(CPUS390XState *env, uint32_t len, uint64_t array, - uint64_t trans) +static void do_helper_tr(CPUS390XState *env, uint32_t len, uint64_t array, + uint64_t trans, uintptr_t ra) { - 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 new_byte =3D cpu_ldub_data(env, trans + byte); - - cpu_stb_data(env, array + i, new_byte); + uint8_t byte =3D cpu_ldub_data_ra(env, array + i, ra); + uint8_t new_byte =3D cpu_ldub_data_ra(env, trans + byte, ra); + cpu_stb_data_ra(env, array + i, new_byte, ra); } } =20 +void HELPER(tr)(CPUS390XState *env, uint32_t len, uint64_t array, + uint64_t trans) +{ + return do_helper_tr(env, len, array, trans, GETPC()); +} + uint64_t HELPER(tre)(CPUS390XState *env, uint64_t array, uint64_t len, uint64_t trans) { @@ -1265,9 +1270,9 @@ uint32_t HELPER(ex)(CPUS390XState *env, uint32_t cc, = uint64_t v1, get_address(env, 0, b2, d2), 0); break; case 0xc00: - helper_tr(env, l, get_address(env, 0, b1, d1), - get_address(env, 0, b2, d2)); - break; + do_helper_tr(env, l, get_address(env, 0, b1, d1), + 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)); diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 10262f5..e4da94d 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4070,7 +4070,6 @@ static ExitStatus op_tprot(DisasContext *s, DisasOps = *o) static ExitStatus op_tr(DisasContext *s, DisasOps *o) { TCGv_i32 l =3D tcg_const_i32(get_field(s->fields, l1)); - potential_page_fault(s); gen_helper_tr(cpu_env, l, o->addr1, o->in2); tcg_temp_free_i32(l); set_cc_static(s); --=20 2.9.4