From patchwork Wed Jun 7 00:30:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9770343 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 0A58560234 for ; Wed, 7 Jun 2017 00:47:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E02E5284EA for ; Wed, 7 Jun 2017 00:47:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D4D5E28524; Wed, 7 Jun 2017 00:47:05 +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 5AFF3284EA for ; Wed, 7 Jun 2017 00:47:05 +0000 (UTC) Received: from localhost ([::1]:40618 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIP7o-0007Rl-F7 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Jun 2017 20:47:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOt2-0002aV-Ux for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOt2-0001wK-3I for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:48 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:33041) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOt1-0001w8-Ui for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:48 -0400 Received: by mail-qt0-x243.google.com with SMTP id w1so26595514qtg.0 for ; Tue, 06 Jun 2017 17:31:47 -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=uEolkX3Fhf+5sGFCwikj2a4r+aT2bQ99p0yrILxbERE=; b=nKxrW3ii0ZsoIk+pLay5nG7yahRCSxxdcioselmlOG0AAQRPGQnJNAiytl8B+giOzm XfvhdrBDWM2Hv9N+jlhvftGWPGJCRNqtTLSMseeSwft/aw6zCF9kqoef/VmXFCy2vmFZ d7cplKIVkHLM7Yq4eg2fHfvhmop1CcFn9xJx1+FTWO1BNnrXG7gbiST6vX5K9YzD7V3O skRq0kdpOZa8kQEn227V4GszeAZ8Qi+GSKpryHBumX4H1TuwZjkbJDSoN0PnpwPxtMHH Whrbwghoj0i639vrjjQjntOgn8WgIStfYMFf5kp0Bvm1TVcsiO1yWU6XwLFv7F/7AkMh 0wdQ== 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=uEolkX3Fhf+5sGFCwikj2a4r+aT2bQ99p0yrILxbERE=; b=S7sX4mbw9AkjlQbPtE6RwYdUUWWEX5YNotBjL1E1p0VzNyUhTm0/B4JlYxPyECTyP+ 3McDJ7eZfEFMhZQnG3ppL3HnV/p4gKCyReqR6zHBXZ4uVG03k1JcSDjOZv7PLcF/s18h HpL2XumV/z2zZfqR2l6d7M3fbcgS5qOX9+WyB5inuTvJ9b4DYdPNqa1bUXAXE2fnRuVo 0wekfhy4SVg09CFI+vjLEC8wYTD1N4KbSV7ln/xW4YxGoLPeFBGGbCgWRMJCSgJiVW0v 0Ffw3/XxwCLwsvis+O/qrHfneAtKAbwnxOC3UzopjixLuJ5s0MkNEzcJ8FfV5GZB3B/Y Q4jw== X-Gm-Message-State: AODbwcCZ9n/8eX4+Z0xV9FkdJdOO5ALC+4RcD1c8KOkwWv8Ci0HxFtcD HrIGU6Ir7LMW57GMxz0= X-Received: by 10.237.60.77 with SMTP id u13mr37347676qte.18.1496795507307; Tue, 06 Jun 2017 17:31:47 -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.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:46 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:26 -0700 Message-Id: <20170607003119.14778-18-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:c0d::243 Subject: [Qemu-devel] [PULL v2 17/70] 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 e3c5ba1..eaa3adc 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2887,7 +2887,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);