From nobody Wed Nov 5 18:23:07 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 1496598668321347.63724740029636; Sun, 4 Jun 2017 10:51:08 -0700 (PDT) Received: from localhost ([::1]:57894 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZgA-0005AW-RB for importer@patchew.org; Sun, 04 Jun 2017 13:51:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50191) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZRL-0007Ym-DN 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 1dHZRH-00038f-QW for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:47 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:35774) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHZRH-00037x-KX for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:43 -0400 Received: by mail-pg0-x242.google.com with SMTP id f127so7255413pgc.2 for ; Sun, 04 Jun 2017 10:35:43 -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.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 10:35:41 -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=64GOZe+eFOruX7RFeVVgr304QyscnvojmE2aQVLY80o=; b=BsrevuqidshzYBydpBIgZNDxIhgzXAbkLGG7mcqZ0+2UY1yneSZKFJYDCFA/3HnlCt OEJKbd9oCgZGo2TWqh8zerCurpjQV6vlQCEzrHXyWT54tdic+xLqp6BNJECPZ6AmqWTO uDCvj+VYsR3goIVSXmoSuy4ysU8TDuzNVg8aiwSLIrI3kBfPEL4Kuasrrfw7oB7smpDJ 2aWDJWjvuLDCdCwKtK8axRprD34yyzacO6h8pDPTp3uHC4Hta0J5XpU+zlWG2/bfkmYS Bz5o67lAUHM1Y+qk/pL2baiOTd7pZ59cqrFXCvZKuIv8bMwGAAE3OyvdY4ziCAjcqJ4g 3zvg== 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=64GOZe+eFOruX7RFeVVgr304QyscnvojmE2aQVLY80o=; b=uDLZnS2w84zOjaPqt5FYJNOUc0uJDK4k8h6YpAMGWnSzuIUOVMMru+YLdgGsBq3cN5 nYx7CXsfpLZq8njB57QeL7RZg5YZoj3RvyDGJsPhZ847zjOF1ZyAmuprlHJ+/Iyg3QEz 9T4uNYhpQGITalFz/SK9t9SAI5jNg5BpWREbwqfbd09ntRjXtT+3Z/77LOV8uDm7HzAO zhabBBXcb1rVW3uo6ijhcdLWHgKb8DBYVbIxHnJnQvsOw6m76j+hPxtyGTCCgkSJNyMP zNrq9NMXfuD99FjkLVAHLFJPjgYnobwb3vI57Q5mPdMAmzvqsOSOqxGhLSc/+8YLsSC8 0ibw== X-Gm-Message-State: AODbwcBWdLh9n82IeSBpwa5aCbZbXk38EIqRZcpBOMtVoTtGYiNJWqXj uYUHcZBAcqy3PiDcznY= X-Received: by 10.98.74.5 with SMTP id x5mr3679655pfa.149.1496597742614; Sun, 04 Jun 2017 10:35:42 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 10:34:22 -0700 Message-Id: <20170604173509.29684-23-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::242 Subject: [Qemu-devel] [PULL 22/69] 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 1842cc3..447ba07 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -4073,7 +4073,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