From patchwork Tue May 23 03:03:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9741833 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 E54FF60210 for ; Tue, 23 May 2017 03:22:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBFD628684 for ; Tue, 23 May 2017 03:22:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0D2128781; Tue, 23 May 2017 03:22:15 +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 7F02428684 for ; Tue, 23 May 2017 03:22:15 +0000 (UTC) Received: from localhost ([::1]:45937 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD0Ok-00047A-NP for patchwork-qemu-devel@patchwork.kernel.org; Mon, 22 May 2017 23:22:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55046) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD072-000618-0L for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dD071-00040W-0W for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:56 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:34215) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dD070-00040O-Sd for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:54 -0400 Received: by mail-qt0-x241.google.com with SMTP id l39so20704501qtb.1 for ; Mon, 22 May 2017 20:03:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=Bt31iLhXnru7a6WxbmORvyzMATnBr6ZAi7fJv10Wsso=; b=gIaH4rSFKyVMrwmsrPqlYYGj0p2+46UGQSXljG1Qp1MdPbB0w6l6EP2nLGW70ByuMC 1u3gbStPScfK8LtEiQRxhV4HcBAZ2iRx6POzQa+tzzATSwzLJgrP2siaYj1zjbEP9IRg D6fbTLHcygieS24WQ7ktyf2bHa0lkXT/PKCCY0erLB3XRfVyTKVWqrDJAwzuDiBznsLu /WbRLO9MoR/lytYpnGs+J3jh3zHyMUZWRuT/gv0qNm9Jb6xJnDaO9z/RjEkAe7Ibl6Jt n1SoIKUTkvs1D6BQbgeBTkKIqQMETRW3I1HRx0GPJsiNEx9KOrz4+I5TWBsD1bKCxOxL xcnQ== 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:subject:date:message-id :in-reply-to:references; bh=Bt31iLhXnru7a6WxbmORvyzMATnBr6ZAi7fJv10Wsso=; b=hLYHd+Q5kNsjGAIQLAuRoRLNfEQSLjbC7X+ggJ6qi5y+qSRuWCBdPw82mDbDglPz/l RatGalWruVC3MYvltqOoiCiIOMF8LSwW+PqmKwH5YgtsEUMiwGDRAfERZVxcLyAgIH6P I9PJZuaocLujBzvR1uvNoDSVUmW1UVtp4fcp5chTBukmNlxsGsOTGLg0nLAj5OgLg9Gw N3ECpR5+zb7nYS+gePCu85FwJ1TEYBcpgA+AWawOv1TDsMQUeJ/LEabFgyo3jdvPDTJn oZwMTt9mR88Y/UmztzsBdBaVgeQStLqpI00s7GdyJ5H4HxuMQYp+hXchSDLYehfQzaMe 6viA== X-Gm-Message-State: AODbwcBlAYwW+JE9jzFs/cmKu1ht7ZCxKZ6xk8PZsGwPKubE5psQAl6y hyIjhy7guV1Em/yefVY= X-Received: by 10.200.34.109 with SMTP id p42mr25905233qtp.17.1495508634157; Mon, 22 May 2017 20:03:54 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id s190sm12918805qkh.57.2017.05.22.20.03.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 20:03:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 22 May 2017 20:03:12 -0700 Message-Id: <20170523030312.6360-32-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170523030312.6360-1-rth@twiddle.net> References: <20170523030312.6360-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::241 Subject: [Qemu-devel] [PATCH 31/31] 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Richard Henderson Reviewed-by: Thomas Huth Reviewed-by: Aurelien Jarno --- 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 4becc80..d8d29bd 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1031,6 +1031,7 @@ uint32_t HELPER(rrbe)(CPUS390XState *env, 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", @@ -1044,7 +1045,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; @@ -1052,6 +1054,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", @@ -1065,7 +1068,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 ca5be7b..67c85f0 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2928,7 +2928,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; @@ -2938,7 +2937,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;