From patchwork Wed May 24 19:22:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 766646 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wY2dM4Gmrz9sP7 for ; Thu, 25 May 2017 05:33:59 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AuWA4T+x"; dkim-atps=neutral Received: from localhost ([::1]:56494 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDc2f-0003SJ-7P for incoming@patchwork.ozlabs.org; Wed, 24 May 2017 15:33:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45380) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDbsI-0001rx-5S for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDbsH-0001G0-Ay for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:14 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:33836) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dDbsH-0001FU-6T for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:13 -0400 Received: by mail-qk0-x242.google.com with SMTP id u75so27645497qka.1 for ; Wed, 24 May 2017 12:23:13 -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=AuWA4T+x/CKHqcHfMd3/8JxMNidkohugQoBpkd6lVO8qstEM/GcQAFLWNfMB5614aB MNqb66v3DoVwNfDktpZl/ajJkWWimMDmK32y4dxbZJ6GUjwRsJnL06MpHpl6YXRK7199 l8c4Nj7tJhEN1XDeJj991GYROCVNEp0BqgHi4/0DOmQ09rgEF518j1r5PT2WNsC+zHAO 5QTjY+HXpisyP+W1WWza6smpU9tpQSSGJjbx3qRy86LC5DL1296l921t8KJHlWnakCkp qcPCrh6qN6YwbI5VO5MJSygRvvGIa1BS7Xg2INRM8IuHfGSBBo5yBWLWoaco6q3UwpT2 sdTA== 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=nY3UA183ynCjnLmLOCh3Z7ZBDR960HIKsn+YvturYSwzCtblt9w+bV7vyVcqR7TXAO 7y/5/JbZGOqXJSQoPQk9xAu6GMnf9Zdc81ZNV0KJ4BbaAlIpyhMXnhaImB4cd1fdFCIq Jj6146SGzzmKB+lZAc76z3/04buWmzXSiUbcr2zvrcGep298wKYa0E4uey9ZiVdVoZYN CMKXbCPkUlsiRQl+09+gdfktpnXBpmtWnuJg91mDZw6W7CxMIuws2xLmkVU5bsimVlOM bpodkGvsIX3wDULNONzvHYiCeGSBDpOP94ymXNgGPeqtycjFnt1MfCgoxv1fGwP+Mpxh 3+tg== X-Gm-Message-State: AODbwcAzRWe1pCYnoqdgRHzqaChPWsTXqGeLS7BvIKRYy5e4NRei5k2c xi5kemBpB+pdqg== X-Received: by 10.55.149.130 with SMTP id x124mr34694262qkd.156.1495653792787; Wed, 24 May 2017 12:23:12 -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.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 12:23:12 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 24 May 2017 12:22:29 -0700 Message-Id: <20170524192246.15905-17-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:c09::242 Subject: [Qemu-devel] [PATCH v2 16/33] 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: thuth@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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);