From nobody Wed Nov 5 18:23:08 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 1496598151017718.8847805354684; Sun, 4 Jun 2017 10:42:31 -0700 (PDT) Received: from localhost ([::1]:57856 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZXp-0005Bm-A3 for importer@patchew.org; Sun, 04 Jun 2017 13:42:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50138) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZRE-0007Rk-Kt for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHZRD-00031j-Ml for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:40 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:33372) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHZRD-00031C-GL for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:39 -0400 Received: by mail-pf0-x241.google.com with SMTP id f27so18146000pfe.0 for ; Sun, 04 Jun 2017 10:35:39 -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.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 10:35:37 -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=hdHv4PJE0J4xlVzE8JTWtM80SCA7hLTNh0xkN/8ghuo=; b=jBSNkQNLjytG5bCNJaXanCzCGuo8Zo50WG6GiV3DhH314uFT3odCApEzFqrxjs00k6 KV9uGBlWEqZMDdVOiSLbR8uclvX0gV0FF8nJuJRBthHeKGgGsYM7REziU7xlsBHZjt7N QQICXaO1vY++L2aAHeskUwXy7dre/KW+oUE+FXl3hZSr7mHkaThRocx1ItuLCmo7XgZm Q3+K9sIHi4VbNmU8XE3tYwlSC8n0TIkSOWGcYPG3kdNo7ThGSutCY6mPsDiQw6QAml3j pwDExIDzc5NXACW4wdkEttuVcNLprYriGPandrRI9doRY9PbO0ftIoc41sGNtunNZu8T H93w== 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=hdHv4PJE0J4xlVzE8JTWtM80SCA7hLTNh0xkN/8ghuo=; b=oQk0NJSM4KpfrmeXLVvKFv60bO7HiI/oxpNGq2UwCllM3qlnqMpaGQpclSuEzf0udz gh+QtHRcerWEdjtNqxLE4KnY48VvJ5Ndolegmmv/XptRTgWOiqPEqjt9t1JJgqXDkd5+ PG/F/BTq7xauP67Gj3fOtfeRftRmn/fV9scyPD5bImJR5L6uW69QCMaKxGKxOkVtfoJy AeF27mT2pRP4W3xRSaROq653gtNTxTn8fD3WiFVjWfoaKLGifQhvG6F3xuEkQUG8nusX V88aP1O5OR3w/OR/Dh/XKRmwSZokTqvelQZunx225g3/5OgDwftqGJUc+DdIfOWcasz8 bsCw== X-Gm-Message-State: AODbwcBWetnBMz158IDiMClf0YREUuEOtyl7YbZjLLrxRpv27v9GLthY EUGqcgl7DGhKNIHn98Q= X-Received: by 10.98.157.204 with SMTP id a73mr12342725pfk.235.1496597738444; Sun, 04 Jun 2017 10:35:38 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 10:34:19 -0700 Message-Id: <20170604173509.29684-20-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:c00::241 Subject: [Qemu-devel] [PULL 19/69] target/s390x: Use unwind data for helper_cksm 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 | 11 ++++++----- target/s390x/translate.c | 1 - 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index f5a3044..d4ee364 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -633,6 +633,7 @@ uint32_t HELPER(clcle)(CPUS390XState *env, uint32_t r1,= uint64_t a2, uint64_t HELPER(cksm)(CPUS390XState *env, uint64_t r1, uint64_t src, uint64_t src_len) { + uintptr_t ra =3D GETPC(); uint64_t max_len, len; uint64_t cksm =3D (uint32_t)r1; =20 @@ -642,21 +643,21 @@ uint64_t HELPER(cksm)(CPUS390XState *env, uint64_t r1, =20 /* Process full words as available. */ for (len =3D 0; len + 4 <=3D max_len; len +=3D 4, src +=3D 4) { - cksm +=3D (uint32_t)cpu_ldl_data(env, src); + cksm +=3D (uint32_t)cpu_ldl_data_ra(env, src, ra); } =20 switch (max_len - len) { case 1: - cksm +=3D cpu_ldub_data(env, src) << 24; + cksm +=3D cpu_ldub_data_ra(env, src, ra) << 24; len +=3D 1; break; case 2: - cksm +=3D cpu_lduw_data(env, src) << 16; + cksm +=3D cpu_lduw_data_ra(env, src, ra) << 16; len +=3D 2; break; case 3: - cksm +=3D cpu_lduw_data(env, src) << 16; - cksm +=3D cpu_ldub_data(env, src + 2) << 8; + cksm +=3D cpu_lduw_data_ra(env, src, ra) << 16; + cksm +=3D cpu_ldub_data_ra(env, src + 2, ra) << 8; len +=3D 3; break; } diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 9270067..76910bc 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -1866,7 +1866,6 @@ static ExitStatus op_cksm(DisasContext *s, DisasOps *= o) int r2 =3D get_field(s->fields, r2); TCGv_i64 len =3D tcg_temp_new_i64(); =20 - potential_page_fault(s); gen_helper_cksm(len, cpu_env, o->in1, o->in2, regs[r2 + 1]); set_cc_static(s); return_low128(o->out); --=20 2.9.4