From patchwork Wed Jun 7 00:30:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9770323 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 70ACB60234 for ; Wed, 7 Jun 2017 00:40:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 520BC284EA for ; Wed, 7 Jun 2017 00:40:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4729728522; Wed, 7 Jun 2017 00:40:54 +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 EB6EE284EA for ; Wed, 7 Jun 2017 00:40:53 +0000 (UTC) Received: from localhost ([::1]:40588 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIP1o-0001dc-Sx for patchwork-qemu-devel@patchwork.kernel.org; Tue, 06 Jun 2017 20:40:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIOt2-0002Zi-1f for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIOt1-0001vp-0Q for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:48 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:36524) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dIOt0-0001vi-TA for qemu-devel@nongnu.org; Tue, 06 Jun 2017 20:31:46 -0400 Received: by mail-qk0-x243.google.com with SMTP id y201so11028236qka.3 for ; Tue, 06 Jun 2017 17:31:46 -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=qJ8WgrcjmoY+c983MAuEcxZf9L0ZzuumUfjPKYENsbY=; b=oBOULfR+79r61mZ4SiBwFPkMs1ZVZ97SvX2iNrDGFaXjR11aoANO9X08XUUbX9LCaq nKO1EQgQ8gpidyFvhy+OWDQLzkkj1D5ZmKUN5tr4Gz8adIm/fRbRM87TzVAKe6EX+6KS JFcwFfZO5DWEeh4gY5sA2/tfD8cygg31jOCniTK9kxN0802kHTmxl1SXZn7216cRPEQs Ttpnwcon9YDZgUyMYcpo9DzD6UnbYMaRfkW4FgJ5RqDyDghLgAe74sRuqtx9z0dqM3/8 XJc0K0w4RGhlmxRmKQwuGPjucXMW+t97MqQJZ8n8Q2D9rxcEUorwyrSpU3xuUkQbHENR 9mRQ== 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=qJ8WgrcjmoY+c983MAuEcxZf9L0ZzuumUfjPKYENsbY=; b=VBRnEB1jFvHxah3Cl1cA9uOwZkMaMrWq3y/6UH72S51+w2Mg7IljuMeQCO3UcaVIZf UYon0Exb+ikBP0j9HGhCf6K9TiaF/Wh9vkpB3JcuDyNObVoCOSr3NtgIW94YCQuaD7pF vabRBgCJF4JB+QuIDGnXpQ8nCApwEQrYn2UyRLdQ5HyPWtFJ9Z4v0AxYJdo7qmkiNw+2 Z9/sWMr9NJQojCDFnby9rlYZgXTD5kxu/n5uQXe7DJKFRUXSIYNB1E4GSN6NN10L3j5s 6WzxPuGI25a2AwwpBeDz8sHH8EZuiFPV123lxB4njve3XfAPpOjtjMcNb49tlWaNOjCz pm/Q== X-Gm-Message-State: AODbwcDWtI5mKOfbJxavZyH9ND9jEAMprHbBTJHK4K5mCJPINppPUC0r yVq9HgLi70Q413ygjFA= X-Received: by 10.55.43.93 with SMTP id r90mr32217682qkh.196.1496795506123; Tue, 06 Jun 2017 17:31:46 -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.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 17:31:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 17:30:25 -0700 Message-Id: <20170607003119.14778-17-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:c09::243 Subject: [Qemu-devel] [PULL v2 16/70] target/s390x: Use unwind data for helper_mvcl 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 2acc984..49cfc9b 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -501,6 +501,7 @@ void HELPER(stam)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) /* move long */ uint32_t HELPER(mvcl)(CPUS390XState *env, uint32_t r1, uint32_t r2) { + uintptr_t ra = GETPC(); uint64_t destlen = env->regs[r1 + 1] & 0xffffff; uint64_t dest = get_address_31fix(env, r1); uint64_t srclen = env->regs[r2 + 1] & 0xffffff; @@ -522,12 +523,12 @@ uint32_t HELPER(mvcl)(CPUS390XState *env, uint32_t r1, uint32_t r2) } 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 4ae949a..e3c5ba1 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2876,7 +2876,6 @@ static ExitStatus op_mvcl(DisasContext *s, DisasOps *o) { TCGv_i32 r1 = tcg_const_i32(get_field(s->fields, r1)); TCGv_i32 r2 = tcg_const_i32(get_field(s->fields, r2)); - potential_page_fault(s); gen_helper_mvcl(cc_op, cpu_env, r1, r2); tcg_temp_free_i32(r1); tcg_temp_free_i32(r2);