From patchwork Wed Jun 7 00:30:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9770293 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5412A60234 for ; Wed, 7 Jun 2017 00:35:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 353E428520 for ; Wed, 7 Jun 2017 00:35:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 29F9828522; Wed, 7 Jun 2017 00:35:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C3E7E28520 for ; Wed, 7 Jun 2017 00:35:39 +0000 (UTC) Received: from localhost ([::1]:40565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOwk-0005G0-Qk for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Jun 2017 20:35:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33509) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOsn-0002Kv-JY for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOsm-0001p9-Nt for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:33 -0400 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:36512) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOsm-0001p0-Jg for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:32 -0400 Received: by mail-qk0-x244.google.com with SMTP id y201so11027764qka.3 for ; Tue, 06 Jun 2017 17:31:32 -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=vYBsE/b0bNiBz4Z7THJOq/Ldbd1EfC9IX4zWtaStlVI=; b=JRNL0u9Igj1k2W/IgO2BRMU4CdLdwDz8NIDJvZr/wv8i5I4rosvASgEYxpe5A4rbyd s2hOJqIEzzYIHgUf2KPnVLV6hPKHmy4Kdzcu3WDG9kuVYeJz2fOJndglNB5DanLbmR9L CIz8rsGtbwVWpY9gf/fLp4KAepw/a7QMCEbOBBU8aCD0D+TEIKbAPfBNHURgiiSnaZWs NCM8ukEnbeDY99fCMhZFNb8tdm5eREOVKphl98afcba1EQ3f8rnx5Um8lqc8JvjswthV O5KgjRup49bkYr/36+dRuEQdlJetfKOiHCNJl0IH1/clG58hl/vDfg5wM0wBINwavGpp NRZQ== 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=vYBsE/b0bNiBz4Z7THJOq/Ldbd1EfC9IX4zWtaStlVI=; b=DqhM12FyMlzDKVHtI5JtVEfOboOBrAqsENmz7FYYny77EkKgFFP38tIq2dbL9+Wcpg Tnb2QxKy/9yI08649u/AKRxd6sbtBu7ZSLlZvOYtjXReLF7FHsb7eXHlbxjj1oKlra3D xbjCnOaKiy8UDui7r8RkBimNHu4FLGTTMH+nfkBwY0AeapsJQqJTunWrjkCpRzdXQIal Fy6xDS1VJjKfZ6T0sE03MesPShuwMV2CE0bpBVw5hNbSFJJtE5xTBVy0K3impwRj4SHz WPiAb8a66MSsc0AVTBsokYS8Z4ickWFsXRcE9NKRvGlZibTB2fFKfUEC5Ot3wu0fcu5t JUaQ== X-Gm-Message-State: AKS2vOwhwH9kny+91SQ8WJYR/i+0fd2uhaJJSEgAfdC1CcudcHo2dM59 pL+34ISXfEGOwKefJjI= X-Received: by 10.55.212.3 with SMTP id l3mr23534270qki.112.1496795491895; 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.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:31 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:14 -0700 Message-Id: <20170607003119.14778-6-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::244 Subject: [Qemu-devel] [PULL v2 05/70] 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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, uint64_t dest, } /* 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 = 0; + uint32_t i; + uint8_t c = 0; HELPER_LOG("%s l %d dest %" PRIx64 " src %" PRIx64 "\n", __func__, l, dest, src); + for (i = 0; i <= l; i++) { - x = cpu_ldub_data(env, dest + i) | cpu_ldub_data(env, src + i); - if (x) { - cc = 1; - } - cpu_stb_data(env, dest + i, x); + uint8_t x = cpu_ldub_data_ra(env, src + i, ra); + x |= cpu_ldub_data_ra(env, dest + i, ra); + c |= x; + cpu_stb_data_ra(env, dest + i, x, ra); } - return cc; + return c != 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()); } /* 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 = helper_oc(env, l, get_address(env, 0, b1, d1), - get_address(env, 0, b2, d2)); + cc = do_helper_oc(env, l, get_address(env, 0, b1, d1), + get_address(env, 0, b2, d2), 0); break; case 0x700: cc = helper_xc(env, l, get_address(env, 0, b1, d1), diff --git a/target/s390x/translate.c b/target/s390x/translate.c index afa2c6b..b1c1047 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3082,7 +3082,6 @@ static ExitStatus op_negf128(DisasContext *s, DisasOps *o) static ExitStatus op_oc(DisasContext *s, DisasOps *o) { TCGv_i32 l = 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);