From nobody Wed Nov 5 17:30:39 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 1496796384834256.34875224669963; Tue, 6 Jun 2017 17:46:24 -0700 (PDT) Received: from localhost ([::1]:40620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIP79-0007cN-4e for importer@patchew.org; Tue, 06 Jun 2017 20:46:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOtA-0002g9-WC 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 1dIOt8-0001yn-41 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:56 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:33047) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOt8-0001ya-0J for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:54 -0400 Received: by mail-qt0-x241.google.com with SMTP id w1so26595652qtg.0 for ; Tue, 06 Jun 2017 17:31:53 -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.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:52 -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=rV2xg1M3NgkVH6SAAJoujatHk5l0HD7q1Ewc16Z+I0Y=; b=NBYYzqRZ16JjbES1oAdsYsMWAHpJExM5G0l8YR6urGKZ2BPyxJCRqwUM+corQmrGni 9W9V0eE19pss7OXa4OihSDqCMnrgXFzMM4qs15zmqG2WYreG7nq4rjdTF6AHWqBinEcI WisS7FbykJEwQj77sbTfRmIBGnH7oEChCnTWP53gk/zuZKiPBibBhYOXXfLknPn5nQnC X3FcoryMOCiMOxLSOrM2RdDlAN3KRL7pgI6E1kmxKMNvb6YLtpoWkkMvtjm3kyLsLj+T kc6Wdri+TG+Dn8/mDP+rKsjw7XZhty2GYteGdlg+0denzX70CvGf+1wQuTgSMSkcIiRR aBvw== 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=rV2xg1M3NgkVH6SAAJoujatHk5l0HD7q1Ewc16Z+I0Y=; b=PGG6YLgqk0m7qcKq5d60gaFxEuKdFIyf9aiARG5p+cVgXMu+ESKycJh7Kc9eocDlOs dlgaxBN9guboYZpSo4+VGeyTQo/OIHhm49IQ9zj2xEwLjflb6CL0NKMDdocKcnEKvJzM 4U1+kJ9M6Ft4YLNCst94iGfykEHGkXh7BhLhvz8Zvq7opgmLLpXyEylyh/lLQA4lLTpC wBUgZS+iDyuZcU0pMGnYGLTUTv9XZNCX2nQnXJPo4Me68ELfaIbpHyl3ajrQnCGNn8WF HEqhiEai3+ijk+8QYaKLZFRKZiBOjGjKxTZbCuPgfE9q94NLNmaBvuIhqcuv5vTfIH1P CvUg== X-Gm-Message-State: AODbwcDMMZTF2YI3iyg2PB32Sju2In6O2QEWBghg1xZo5/yeZd74JCMK RKK+9i7bvo124KES7zA= X-Received: by 10.200.58.163 with SMTP id x32mr6924260qte.110.1496795513276; Tue, 06 Jun 2017 17:31:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:31 -0700 Message-Id: <20170607003119.14778-23-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::241 Subject: [Qemu-devel] [PULL v2 22/70] target/s390x: Use unwind data for helper_tre 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 | 15 ++++++++------- target/s390x/translate.c | 1 - 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index b37a963..fd6dbf7 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -744,9 +744,11 @@ void HELPER(tr)(CPUS390XState *env, uint32_t len, uint= 64_t array, uint64_t HELPER(tre)(CPUS390XState *env, uint64_t array, uint64_t len, uint64_t trans) { + uintptr_t ra =3D GETPC(); uint8_t end =3D env->regs[0] & 0xff; uint64_t l =3D len; uint64_t i; + uint32_t cc =3D 0; =20 if (!(env->psw.mask & PSW_MASK_64)) { array &=3D 0x7fffffff; @@ -757,25 +759,24 @@ uint64_t HELPER(tre)(CPUS390XState *env, uint64_t arr= ay, amount of work we're willing to do. For now, let's cap at 8k. */ if (l > 0x2000) { l =3D 0x2000; - env->cc_op =3D 3; - } else { - env->cc_op =3D 0; + cc =3D 3; } =20 for (i =3D 0; i < l; i++) { uint8_t byte, new_byte; =20 - byte =3D cpu_ldub_data(env, array + i); + byte =3D cpu_ldub_data_ra(env, array + i, ra); =20 if (byte =3D=3D end) { - env->cc_op =3D 1; + cc =3D 1; break; } =20 - new_byte =3D cpu_ldub_data(env, trans + byte); - cpu_stb_data(env, array + i, new_byte); + new_byte =3D cpu_ldub_data_ra(env, trans + byte, ra); + cpu_stb_data_ra(env, array + i, new_byte, ra); } =20 + env->cc_op =3D cc; env->retxl =3D len - i; return array + i; } diff --git a/target/s390x/translate.c b/target/s390x/translate.c index e4da94d..d42896f 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4078,7 +4078,6 @@ static ExitStatus op_tr(DisasContext *s, DisasOps *o) =20 static ExitStatus op_tre(DisasContext *s, DisasOps *o) { - potential_page_fault(s); gen_helper_tre(o->out, cpu_env, o->out, o->out2, o->in2); return_low128(o->out2); set_cc_static(s); --=20 2.9.4