From nobody Wed Nov 5 17:24:54 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 1496795776084932.4362167708307; Tue, 6 Jun 2017 17:36:16 -0700 (PDT) Received: from localhost ([::1]:40577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOxK-0006UM-Hl for importer@patchew.org; Tue, 06 Jun 2017 20:36:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOsm-0002Ix-2y for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOsl-0001oe-8O for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:32 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:33756) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOsl-0001oZ-44 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:31 -0400 Received: by mail-qk0-x241.google.com with SMTP id c206so15444243qkb.0 for ; Tue, 06 Jun 2017 17:31:31 -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.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:29 -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=1vmA2LN7zLl/DbWzXhos6fSiS9m2MhOsUKa0ZINcWG8=; b=ODuc/dcUsdoqkDlpq5rXWzhypZIU1xSyPoC7Db/jHgc+meyNt54cuKhv3nSZFpRQOP UBgJljRHLIm7BhA9JhAW+avecwjWgG8BJ8/v+Modm69yWodtH/Nu/kEsqZn2eIg8v5jj dzB/HFfqkfGxx9mMWPkkB1C1sRhRgebbQnJMZ3N60sbis0wwLKZAxrhLdjpuQzx6LPMg BExzytWPvy64HQBu3lZgb4LUgK9AOKHEOuO3qoTaOhQ4BuzIkmVo6yrjvkUxmyzQuh3m 4Ojn5KLjVAtXVof1mATSbKwlYPjlSs04lyD2l8rnr1AAruGq2MHNscdpcmw0kOp+6RNB uNVQ== 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=1vmA2LN7zLl/DbWzXhos6fSiS9m2MhOsUKa0ZINcWG8=; b=kZ/JJgXHL4zqj/ujq791B5KBWdnfMZZEwJ7gfB7EPHXP0jSXWg3h+O5WUvJSh7sq1f scvtVdma/QYRFKdcnZ3Mzpgx9dQsPoW1tQsO6vvxeBPguokLh2qkppG/8qn898cIvOcS Xrxo+PBxwiDapjcadMGsg/30FMtuaG11pV0jCO8ZrbLZzxsCzsXBDqYFLBWcHBAYA8/6 MAjSOhK6mt7faWFIXLIsOeqfknfsPkQZkIE9OnUPx0tvXphWMe9WFIYlakrf2mEenioB EYaNNn+paSv7e4xUrmZktRv1s0bhMmKIZfBC0mEZPMwN6FzuOzMKODp4vZtPenvxYhIF iNQQ== X-Gm-Message-State: AKS2vOwBV3swh42LsVtn5r7ex+0aDWLzGGQOyZpq6iTTQRklKj0jos9K /FWhbU0Iks8XytDDiHw= X-Received: by 10.55.214.204 with SMTP id p73mr31854640qkl.86.1496795490428; Tue, 06 Jun 2017 17:31:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:13 -0700 Message-Id: <20170607003119.14778-5-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:c09::241 Subject: [Qemu-devel] [PULL v2 04/70] 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 837d90c..afa2c6b 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3048,7 +3048,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