From nobody Mon Feb 9 05:11: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 1496598142656245.69324961993323; Sun, 4 Jun 2017 10:42:22 -0700 (PDT) Received: from localhost ([::1]:57855 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZXg-00051n-5Y for importer@patchew.org; Sun, 04 Jun 2017 13:42:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZQv-0007DY-KR for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHZQu-0002iv-LV for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:21 -0400 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]:35754) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHZQu-0002hx-Fq for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:20 -0400 Received: by mail-pg0-x243.google.com with SMTP id f127so7254721pgc.2 for ; Sun, 04 Jun 2017 10:35:20 -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.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 10:35:18 -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=7Ioz4xItkpZqzL0kSWSobN3kEa9WCRRdNMwReLwrIG0=; b=O6TXOL7t81y/NlSWiKfF8cYOB3CUUgHfBYsmFZQcZ9KnYmFpBPwQ0NE7jBUrYlEDXw 4EjavCj/NdXCZ2BEzuvbCeaeqcxwiMFOJgYHEs8X/0KO5YLUrqGwGlA826R0I33MrdGQ aeZkOD2JaQTrViubBpVyf7ddSnadRfL7y8Ckkwsmgp3niO7qFDCPt/CmwehIPH7EZLD2 ZNODHQ5Z9xVxRFLBWtbmVXLItHRkJQ/ZuYBcOWNMl+n0A0nd454u02OnzUo2oqmXQoKj qQ8U4TBtlXfWO3sDjtuaA4P1jRXFhb+5lAdtSTYgyl2WGAYV9JNuOOHn+ImGpC9M0MU8 0v+A== 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=7Ioz4xItkpZqzL0kSWSobN3kEa9WCRRdNMwReLwrIG0=; b=nkqRjzt0MzNcHblPK/kj45SsX/rcXkM5EzoLL8qSWIE+xx7MkIXniWBzIJOs3jQ97v +MTQNiqKrXCzRt5+ZLw3Zt3IOxZae+br9qUdK6gJkVjqgWH8eYYwlxYEBWp2FZmgSPeF 8cFGB1qoyTPJg0gP0QjmGFK7+Fo9fAs52WpP0R90UoY8KYmsM50wakJ314FkIcgvASdy Vj4mGEODY6y0+Oij/5vR1FFFU37UOGpadTnQr0kAU5/1T7My9ffpVSZnaOffmjUdnY+E JNJpR+FW0gwPNbyXHm/Jv/RgR6Lnlp89NcQUJwSZLCvU3082dhageHTO34toBUS4OlA5 v7bw== X-Gm-Message-State: AODbwcDM+QJMlH0mDabExa0njuutjXtsNS/AnXyIcmY6WJefSwR7VLB6 XQM0w351L6p8JSRKyUA= X-Received: by 10.84.130.3 with SMTP id 3mr10618416plc.222.1496597719331; Sun, 04 Jun 2017 10:35:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 10:34:05 -0700 Message-Id: <20170604173509.29684-6-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::243 Subject: [Qemu-devel] [PULL 05/69] target/s390x: Use unwind data for helper_oc 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 7d6133b..b4b50d1 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -171,23 +171,28 @@ uint32_t HELPER(xc)(CPUS390XState *env, uint32_t l, u= int64_t dest, } =20 /* or on array */ -uint32_t HELPER(oc)(CPUS390XState *env, uint32_t l, uint64_t dest, - uint64_t src) +static uint32_t do_helper_oc(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(oc)(CPUS390XState *env, uint32_t l, uint64_t dest, + uint64_t src) +{ + return do_helper_oc(env, l, dest, src, GETPC()); } =20 /* memmove */ @@ -1226,8 +1231,8 @@ uint32_t HELPER(ex)(CPUS390XState *env, uint32_t cc, = uint64_t v1, get_address(env, 0, b2, d2)); break; case 0x600: - cc =3D helper_oc(env, l, get_address(env, 0, b1, d1), - get_address(env, 0, b2, d2)); + cc =3D do_helper_oc(env, l, get_address(env, 0, b1, d1), + get_address(env, 0, b2, d2), 0); break; case 0x700: cc =3D helper_xc(env, l, get_address(env, 0, b1, d1), diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 7e4cc6c..db86b70 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3077,7 +3077,6 @@ static ExitStatus op_negf128(DisasContext *s, DisasOp= s *o) static ExitStatus op_oc(DisasContext *s, DisasOps *o) { TCGv_i32 l =3D tcg_const_i32(get_field(s->fields, l1)); - potential_page_fault(s); gen_helper_oc(cc_op, cpu_env, l, o->addr1, o->in2); tcg_temp_free_i32(l); set_cc_static(s); --=20 2.9.4