From nobody Wed Nov 5 17:23:38 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 1496796092023486.4901826231114; Tue, 6 Jun 2017 17:41:32 -0700 (PDT) Received: from localhost ([::1]:40598 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIP2Q-0002u1-KE for importer@patchew.org; Tue, 06 Jun 2017 20:41:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33546) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOss-0002Pd-Md for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOsq-0001qM-KD for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:38 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:33032) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOsq-0001qC-GM for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:36 -0400 Received: by mail-qt0-x243.google.com with SMTP id w1so26595183qtg.0 for ; Tue, 06 Jun 2017 17:31:36 -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.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:35 -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=OFl/XiMRB4MYms8JhGoCm6LsrLWwuA39VLu3qOIHBjw=; b=g2KFq6JtafLAnAJ+KmsFetZHMvyFUQYYtlv0zqHWGMaaq7tql/XtT4quzcEyO+MR9a JKjSG+OUi852ftBoh0Ul/9rWqWrCR50PuaJRhQsRkTTamg3YIGFBtJy7GRvFVlddt2TL 6rxtYsSQPeSwrTBJfFmU+CqrfQkwmLZqtkPqb54wc4OvRWVoiU0bW1BlXe13UgFVMUST VApCfn7SaJoR7tfXlzdQzfgE6z5tmRmKsLtwtneU2cIfd6f+opi5DY7Rcf1HW+fuJlR0 wx68mgd+tPJFkv3WcddPOUG9+iH9azLt1zXb/txVZI11OINO/xaJGVGyJga6sH9m04ob 3cKw== 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=OFl/XiMRB4MYms8JhGoCm6LsrLWwuA39VLu3qOIHBjw=; b=V7ZHBR5NtMBP1MFWKB5aTDJLVyuBkmjEvp1KRNuhuzh52Z7bD0r53O19W9RtJ0Biu0 8aRoB1mnpgEAgIs5DIUy0Ug+m9TFpjTRimMRNm5c6gGN8+7/Dd/jWcwqOGoiw7Nsnlwg 5dbFELVRq1iR2IIXIXvcitD8wWp9irjl65JNEwDJpP37xGckQTWTlB+gz7tRQ2Qvf+4r rWq/HF061cEZxPCn8A/TDEYq+Use7+aS4OEVV3nhN3IqFHcWyaFVnWAkhPmC3b6TIATp XmThm++CU4kbXo2qgwILeK9MdPysPHBsOg0IiKiXVsuG6QPnTDRQNYdnliDZZ6cCy4Uo 5/VQ== X-Gm-Message-State: AODbwcCzBeMf7G0FOUGXWqK6ohWvR2ze4XIWVYTh4z9b1sn5g2AYOpEq Ueq8A8JjfqiOgx6G0o4= X-Received: by 10.237.54.10 with SMTP id e10mr36524336qtb.51.1496795495833; Tue, 06 Jun 2017 17:31:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:17 -0700 Message-Id: <20170607003119.14778-9-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::243 Subject: [Qemu-devel] [PULL v2 08/70] 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: 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: Aurelien Jarno Signed-off-by: Richard Henderson --- 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 a9502cc..c47b818 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -1906,7 +1906,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