From nobody Mon Feb 9 02:32:11 2026 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 1496598438296977.0294996231897; Sun, 4 Jun 2017 10:47:18 -0700 (PDT) Received: from localhost ([::1]:57878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZcS-0001Um-T7 for importer@patchew.org; Sun, 04 Jun 2017 13:47:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZR1-0007J9-6T for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHZQz-0002mR-Uq for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:27 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:34438) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHZQz-0002lc-P6 for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:25 -0400 Received: by mail-pg0-x242.google.com with SMTP id v14so3629075pgn.1 for ; Sun, 04 Jun 2017 10:35:25 -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.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 10:35:24 -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=lGDvUp5XrZvKX4F6cIJ/sXxo/+YbSSLgRWjN09z7M5Y=; b=atsPPYgXDZ22146yHVSA0WWewv/qlhCBYNgi07VlxS4xDDg0ikUBImRy8SiwLW0Qx6 zmwPoH1nIXt2FwZch67hGrSTPqeJJFJXWaRIDSDYYT/Q0BSIde4O0Xc08QsLSIOqiSVN F4NBRsEMoBClys5X2pRJwe4opH9WCbi/cE+wZSzqP7g+aiJhy1DUxWkRvr9YQ/g0MJWR ivSq9/WpzWxFgpJO5/yplXwjrN45xNEw2VMa12VSRwkSlhQven6BxDSK+/MHR/mIsDGE sK6ZKR85c5o6ycaQfdD0JcUqyfvmuw7JcOf1XRqHHpYsN4/rUVSRVhWnRNF4zcW8jR1i wLJA== 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=lGDvUp5XrZvKX4F6cIJ/sXxo/+YbSSLgRWjN09z7M5Y=; b=CbtKRTx8+FCKi4wizk4YDKN5SDGAjsbksHdwymXkAhln5jkhBeu1mssmJcNQxVZkTk CX01bt7icpyn4rcR59B3CHTxxsp2CRh+wxxUb4iILiiMUQ18lAmqHs9rCrPZNbGrR4Xm uaGdxAqO4P9awhJjWlCdWCh9rdYE4ex0ixw/h/XuvblA2VW1wR7i5DjvjuuXDajJjSnS gPhnwB4WAiZiU3aKz4/GFf8wyd4OUXB1E/4995YCUo3+Ceo1vpTdICRWtLG57t7n/Gwv UQOIPSVol6VEP7jRHDat/EjSn9ya/kObj1/KczcJ07tkgEZc8Y0BpPJ01CXdzgEfdVWr FzeQ== X-Gm-Message-State: AODbwcANlrwQRwm1pBN+c3ThoMrCU31aHWLxtzpKbrjEZ+LQY78hjQ8X IZtU5IxEDQk+NRjsjcY= X-Received: by 10.84.217.86 with SMTP id e22mr10586630plj.294.1496597724656; Sun, 04 Jun 2017 10:35:24 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 10:34:09 -0700 Message-Id: <20170604173509.29684-10-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 09/69] target/s390x: Use unwind data for helper_clm 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 50689bb..3e75cae 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -268,16 +268,16 @@ uint32_t HELPER(clc)(CPUS390XState *env, uint32_t l, = uint64_t s1, uint64_t s2) uint32_t HELPER(clm)(CPUS390XState *env, uint32_t r1, uint32_t mask, uint64_t addr) { - uint8_t r, d; - uint32_t cc; + uintptr_t ra =3D GETPC(); + uint32_t cc =3D 0; =20 HELPER_LOG("%s: r1 0x%x mask 0x%x addr 0x%" PRIx64 "\n", __func__, r1, mask, addr); - cc =3D 0; + while (mask) { if (mask & 8) { - d =3D cpu_ldub_data(env, addr); - r =3D (r1 & 0xff000000UL) >> 24; + uint8_t d =3D cpu_ldub_data_ra(env, addr, ra); + uint8_t r =3D extract32(r1, 24, 8); HELPER_LOG("mask 0x%x %02x/%02x (0x%" PRIx64 ") ", mask, r, d, addr); if (r < d) { @@ -292,6 +292,7 @@ uint32_t HELPER(clm)(CPUS390XState *env, uint32_t r1, u= int32_t mask, mask =3D (mask << 1) & 0xf; r1 <<=3D 8; } + HELPER_LOG("\n"); return cc; } diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 0f9148a..34ccc22 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -1928,7 +1928,6 @@ static ExitStatus op_clm(DisasContext *s, DisasOps *o) TCGv_i32 m3 =3D tcg_const_i32(get_field(s->fields, m3)); TCGv_i32 t1 =3D tcg_temp_new_i32(); tcg_gen_extrl_i64_i32(t1, o->in1); - potential_page_fault(s); gen_helper_clm(cc_op, cpu_env, t1, m3, o->in2); set_cc_static(s); tcg_temp_free_i32(t1); --=20 2.9.4