From patchwork Wed May 24 19:22:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9746819 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 4D6B360209 for ; Wed, 24 May 2017 19:46:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EC9D2891B for ; Wed, 24 May 2017 19:46:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32065289C9; Wed, 24 May 2017 19:46:49 +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 8D1AC2891B for ; Wed, 24 May 2017 19:46:48 +0000 (UTC) Received: from localhost ([::1]:56555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDcF5-0006lu-BW for patchwork-qemu-devel@patchwork.kernel.org; Wed, 24 May 2017 15:46:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDbsX-00027A-Ix for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDbsW-0001kt-QA for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:29 -0400 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:35871) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dDbsW-0001k8-Ls for qemu-devel@nongnu.org; Wed, 24 May 2017 15:23:28 -0400 Received: by mail-qk0-x241.google.com with SMTP id y128so27718268qka.3 for ; Wed, 24 May 2017 12:23:28 -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=cbq6KL57uP0oBaBLIBzD2aFSzZRhCiv9kGqVIJcCjZ8=; b=YlZU7OmavprZzsiRvL1cDlrti3xTVNVEAsaTRte5bJU881fHUzDmX+MRYFgXt0b6jS psClrQuR++K05w0djE4FphOV6kKLI4nfbTp+mPR2IhcLEaMCBXIsHhUx1lfwg2Qe37ir R1561sZHyCVi1mZX2H2fuBFtrU/KmJGRzrF35R2KPzg8m5lxgnDAyrfKk0KXCNUTPOSs EfX7rAtOw2w0dCI1EaGdQJWP2FyAnLGj+d9PP6zifFWtKfAMJoYI22rdzFHU/kAxbkT8 YFaknxzhLYRCArrKDHxEOlg2gxBAuBzKahr+UR4N7QBUYE+7Xh/b/PzpRC8iBiy23+HH qe2w== 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=cbq6KL57uP0oBaBLIBzD2aFSzZRhCiv9kGqVIJcCjZ8=; b=Z/G/OcLsM9YgykUrT3wEgUehGOFs8nK/6IbjZFZvHohucaz64R2honuvzwaZePDY5v 8VvdSvc84GC1gQuSdPMkG284q/sJ0DtRyNAZc0VqfCLwvKQs4LeMNA3jSlxFuGZmQzRP rbdXLqDmK5egZn8RrOmSi68Icg2zUmPB9nbciRaxvQrCTPOQ3jXJkwAVl1QCc2etO+32 Nog5prqJI4X4tdjKAExZofA4MyMQ6BmGiYINWmg1RkQkbTLPWrm+erzeIYfWhdC+kSrX /hjdb49/YLAK0vckKI9Pywvcf++u8cJ8kazXa9LvrV+q5aS7v5Lf75qEx+eGp41YPNbz fnag== X-Gm-Message-State: AODbwcAZlHdm4PO/KaImMhULoRVZA/ZHQJcHhXqh9jWOnegkVSHHYZOR rpggD99KKuToIVtq4kU= X-Received: by 10.55.137.133 with SMTP id l127mr34473673qkd.251.1495653808025; Wed, 24 May 2017 12:23:28 -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.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 May 2017 12:23:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 24 May 2017 12:22:41 -0700 Message-Id: <20170524192246.15905-29-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::241 Subject: [Qemu-devel] [PATCH v2 28/33] target/s390x: Use unwind data for helper_lra 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 Fix saving exception_index around mmu_translate; eliminate a dead store. Signed-off-by: Richard Henderson Reviewed-by: Aurelien Jarno --- target/s390x/mem_helper.c | 6 +++--- target/s390x/translate.c | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c index a8c85c9..17d8257 100644 --- a/target/s390x/mem_helper.c +++ b/target/s390x/mem_helper.c @@ -1208,17 +1208,17 @@ uint64_t HELPER(lra)(CPUS390XState *env, uint64_t addr) { CPUState *cs = CPU(s390_env_get_cpu(env)); uint32_t cc = 0; - int old_exc = cs->exception_index; uint64_t asc = env->psw.mask & PSW_MASK_ASC; uint64_t ret; - int flags; + int old_exc, flags; /* XXX incomplete - has more corner cases */ if (!(env->psw.mask & PSW_MASK_64) && (addr >> 32)) { + cpu_restore_state(cs, GETPC()); program_interrupt(env, PGM_SPECIAL_OP, 2); } - cs->exception_index = old_exc; + old_exc = cs->exception_index; if (mmu_translate(env, addr, 0, asc, &ret, &flags, true)) { cc = 3; } diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 7b9c111..141be22 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -2560,7 +2560,6 @@ static ExitStatus op_lctlg(DisasContext *s, DisasOps *o) static ExitStatus op_lra(DisasContext *s, DisasOps *o) { check_privileged(s); - potential_page_fault(s); gen_helper_lra(o->out, cpu_env, o->in2); set_cc_static(s); return NO_EXIT;