From patchwork Tue Jul 25 02:36:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9861073 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 6657760385 for ; Tue, 25 Jul 2017 02:40:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 512C426CFC for ; Tue, 25 Jul 2017 02:40:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 44B4126E49; Tue, 25 Jul 2017 02:40:25 +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 AB29726CFC for ; Tue, 25 Jul 2017 02:40:24 +0000 (UTC) Received: from localhost ([::1]:58093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZplo-0006xB-0y for patchwork-qemu-devel@patchwork.kernel.org; Mon, 24 Jul 2017 22:40:24 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56928) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dZpiL-0004fL-C5 for qemu-devel@nongnu.org; Mon, 24 Jul 2017 22:36:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dZpiK-0005nE-KZ for qemu-devel@nongnu.org; Mon, 24 Jul 2017 22:36:49 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:34749) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dZpiK-0005n6-GS for qemu-devel@nongnu.org; Mon, 24 Jul 2017 22:36:48 -0400 Received: by mail-qk0-x242.google.com with SMTP id q66so11589683qki.1 for ; Mon, 24 Jul 2017 19:36:48 -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=G4yP/x/pEvhcaVU4TLAta5dxFLG3PODHR/ckYtQ1dg0=; b=MK0EE6tCQozLxFiasPB7CygoYsBU/YI+w6ZvcHFbpzUyhCT9UGZ4HUAzAXA0RusEIk CQvD59CU1IV5LMyY4aRCZBjSD1E/jlfGO8car66ZR0mPLWAtcvoc0g6+LWWiZzJsuF3l Jep8yiqi5xstkVleU8wPMtDisYvOVkLMw1BtCyk8HB8pLiDe5R+5kcCe3jxEGRV1owsA RcSbeWxfaWbW/KkcY5IlhQ0bRBzoQvz8VMDjFwDkjZ8lbJK3kqCMd1+hf+OMqojlA83u MTgVcPJXxPhW1JSKZW9ELz180zWnG3kRX4iVBB5znndj7vUgoiYUNlc2X5xvT2Yrihm5 pUfw== 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=G4yP/x/pEvhcaVU4TLAta5dxFLG3PODHR/ckYtQ1dg0=; b=UkCwHkvg8sZ6p0+/CaP98Y3+sG+B0Dp8vgMwimsakzJf54qy/YL+k4AGGlt5lE2Tok ouva8J3NYlBNivWrkuHZiAxW057d0mxkCQ9IPV4OE19ylKa3/K4NBlvxxSR6yguRA/dh 2eLJtiei/ZSMpNgR9mh+6u7z81b+cqbUnJFf2yjm53/c9GXjTtMbyt+GAiRFQvfjNWol elazT3cTDTXoOETReRK9F3qB3KJal5/DhmrDB3XLBrqm8dnQWAOhXA2MxvnYi3F1H7at CBNKgaEpzNLcEcQi3eo5mmzdY6LeM+e3lAo5hQ+uuR144WYxmN63iBC10R/cPN33e4PB 8Njg== X-Gm-Message-State: AIVw1130GnShybZ2PgTOxZVpSoznnnckeCcXybaQ79hQR+O/nbSTDjG5 G0xjhew5GkvHFbpa08c= X-Received: by 10.55.21.28 with SMTP id f28mr13606588qkh.220.1500950207793; Mon, 24 Jul 2017 19:36:47 -0700 (PDT) Received: from bigtime.com ([71.217.194.233]) by smtp.gmail.com with ESMTPSA id l64sm8847707qkf.95.2017.07.24.19.36.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Jul 2017 19:36:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 24 Jul 2017 19:36:10 -0700 Message-Id: <20170725023611.9169-4-rth@twiddle.net> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170725023611.9169-1-rth@twiddle.net> References: <20170725023611.9169-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 3/4] target/s390x: Use unwind info in STSI 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: david@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Richard Henderson Reviewed-by: David Hildenbrand --- target/s390x/misc_helper.c | 3 ++- target/s390x/translate.c | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index 376dbd68c2..ab8551f605 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -388,7 +388,8 @@ uint32_t HELPER(stsi)(CPUS390XState *env, uint64_t a0, if ((r0 & STSI_LEVEL_MASK) <= STSI_LEVEL_3 && ((r0 & STSI_R0_RESERVED_MASK) || (r1 & STSI_R1_RESERVED_MASK))) { /* valid function code, invalid reserved bits */ - program_interrupt(env, PGM_SPECIFICATION, 2); + cpu_restore_state(ENV_GET_CPU(env), GETPC()); + program_interrupt(env, PGM_SPECIFICATION, ILEN_UNWIND); } sel1 = r0 & STSI_R0_SEL1_MASK; diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 9b0c35efa2..57f09154be 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -3988,7 +3988,6 @@ static ExitStatus op_stpt(DisasContext *s, DisasOps *o) static ExitStatus op_stsi(DisasContext *s, DisasOps *o) { check_privileged(s); - potential_page_fault(s); gen_helper_stsi(cc_op, cpu_env, o->in2, regs[0], regs[1]); set_cc_static(s); return NO_EXIT;