From patchwork Sun Jun 4 17:34:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9765081 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 D0EC6601D7 for ; Sun, 4 Jun 2017 17:41:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0C7F27F88 for ; Sun, 4 Jun 2017 17:41:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 916A4280FC; Sun, 4 Jun 2017 17:41:50 +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 0261627F88 for ; Sun, 4 Jun 2017 17:41:49 +0000 (UTC) Received: from localhost ([::1]:57849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZXA-0003sG-Ou for patchwork-qemu-devel@patchwork.kernel.org; Sun, 04 Jun 2017 13:41:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHZRB-0007Q6-MQ for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHZRA-0002y5-R7 for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:37 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:36341) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHZRA-0002xX-Lk for qemu-devel@nongnu.org; Sun, 04 Jun 2017 13:35:36 -0400 Received: by mail-pf0-x241.google.com with SMTP id n23so18100700pfb.3 for ; Sun, 04 Jun 2017 10:35:36 -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=2Sca08XKrrmAoJUuanPY9mDeNfWR7Su8F3Kw/Tq2/vY=; b=DMgk51CAqjibumhkZVwYFmyh4RVaunBkF/Z32qPKfCsyjcaW/FEeZHGC7z2qIWDBYw mQI/NX8qXKRf5t66MFiE6saOr4qvK02KB/iSPqmftmYEGS+kGbfBUwF1u4pomPy9Q+Bt 1OGCFZ9GViRDi/myoXL98zedrNFhG65dj8WoyQFAxRgVYieOBcaBdsfJQqdJnAHwYHe4 qdAtpzSl76tVo+YYctBd+9AO43t069dMN8RpnIMdoXbKu4Sl0NI7gtjgmxTjTfoZSz2N MF8vrH1X8iKdJm16e6lAxQwGnojMSrKNKxn7BcYIz7V+jA7O5tqXtIhzInEJzlmKRwzX J/hA== 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=2Sca08XKrrmAoJUuanPY9mDeNfWR7Su8F3Kw/Tq2/vY=; b=REccMvT98sjcQlNaEHhloRf04d1SXQaQaY7Ims+NZV36i9lljciSdK+D0XIlQyQIDO 7O9ZBVmF/yvXBanutJpRWYDI2mCEUc8x0BJNmwaOBTrY19z59+G8Wg+1Mq6ijnEocIS1 EXPrOWhg1SwcfMf8qIo45eH299D1z32Nv3chBdNgDSDQh+iVj4gnay/r1ui4kUV+o67e iUdIfoR2IRZoZYgUVcAtZG5qLL+Iv3+Kc6ceqx3A3bMtXM7FZE+HTUwzUp4KLwBULuVG zVt/Fm4zYUI/Nb2Pj9yKfBuFChzz+Q5/rcunkPsFBUWRadwBhhEt4oY+R7QNcZkkd1wm JJTw== X-Gm-Message-State: AODbwcBxdeskqSHEkEZ9pOyITPig6STHE++rEa6oqs1c8p/ZBqHnmgRy Zldhyxwpx+K994YOwco= X-Received: by 10.99.159.10 with SMTP id g10mr7862162pge.223.1496597735642; Sun, 04 Jun 2017 10:35:35 -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.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Jun 2017 10:35:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 4 Jun 2017 10:34:17 -0700 Message-Id: <20170604173509.29684-18-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:c00::241 Subject: [Qemu-devel] [PULL 17/69] target/s390x: Use unwind data for helper_mvcle 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: Thomas Huth Reviewed-by: Aurelien Jarno Signed-off-by: Richard Henderson --- target/s390x/mem_helper.c | 7 ++++--- target/s390x/translate.c | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index 49cfc9b..8a095ad 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -544,6 +544,7 @@ uint32_t HELPER(mvcl)(CPUS390XState *env, uint32_t r1, uint32_t r2) uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) { + uintptr_t ra = GETPC(); uint64_t destlen = env->regs[r1 + 1]; uint64_t dest = env->regs[r1]; uint64_t srclen = env->regs[r3 + 1]; @@ -572,12 +573,12 @@ uint32_t HELPER(mvcle)(CPUS390XState *env, uint32_t r1, uint64_t a2, } for (; destlen && srclen; src++, dest++, destlen--, srclen--) { - v = cpu_ldub_data(env, src); - cpu_stb_data(env, dest, v); + v = cpu_ldub_data_ra(env, src, ra); + cpu_stb_data_ra(env, dest, v, ra); } for (; destlen; dest++, destlen--) { - cpu_stb_data(env, dest, pad); + cpu_stb_data_ra(env, dest, pad, ra); } env->regs[r1 + 1] = destlen; diff --git a/target/s390x/translate.c b/target/s390x/translate.c index fb2d6ff..b42acae 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2882,7 +2882,6 @@ static ExitStatus op_mvcle(DisasContext *s, DisasOps *o) { TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); TCGv_i32 r3 = tcg_const_i32(get_field(s->fields, r3)); - potential_page_fault(s); gen_helper_mvcle(cc_op, cpu_env, r1, o->in2, r3); tcg_temp_free_i32(r1); tcg_temp_free_i32(r3);