From nobody Sun Feb 8 18:42:07 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 1496597991729284.5711175552127; Sun, 4 Jun 2017 10:39:51 -0700 (PDT) Received: from localhost ([::1]:57841 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZVG-0002rP-DF for importer@patchew.org; Sun, 04 Jun 2017 13:39:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZQt-0007Ba-Vt for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHZQt-0002hE-43 for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:20 -0400 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:34433) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHZQs-0002gV-U9 for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:19 -0400 Received: by mail-pg0-x244.google.com with SMTP id v14so3628859pgn.1 for ; Sun, 04 Jun 2017 10:35:18 -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.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 10:35:17 -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=zvWGDWVVNVakqlPnFKXWAGpP8vSrSgyLbA0HQr2DnXY=; b=J7x6rMWdQt+PbbaoTlJ5dWQ1doyplBNAYjbPWUK3H+QpgmQXPe9D180AWUdMLrRTvP dE4ac8ZXnTX1ao4BuGiFRt5M/ojPl42aBlKUOr/vcCGFKg9i7qPwrbkUe760MIDFoxRc 5tQkVCPKvfF3KMIW0BFuH02moo8x7Moc9fGdR/UDtfq0Q3l8l6yHyeGwLy9RwvHvt+qo r2rrj3tkuNsorxl3oS7b97tqnLQ5LtmRCY61cLofnBIYqaS7g8Oi1kz/Rukrr+b6kQZt gjUNThxLOuYwliuLvFvqZg5zXeDRx8M6quxb3oa/85OUq/z2oYdQTak7NwEKO1u/YPSG 56CQ== 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=zvWGDWVVNVakqlPnFKXWAGpP8vSrSgyLbA0HQr2DnXY=; b=EQ9gC8zsEDSLt7UyD88Vi8zelv5lEinLE8gPjAwu1CjKWCL1t3n0he4TSb26FyzQku AJeQyzCpmG+AqCZjcN/y9GANPMwkX8K8boryba1bgTLvlx31MKvkDtwE9K0yjfBXKrCd B6+qtrBwt9OLf79YXvuhijZqSSI09ur5UUPraFKti054cb2s0ELz+dpwsfFLJNeLHutR a0gxKQLSlgtp+Yz45rnGd1eNutBowvd1dw7WAthp4UtuvodZTuYzEl6mjlK8qMEco7Wi jy78JLfmvC2KfsqKWZHGK/NBBoas/9oGDOObOGfqmmKB0pQvUChN0jsMJnsfx4yolZhT 7jEA== X-Gm-Message-State: AODbwcCS4pqZ8cxzMBdj9LCnxvXi/watkCD1gRj6SX6OHVAqCK5uC/BX qF2y7EU6V4fMHEC0x/A= X-Received: by 10.99.18.65 with SMTP id 1mr13169609pgs.132.1496597717882; Sun, 04 Jun 2017 10:35:17 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 10:34:04 -0700 Message-Id: <20170604173509.29684-5-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::244 Subject: [Qemu-devel] [PULL 04/69] target/s390x: Use unwind data for helper_nc 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 | 31 ++++++++++++++++++------------- target/s390x/translate.c | 1 - 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 90b62fa..7d6133b 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -119,23 +119,28 @@ static void fast_memmove(CPUS390XState *env, uint64_t= dest, uint64_t src, } =20 /* and on array */ -uint32_t HELPER(nc)(CPUS390XState *env, uint32_t l, uint64_t dest, - uint64_t src) +static uint32_t do_helper_nc(CPUS390XState *env, uint32_t l, uint64_t dest, + uint64_t src, uintptr_t ra) { - int i; - unsigned char x; - uint32_t cc =3D 0; + uint32_t i; + uint8_t c =3D 0; =20 HELPER_LOG("%s l %d dest %" PRIx64 " src %" PRIx64 "\n", __func__, l, dest, src); + for (i =3D 0; i <=3D l; i++) { - x =3D cpu_ldub_data(env, dest + i) & cpu_ldub_data(env, src + i); - if (x) { - cc =3D 1; - } - cpu_stb_data(env, dest + i, x); + uint8_t x =3D cpu_ldub_data_ra(env, src + i, ra); + x &=3D cpu_ldub_data_ra(env, dest + i, ra); + c |=3D x; + cpu_stb_data_ra(env, dest + i, x, ra); } - return cc; + return c !=3D 0; +} + +uint32_t HELPER(nc)(CPUS390XState *env, uint32_t l, uint64_t dest, + uint64_t src) +{ + return do_helper_nc(env, l, dest, src, GETPC()); } =20 /* xor on array */ @@ -1213,8 +1218,8 @@ uint32_t HELPER(ex)(CPUS390XState *env, uint32_t cc, = uint64_t v1, get_address(env, 0, b2, d2)); break; case 0x400: - cc =3D helper_nc(env, l, get_address(env, 0, b1, d1), - get_address(env, 0, b2, d2)); + cc =3D do_helper_nc(env, l, get_address(env, 0, b1, d1), + get_address(env, 0, b2, d2), 0); break; case 0x500: cc =3D helper_clc(env, l, get_address(env, 0, b1, d1), diff --git a/target/s390x/translate.c b/target/s390x/translate.c index d6736e4..7e4cc6c 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3043,7 +3043,6 @@ static ExitStatus op_nabsf128(DisasContext *s, DisasO= ps *o) static ExitStatus op_nc(DisasContext *s, DisasOps *o) { TCGv_i32 l =3D tcg_const_i32(get_field(s->fields, l1)); - potential_page_fault(s); gen_helper_nc(cc_op, cpu_env, l, o->addr1, o->in2); tcg_temp_free_i32(l); set_cc_static(s); --=20 2.9.4