From patchwork Wed May 24 19:22:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9746805 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 5624460209 for ; Wed, 24 May 2017 19:39:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 46CE3289CC for ; Wed, 24 May 2017 19:39:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 39971289D2; Wed, 24 May 2017 19:39:38 +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 B880D289CC for ; Wed, 24 May 2017 19:39:37 +0000 (UTC) Received: from localhost ([::1]:56515 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDc88-0008Ed-DG for patchwork-qemu-devel@patchwork.kernel.org; Wed, 24 May 2017 15:39:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDbsG-0001qW-SU for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDbsG-0001EF-2z for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:12 -0400 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:35386) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dDbsF-0001DW-V5 for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:12 -0400 Received: by mail-qt0-x243.google.com with SMTP id r58so27541654qtb.2 for ; Wed, 24 May 2017 12:23:11 -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=4SGCzzu1Df3GyIWSY/yg6cnmzF1QwVGw36kkzCAFHH4=; b=t3uqZAZkOLvfD87eMD3oqMe1mC2nOHPzo0jSULGGOVh4xo1v66UshL8M8ypWvqBSRB XvMG/gA1pCo8WTy4+y8exI75xrCScZ78ecdObnEONVviFf4KWTWUNxN0CHcjPQ6FoqBS nLBZ0tSe4bXayz5hVmS+WAzXcx9JDO5KrRr2umtRcJdiy3GhdYQDNKgGeSLC5AQ56jtB 8Uw8GswUlF3WCqsM6yZdywAd5GbO9m1GdFNdUPIz2Anp0ZSvEuR2QLatkbBvyuTMoKJn qNd2ytjUFnrB4LhArzf1JxZnPQu89SjzYXYHifO9i92qLxWLxKzoR456cLtH28rub8HC xnvQ== 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=4SGCzzu1Df3GyIWSY/yg6cnmzF1QwVGw36kkzCAFHH4=; b=bsIdFLv7hFIX+0D9eQ5XcLFJFI5BZpzon4sPp/5h57U11vD6dpECYgivmvv9LhfrGF 2jr0Xd6sH9/FqWQpub/24oLqL+zd9lVbNas5If5ld58TsHfeHdVOof6L9QVPUTgxCt6M 5cA6fvkxu6v5OcfU3aaZ/eXBe0Up5Ux+o7LwNZblyR4VeYYUh3VVsNQ6oxhK55eW2HJ6 jvlyQQBiCIqVmNuB+lMv8/6oYAiYO6nixdk0E5j7YmNkgN1S+/hxOamhdVEPYY6a8oWt 3N/aLsBgGixg2QRkZztoLmnlm/RxbjWw1kRdcFW0o20IpbqsrMAAXqjZ2zcLGW3PPB1m x6wQ== X-Gm-Message-State: AODbwcCOXTKA725Ks8x5IIs2JfpjkM5majmiAIqFNaTUU8istYMBd6RI 3zq18L1kdbx1hQ== X-Received: by 10.200.50.183 with SMTP id z52mr32960914qta.234.1495653791526; Wed, 24 May 2017 12:23:11 -0700 (PDT) Received: from bigtime.twiddle.net.com ([2602:47:d954:1500:5e51:4fff:fe40:9c64]) by smtp.gmail.com with ESMTPSA id b23sm3296240qkb.31.2017.05.24.12.23.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 12:23:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 24 May 2017 12:22:28 -0700 Message-Id: <20170524192246.15905-16-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170524192246.15905-1-rth@twiddle.net> References: <20170524192246.15905-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] [PATCH v2 15/33] 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: thuth@redhat.com, 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 7af2a0b..fb2d6ff 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2871,7 +2871,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);