From patchwork Tue May 23 03:02:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9741799 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 C951560388 for ; Tue, 23 May 2017 03:12:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0A3A28709 for ; Tue, 23 May 2017 03:12:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B5C1028784; Tue, 23 May 2017 03:12:29 +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 2CA8D28709 for ; Tue, 23 May 2017 03:12:28 +0000 (UTC) Received: from localhost ([::1]:45887 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD0FI-0003lZ-4P for patchwork-qemu-devel@patchwork.kernel.org; Mon, 22 May 2017 23:12:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54826) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dD06e-0005hE-Of for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dD06d-0003pZ-U6 for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:32 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:34197) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dD06d-0003pC-Ps for qemu-devel@nongnu.org; Mon, 22 May 2017 23:03:31 -0400 Received: by mail-qt0-x242.google.com with SMTP id l39so20703802qtb.1 for ; Mon, 22 May 2017 20:03:31 -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=a/vh4L+4uGaqObHhi8aGtzDBbQcP83eYUZp6qJSsYeI=; b=EneKaqXNrDd7eoZcZyC60GB6tnB+qnwXKLddczlDVrdPtylmv6rdNHn+POZFdMe0QV eKiry2ng9a7wPIOJDa7p+YiBytfsk77djMoteKshBNC8f0iij85VQO8mIYcu+Ar/u3Ho JmpF17PlDxgIf/vIz4ioZ8Qm27WQnuyyLdbYv0N38DwcMpMqQQ2Xi2jTwNQxKyQB8LN1 64sE0xsrHAwEOGzHUSWSdABx74M+yZLnMD5/UhuI2hpXdpK4C/LCtHL9dZO0jLmLYzVo /Z4RmJ9G6ZUZiIegS3aBVSY7R4kaUst5EgQwCY859e+BZv8L1fBl3mxlYby1qn/x4Rrm eh5A== 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=a/vh4L+4uGaqObHhi8aGtzDBbQcP83eYUZp6qJSsYeI=; b=Ew8cQEsqU5s335Ep2Ex6/GwGEE1lTcPreb84lFTq022/vt5V5PfQIF9QiyCDg6AtLy WrUYnggvO9we1QsIsQgnu1u3q/sduimi6g2H9G+ZYADBS8ofVTxG3nrPWuzKiqlQvZbV hWBnzuNg1PI2j4cpYjUdKgPta8VbfTRaDucQIEatMrjr3Zxn9JoKaLCgzuEcswTG8lEu Go7pHYfilXf29zeWYhzcA9kQY6hVQZTYmKJSfnpokNIfQnPt8PmYv/AEIKbZesnTCw7d xkeE9wS68ur7maMVcb4++oaBlbvU7XpnfiKLmFbxtmOj259HDMafF7/acTeA6+8IfiZg TwmA== X-Gm-Message-State: AODbwcCmKen6H+Qn6BGSMy9swTf6UG/MRB2VKgfNxaRhKXNhubGME+k6 nDYqp+keGshikmJfXl0= X-Received: by 10.200.57.37 with SMTP id s34mr23571510qtb.141.1495508611098; Mon, 22 May 2017 20:03:31 -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.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 20:03:30 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 22 May 2017 20:02:52 -0700 Message-Id: <20170523030312.6360-12-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::242 Subject: [Qemu-devel] [PATCH 11/31] target/s390x: Use unwind data for helper_mvpg 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/helper.h | 2 +- target/s390x/mem_helper.c | 9 +++++---- target/s390x/translate.c | 3 +-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/s390x/helper.h b/target/s390x/helper.h index d6cc513..2b4e7be 100644 --- a/target/s390x/helper.h +++ b/target/s390x/helper.h @@ -12,7 +12,7 @@ DEF_HELPER_FLAGS_3(divs64, TCG_CALL_NO_WG, s64, env, s64, s64) DEF_HELPER_FLAGS_4(divu64, TCG_CALL_NO_WG, i64, env, i64, i64, i64) DEF_HELPER_4(srst, i64, env, i64, i64, i64) DEF_HELPER_4(clst, i64, env, i64, i64, i64) -DEF_HELPER_4(mvpg, void, env, i64, i64, i64) +DEF_HELPER_FLAGS_4(mvpg, TCG_CALL_NO_WG, i32, env, i64, i64, i64) DEF_HELPER_4(mvst, i64, env, i64, i64, i64) DEF_HELPER_FLAGS_4(ex, TCG_CALL_NO_WG, void, env, i32, i64, i64) DEF_HELPER_FLAGS_4(stam, TCG_CALL_NO_WG, void, env, i32, i64, i32) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 7c9e7c7..9ef9f4a 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -373,11 +373,12 @@ uint64_t HELPER(clst)(CPUS390XState *env, uint64_t c, uint64_t s1, uint64_t s2) } /* move page */ -void HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint64_t r1, uint64_t r2) +uint32_t HELPER(mvpg)(CPUS390XState *env, uint64_t r0, uint64_t r1, uint64_t r2) { - /* XXX missing r0 handling */ - env->cc_op = 0; - fast_memmove(env, r1, r2, TARGET_PAGE_SIZE, 0); + /* ??? missing r0 handling, which includes access keys, but more + importantly optional suppression of the exception! */ + fast_memmove(env, r1, r2, TARGET_PAGE_SIZE, GETPC()); + return 0; /* data moved */ } /* string copy (c is string terminator) */ diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 735aa82..a1edc79 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2921,8 +2921,7 @@ static ExitStatus op_mvcs(DisasContext *s, DisasOps *o) static ExitStatus op_mvpg(DisasContext *s, DisasOps *o) { - potential_page_fault(s); - gen_helper_mvpg(cpu_env, regs[0], o->in1, o->in2); + gen_helper_mvpg(cc_op, cpu_env, regs[0], o->in1, o->in2); set_cc_static(s); return NO_EXIT; }