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 1496796610540655.3007526512135; Tue, 6 Jun 2017 17:50:10 -0700 (PDT) Received: from localhost ([::1]:40630 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIPAm-0002lb-4M for importer@patchew.org; Tue, 06 Jun 2017 20:50:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOt4-0002bz-A8 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOt3-0001wj-CA for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:50 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:33042) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOt3-0001wd-8a for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:49 -0400 Received: by mail-qt0-x244.google.com with SMTP id w1so26595544qtg.0 for ; Tue, 06 Jun 2017 17:31:49 -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.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:48 -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=Tn4dCIYITd4Gp+fwl4kOQ8868zZIxOl9xihFK0OJ650=; b=fbt+oNCa5+ibFjuNpc6q53itWPD7ulLEPG3p1OdA0ux2hsbMnGjRsig4Id9udfM/Er E3dYsq9eL93W0edKNVnFMy/U4e9EP5qKmgxcLCaFJw2Alr/8L+15xSfPF2wV2l0MfUt4 Flp7Ni0lgbgBGYTzcBiROk0wZbtq4nEQ5N+4RkW8zd8llzxkOoV2fyAbUl9rT74qZvRo pg2gl6iIykPNnCbsab2i2kTQEmAXnMkYe1fn60+K4nJkieZW1ozL3qjK3RaDzDEfWBG7 n2iqrLvTsEgtkik6fS1M+AMSxe92s3XtBq8AX5jxKMxwSPJbAogif9dpfcduh9612/am OXOw== 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=Tn4dCIYITd4Gp+fwl4kOQ8868zZIxOl9xihFK0OJ650=; b=IPn5lpQX0zJQ3AlOjph/0bYVliY9vTMbWt/SSltcYEQn7WPcowXbzcK6sXUZvgblSD kmkeXfUxpjpCLksLQoCz2DgSLJZA9j5ESLz3S2gpVm6EWgkZwZfyVZ52dcA/i5INj1TN 9z3CpqykEYgxNIsOUwcbK9Ie2XB12KulR1t67h8Y/7Iktuky2AU9CFS+jFIJmG60pX40 OLKfitUcsn/dBASSoRnAjmQJNtoVGyMGLgyVu9i6RZkuthCxCUUhCUxdDGt12UaX2/6I a75I4HHvfDBQF1LNg1kA3Cicuu+iNmRkvdr/N/JAyU16zn/HBZAq+eJ+rzYvJm4ZxYwh Qjyw== X-Gm-Message-State: AODbwcABKv7eHXWdlOVi4FFVmF23mRwyX/V2WtmhC8lZfeGsyevI+pJH X23+BwuiyW95qXW7CC8= X-Received: by 10.200.45.83 with SMTP id o19mr27551809qta.43.1496795508585; Tue, 06 Jun 2017 17:31:48 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:27 -0700 Message-Id: <20170607003119.14778-19-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 18/70] target/s390x: Use unwind data for helper_clcle 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 | 6 +++--- target/s390x/translate.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 8a095ad..f5a3044 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -595,12 +595,12 @@ uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r= 1, uint64_t a2, uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) { + uintptr_t ra =3D GETPC(); uint64_t destlen =3D env->regs[r1 + 1]; uint64_t dest =3D get_address_31fix(env, r1); uint64_t srclen =3D env->regs[r3 + 1]; uint64_t src =3D get_address_31fix(env, r3); uint8_t pad =3D a2 & 0xff; - uint8_t v1 =3D 0, v2 =3D 0; uint32_t cc =3D 0; =20 if (!(destlen || srclen)) { @@ -612,8 +612,8 @@ uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1,= uint64_t a2, } =20 for (; destlen || srclen; src++, dest++, destlen--, srclen--) { - v1 =3D srclen ? cpu_ldub_data(env, src) : pad; - v2 =3D destlen ? cpu_ldub_data(env, dest) : pad; + uint8_t v1 =3D srclen ? cpu_ldub_data_ra(env, src, ra) : pad; + uint8_t v2 =3D destlen ? cpu_ldub_data_ra(env, dest, ra) : pad; if (v1 !=3D v2) { cc =3D (v1 < v2) ? 1 : 2; break; diff --git a/target/s390x/translate.c b/target/s390x/translate.c index eaa3adc..600b76d 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -1920,7 +1920,6 @@ static ExitStatus op_clcle(DisasContext *s, DisasOps = *o) { TCGv_i32 r1 =3D tcg_const_i32(get_field(s->fields, r1)); TCGv_i32 r3 =3D tcg_const_i32(get_field(s->fields, r3)); - potential_page_fault(s); gen_helper_clcle(cc_op, cpu_env, r1, o->in2, r3); tcg_temp_free_i32(r1); tcg_temp_free_i32(r3); --=20 2.9.4