From patchwork Wed May 24 19:22:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9746821 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 9ED8360210 for ; Wed, 24 May 2017 19:48:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7C6641FF3D for ; Wed, 24 May 2017 19:48:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CCEF289C9; Wed, 24 May 2017 19:48:23 +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 95A102891B for ; Wed, 24 May 2017 19:48:22 +0000 (UTC) Received: from localhost ([::1]:56580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDcGb-0000JK-TZ for patchwork-qemu-devel@patchwork.kernel.org; Wed, 24 May 2017 15:48:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45545) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDbsZ-00028x-6R for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDbsY-0001lS-AD for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:31 -0400 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:36246) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dDbsY-0001lN-5n for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:30 -0400 Received: by mail-qt0-x244.google.com with SMTP id j13so27554980qta.3 for ; Wed, 24 May 2017 12:23:30 -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=Cb8GdMYe0tF3tDR/aGBoSDCEqgMRUiW3Oo3XwU8bGC4=; b=RuGfuUGY87Sqf86rjonc255oIaLjV6i9SVw4UaA7tM7Ft6ZNozjW3YqzxQu+qku5rl +qyJlV8zsqegnMVnN3y8xjFLa/TWkGv/WbFy0t6GEgpJQGUOl4xAa631fRY9GApC3E+0 cp0hsodJTiQXD8fVKp/quZ5LV6R5/OmfTwyRiekl64g0HOfkB1zyWDnUv9gh8Z8n5+Qo oFOlgkcpYxLBdL6+FntVxyxrQv3Xm5jAZlcD/3qUHkKLZ0I1i2ZFpkLPBr38eLXMlCt5 En8s/lntWDnuUCtJm0JoSZ5DXVy+zTPkPT3INX54FhM7bNkIJxFLO6gIHHlCEWr13xCq xNGA== 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=Cb8GdMYe0tF3tDR/aGBoSDCEqgMRUiW3Oo3XwU8bGC4=; b=Y2681F/SO8OucSWW2gItbxUScPhLdMUNCNcA7gMTP5fzAXx/Tgpq4WC4w3BSmwW/14 TycXLUish9OnrwwSmTkMpRoLHBN4uWzfRaFIo7UWgg/W1mPYnSrM8cNKBvK2dS0BvNAy IpI7XO/z6P2uQhN9zNmUiyoxcj8s1lVX54xfsfcdslww60v6WIGlxFL7gkAnTUafwwFR E+lAYyEbE5TH4uck6kn3kn94l7R/bxIWu1vKYeX5cANkuLLW1FHepyDp5A6rnq5sdnPM d3kx3XCGimHaNeT+Fa6R2213wxO7E14r9U3gZhZ9gRQNXgO6Gmph+5iZaauv2raQT5MB jIoA== X-Gm-Message-State: AODbwcDPNlaB9S7uLitJzf3SRibn+LST4hVwwm43bIZXV0BFijV36usz jIjURguaa2Vj2e72mqQ= X-Received: by 10.200.57.57 with SMTP id s54mr38788468qtb.53.1495653809474; Wed, 24 May 2017 12:23:29 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id b23sm3296240qkb.31.2017.05.24.12.23.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 12:23:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 24 May 2017 12:22:42 -0700 Message-Id: <20170524192246.15905-30-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170524192246.15905-1-rth@twiddle.net> References: <20170524192246.15905-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::244 Subject: [Qemu-devel] [PATCH v2 29/33] target/s390x: Use unwind data for helper_mvcs/mvcp 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: thuth@redhat.com, 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: Thomas Huth Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/mem_helper.c | 8 ++++++-- target/s390x/translate.c | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 17d8257..a73d486 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1082,6 +1082,7 @@ uint32_t HELPER(csp)(CPUS390XState *env, uint32_t r1, uint64_t r2) uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2) { + uintptr_t ra = GETPC(); int cc = 0, i; HELPER_LOG("%s: %16" PRIx64 " %16" PRIx64 " %16" PRIx64 "\n", @@ -1095,7 +1096,8 @@ uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2) /* XXX replace w/ memcpy */ for (i = 0; i < l; i++) { - cpu_stb_secondary(env, a1 + i, cpu_ldub_primary(env, a2 + i)); + uint8_t x = cpu_ldub_primary_ra(env, a2 + i, ra); + cpu_stb_secondary_ra(env, a1 + i, x, ra); } return cc; @@ -1103,6 +1105,7 @@ uint32_t HELPER(mvcs)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2) uint32_t HELPER(mvcp)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2) { + uintptr_t ra = GETPC(); int cc = 0, i; HELPER_LOG("%s: %16" PRIx64 " %16" PRIx64 " %16" PRIx64 "\n", @@ -1116,7 +1119,8 @@ uint32_t HELPER(mvcp)(CPUS390XState *env, uint64_t l, uint64_t a1, uint64_t a2) /* XXX replace w/ memcpy */ for (i = 0; i < l; i++) { - cpu_stb_primary(env, a1 + i, cpu_ldub_secondary(env, a2 + i)); + uint8_t x = cpu_ldub_secondary_ra(env, a2 + i, ra); + cpu_stb_primary_ra(env, a1 + i, x, ra); } return cc; diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 141be22..422bbf1 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2889,7 +2889,6 @@ static ExitStatus op_mvcp(DisasContext *s, DisasOps *o) { int r1 = get_field(s->fields, l1); check_privileged(s); - potential_page_fault(s); gen_helper_mvcp(cc_op, cpu_env, regs[r1], o->addr1, o->in2); set_cc_static(s); return NO_EXIT; @@ -2899,7 +2898,6 @@ static ExitStatus op_mvcs(DisasContext *s, DisasOps *o) { int r1 = get_field(s->fields, l1); check_privileged(s); - potential_page_fault(s); gen_helper_mvcs(cc_op, cpu_env, regs[r1], o->addr1, o->in2); set_cc_static(s); return NO_EXIT;