From nobody Wed Nov 5 17:27:09 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 1496796542414362.02738802082774; Tue, 6 Jun 2017 17:49:02 -0700 (PDT) Received: from localhost ([::1]:40627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIP9f-0001oX-PE for importer@patchew.org; Tue, 06 Jun 2017 20:48:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOtB-0002gA-04 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOt9-0001zC-A6 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:56 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:33047) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOt9-0001z6-5n for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:55 -0400 Received: by mail-qt0-x244.google.com with SMTP id w1so26595688qtg.0 for ; Tue, 06 Jun 2017 17:31:55 -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.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:53 -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=7jMqZH0AUbBoyaI0j/CbGflsuclS0yf544JuE1WqlEc=; b=IqCV1SYRlXbSlunRu2Yt7GFIaGQr2OcDm2FCzMkRnHVS9hgUmIVrjg9oEAuebOtMPP CPDIj1O3ztNhlYUEpjOOuh2wfiaoYKS6p8HNoKtBTFqh2WW6BQsmfVU/LSeAhZMZHb32 0ebuVeaMsshOpv4ypW2K2v15ajICAa7LwlYwgL10bJ6KSDWnRwl2WG5TNpvwLTcNYZi7 dH0ZJUbKbzW+8AlALn5VN8OLp5XEMYYAjqi5xHy6D1HBs+CWoPlYKtJltDzu8rnxCYki tInsh83yj4bKwhxMGsoOFyDO2miSlcdgRssO+hdFX87LgYDE/iMV9t1UqVPI/IeYMscp TMng== 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=7jMqZH0AUbBoyaI0j/CbGflsuclS0yf544JuE1WqlEc=; b=WXsJTq/FbBXPQ50kZEvik1oeLec94gqE22ZL8DtQpmo8qlW2AWlLwbj+oHh5ztzGw1 673J2QBqEHXVqQWewbWPZiHvKd5yhRbGbHoLoQ1MShcM+dpJXsqNTOcZ0g5bFcjERcGP wJXTPbaQSo94BDoqlLDTLZqlLlJhf6ipdEpAaPsUMtrnXbh60PIeLqiCmYN2VuQDNl9B 0UNA8D86pnQNOgy/hLZGyeEokfmHcTASWMtRX241qplrSMfJzHv8B+DrDCeogL0ndTAk 8mTvYHW2lOYldjfnETdL7UBHxVlUGrPJHf9/EarhFCnW2JeIMJTUcIR8YKr4CUsRFvmK XUIw== X-Gm-Message-State: AKS2vOwYuQ+AfYd69AxacMSvad3cB33IYIo6Lj8yyUFjt5FkI6YSbdwB jbiiYQUa2R/9X4xEYnc= X-Received: by 10.200.8.169 with SMTP id v38mr30836348qth.213.1496795514499; Tue, 06 Jun 2017 17:31:54 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:32 -0700 Message-Id: <20170607003119.14778-24-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 23/70] 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 d42896f..c95adcd 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4087,7 +4087,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