From nobody Mon Feb 9 02:28:10 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 14956539019371000.4329371500158; Wed, 24 May 2017 12:25:01 -0700 (PDT) Received: from localhost ([::1]:56453 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDbty-00039l-8S for importer@patchew.org; Wed, 24 May 2017 15:24:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45265) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDbs7-0001gh-9g for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDbs6-0000w3-Fb for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:03 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:35564) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dDbs6-0000vp-Ao for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:02 -0400 Received: by mail-qk0-x241.google.com with SMTP id k74so27741355qke.2 for ; Wed, 24 May 2017 12:23:02 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id b23sm3296240qkb.31.2017.05.24.12.23.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 12:23:01 -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=vV5pIjJyXkeAIAGlrZp1onxiOEHR82zqKpNPUR/5bPo=; b=OMJRNAvTzfEr1UF6+HEpxyT7sKxCor1IH+2cEmFm0bkYuPWGOwDGuiJ7n6ODsOAE7i Gvpt1L9o4/Onx7c1f5lJTkceSFlz4XACgoPWiGg3G9CsXoSD4ndFun6T03OTnIxGJpKk FKw5zUcFvh0YXYxnKOPHJx2VQA+ghmxmDW7tsRJxO+b8wdTSNxz2B3nEBb5n5WHnFRTP dKldhNZBZa8mcL3QogL+HVEEHQNF1Ow9/7S5WymchtL+XBRRvBadhpYLsWs1daF0T4d2 T1SfleO4Mb1L0oj3FtuvbfoKW86m/vZuuhiEDzbzpTQ1mL7sHG8uKkF0Cpl/YLMxM9Jt dRCg== 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=vV5pIjJyXkeAIAGlrZp1onxiOEHR82zqKpNPUR/5bPo=; b=SKCY60ymEN/DfU29E7vFvZ1bpcX/C2vgyFyY2hPwvkCKA+tXet3E4bsvp8GBqCYdOq SwPCJvPUrydl+BoGDCDnvlGC8FdnQpuPNb5KB0uMfyeAN2VseKNi+LGkweV2yJDLpveH Mdxeqm5KaFeIWvZYZNG27Okd7vwmeYULbAyzMHAM4eZvV1JcsLTHA7JAXgemOelf3pqd b6fDfSPbBqw42DXXsGCjTsGC681TnMb9ODR5oN3itQNmyeea9YQP6AJpl/WG/2ic/nhA 14Rny8YgpgaqPxMFlVQZAqxeutXBGftIr4BI7e/IqztJ1Y6SkcvPcK619/cG+oCrxHHJ +t5Q== X-Gm-Message-State: AODbwcDtvLR8ACJkOs6YbwpEW9V4pwikhyFBy3GgI2oEdfXGtx1+/shT X9mXZMZ5RFmDfR2Wce4= X-Received: by 10.55.149.130 with SMTP id x124mr34693457qkd.156.1495653781579; Wed, 24 May 2017 12:23:01 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 24 May 2017 12:22:20 -0700 Message-Id: <20170524192246.15905-8-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170524192246.15905-1-rth@twiddle.net> References: <20170524192246.15905-1-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v2 07/33] target/s390x: Use unwind data for helper_clc 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: thuth@redhat.com, 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" Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- target/s390x/mem_helper.c | 29 +++++++++++++++++------------ target/s390x/translate.c | 1 - 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 78a9ac1..50689bb 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -233,32 +233,37 @@ void HELPER(mvc)(CPUS390XState *env, uint32_t l, uint= 64_t dest, uint64_t src) } =20 /* compare unsigned byte arrays */ -uint32_t HELPER(clc)(CPUS390XState *env, uint32_t l, uint64_t s1, uint64_t= s2) +static uint32_t do_helper_clc(CPUS390XState *env, uint32_t l, uint64_t s1, + uint64_t s2, uintptr_t ra) { - int i; - unsigned char x, y; - uint32_t cc; + uint32_t i; + uint32_t cc =3D 0; =20 HELPER_LOG("%s l %d s1 %" PRIx64 " s2 %" PRIx64 "\n", __func__, l, s1, s2); + for (i =3D 0; i <=3D l; i++) { - x =3D cpu_ldub_data(env, s1 + i); - y =3D cpu_ldub_data(env, s2 + i); + uint8_t x =3D cpu_ldub_data_ra(env, s1 + i, ra); + uint8_t y =3D cpu_ldub_data_ra(env, s2 + i, ra); HELPER_LOG("%02x (%c)/%02x (%c) ", x, x, y, y); if (x < y) { cc =3D 1; - goto done; + break; } else if (x > y) { cc =3D 2; - goto done; + break; } } - cc =3D 0; - done: + HELPER_LOG("\n"); return cc; } =20 +uint32_t HELPER(clc)(CPUS390XState *env, uint32_t l, uint64_t s1, uint64_t= s2) +{ + return do_helper_clc(env, l, s1, s2, GETPC()); +} + /* compare logical under mask */ uint32_t HELPER(clm)(CPUS390XState *env, uint32_t r1, uint32_t mask, uint64_t addr) @@ -1237,8 +1242,8 @@ uint32_t HELPER(ex)(CPUS390XState *env, uint32_t cc, = uint64_t v1, get_address(env, 0, b2, d2), 0); break; case 0x500: - cc =3D helper_clc(env, l, get_address(env, 0, b1, d1), - get_address(env, 0, b2, d2)); + cc =3D do_helper_clc(env, l, get_address(env, 0, b1, d1), + get_address(env, 0, b2, d2), 0); break; case 0x600: cc =3D do_helper_oc(env, l, get_address(env, 0, b1, d1), diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 729924a..0f9148a 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -1901,7 +1901,6 @@ static ExitStatus op_clc(DisasContext *s, DisasOps *o) tcg_gen_qemu_ld64(cc_dst, o->in2, get_mem_index(s)); break; default: - potential_page_fault(s); vl =3D tcg_const_i32(l); gen_helper_clc(cc_op, cpu_env, vl, o->addr1, o->in2); tcg_temp_free_i32(vl); --=20 2.9.4