From patchwork Wed May 24 19:22: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: 9746781 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 B83AC601C2 for ; Wed, 24 May 2017 19:31:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A834628998 for ; Wed, 24 May 2017 19:31:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9B3C1289C9; Wed, 24 May 2017 19:31: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 1F5D028998 for ; Wed, 24 May 2017 19:31:54 +0000 (UTC) Received: from localhost ([::1]:56486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDc0f-0000fF-7Y for patchwork-qemu-devel@patchwork.kernel.org; Wed, 24 May 2017 15:31:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDbsE-0001nq-Do for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDbsD-00019J-Gg for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:10 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:35381) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dDbsD-00018m-Cm for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:09 -0400 Received: by mail-qt0-x242.google.com with SMTP id r58so27541525qtb.2 for ; Wed, 24 May 2017 12:23:09 -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=apgZypxk/LkGMda7nHPRcuNHBHZtwBctwR57de8riM0=; b=qv8vgDDOWpuWWkCk0xf0ajNp+tFim1I1A60RMYNtwjfK1Ni9oaMBXbqo7OEeu9iV+7 YDJMSHDQbFinu9lFxUZ3/iOblfLhm5akkn6maoY1MUaetka5UnOWSv/JNAfJh1Zy54vC k4SSqW+HpAaAOhOAK1CLqNTZRCGBY6Wqvl2xRsK8sk+qVSZe34vd6CuO4xfia3xGyi2m +sNl5yMkXPbLVy2BBUySdrUwDKTxCnuYbp2LyvvdEVTYXpRazIS3Q0+qHYkDfer7S0Qf gysHmlqd3WDXQU/2lujau+XFdIrfXhi0ikI1xwna3+oweVe/enS0QUFF0kQlulJIS0Ay YAVg== 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=apgZypxk/LkGMda7nHPRcuNHBHZtwBctwR57de8riM0=; b=UIrtrlQ4mKIOS+e3NgfCc6LYFzSzDs/j9zAjZVtBg/pkpmVL0AJB4S0Iuow+vwdpuU GhLxvEw76PvS/EzFGonk9TX00cu9pWprMG8p78HVuqQ5sgeVfUQB/a0qZ9/HbujBM/MV 4FlAsCGEfPujpdjRr2gIFbQhhnNDSDs9eyIirBVEmCtIkHR0lrWVFOT2vEyiHKUx+2u3 pgP5tpZJBDfif2fGSoQCPLAqy9I0KFOWESywlSYuuQB2AtaNYPX85JOEaBvbm6XXGXYx zxpkp0YHAy+lmbxhI3jGAyuol5m8H13G15OES1/1cYt58j2JOKdPCxr1mxSCxw+hLsfP cOoQ== X-Gm-Message-State: AODbwcCb9lDxpRG0ThoMGTD8MhSRrep3v4Zy3lcAbcjvnr6tN9yTyQpQ DERwkDAmOMbukA== X-Received: by 10.237.63.39 with SMTP id p36mr35407040qtf.81.1495653788989; Wed, 24 May 2017 12:23:08 -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.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 12:23:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 24 May 2017 12:22:26 -0700 Message-Id: <20170524192246.15905-14-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::242 Subject: [Qemu-devel] [PATCH v2 13/33] target/s390x: Use unwind data for helper_lam 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 | 3 ++- target/s390x/translate.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index e4bfc6e..88e817a 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -469,10 +469,11 @@ static uint32_t helper_icm(CPUS390XState *env, uint32_t r1, uint64_t address, /* load access registers r1 to r3 from memory at a2 */ void HELPER(lam)(CPUS390XState *env, uint32_t r1, uint64_t a2, uint32_t r3) { + uintptr_t ra = GETPC(); int i; for (i = r1;; i = (i + 1) % 16) { - env->aregs[i] = cpu_ldl_data(env, a2); + env->aregs[i] = cpu_ldl_data_ra(env, a2, ra); a2 += 4; if (i == r3) { diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 86e5567..dca2096 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2621,7 +2621,6 @@ static ExitStatus op_lam(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_lam(cpu_env, r1, o->in2, r3); tcg_temp_free_i32(r1); tcg_temp_free_i32(r3);