From patchwork Mon Jun 19 18:18:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9797147 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 3DA0C600C5 for ; Mon, 19 Jun 2017 18:25:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 14C4128459 for ; Mon, 19 Jun 2017 18:25:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 099BF28464; Mon, 19 Jun 2017 18:25:14 +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 88F8E28459 for ; Mon, 19 Jun 2017 18:25:13 +0000 (UTC) Received: from localhost ([::1]:43847 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dN1MO-0004Wy-P2 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 19 Jun 2017 14:25:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33411) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dN1GK-0008Rc-Hv for qemu-devel@nongnu.org; Mon, 19 Jun 2017 14:18:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dN1GJ-0002IS-Lv for qemu-devel@nongnu.org; Mon, 19 Jun 2017 14:18:56 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:35284) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dN1GJ-0002I4-Fo for qemu-devel@nongnu.org; Mon, 19 Jun 2017 14:18:55 -0400 Received: by mail-pg0-x241.google.com with SMTP id f127so17441853pgc.2 for ; Mon, 19 Jun 2017 11:18:55 -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 :mime-version:content-transfer-encoding; bh=yf+TSjnTHQesFljA4kfkMsBvxUaeAIsKE32YkPDJoWQ=; b=uaV5wWikiGsvuf0EJUd4y/ZejAHGzWh7TswJw1Q59a7qzNONHGlINNaVIfb7pGdB7Q n+35k3R/cED1SjQRXE/81KM9FhoizLUmoIlvik6OqdfC4Um2OtwPaUnTieLJ8TQIf8lF /d2MwB/oP8u3sHWADi47AGwFbbnosaPGuZHIrd9ytAEbH/6weXwZs57OV4RQGAOGv9ke LLj6GJKITefxBF+THOVNlIBaha6XR/yC1rug01U9WbFkWfZga9pcGxvShXunf/7zBDJc MJ/7sunvzP01J/ypONVe4+/+I6jVxm5bVfWIOM01VzytIgbe3k2yT2VNeoBtPHmUWDGH Ve2Q== 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:mime-version:content-transfer-encoding; bh=yf+TSjnTHQesFljA4kfkMsBvxUaeAIsKE32YkPDJoWQ=; b=APnfV1BFBKfvwEpHV/ualOwocBKKLsCBTvrOE9D+vAe+6c5GQyviKhhmyuWrwK9uFQ Xwr/7hgV4Do0PYSDFwlVHOathqXtssTxzOw1R8uN+Bj8I+Vy1Bp6WjmIX2SeWJ0nreKq QPMfrLxOlX22yymuyzBQHkBa5iSSXwI/3oNHto5NJlOxpZWxIpMwMmyEOPcYvHbpDuLZ +8NfDdajOXAoHqNF0aCU98U8Yoj7Fdwn2fADHGQ5aEhGBgHK1URHisfAcvKZV+rxAOnj cHMYXnphAGwqqEJfYGrjvliyNPuFP+ixh8fM/2LS8ZbDqs3Bw+V4nzPiDZ5WmsOoMB/O peSA== X-Gm-Message-State: AKS2vOz0npcGNKDMbDTegHa4fa6G9LfUBa0C1Q+hFmYOLS17cB/GyZ+v J1KBOVL6/TvPmuY/0w8= X-Received: by 10.99.116.28 with SMTP id p28mr12662368pgc.262.1497896334506; Mon, 19 Jun 2017 11:18:54 -0700 (PDT) Received: from pike.twiddle.net (97-113-165-157.tukw.qwest.net. [97.113.165.157]) by smtp.gmail.com with ESMTPSA id e63sm22917171pfb.18.2017.06.19.11.18.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Jun 2017 11:18:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 19 Jun 2017 11:18:38 -0700 Message-Id: <20170619181839.25249-12-rth@twiddle.net> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170619181839.25249-1-rth@twiddle.net> References: <20170619181839.25249-1-rth@twiddle.net> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PULL 11/12] target/s390x: Exit after changing PSW mask 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Exit to cpu loop so we reevaluate cpu_s390x_hw_interrupts. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- target/s390x/translate.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/target/s390x/translate.c b/target/s390x/translate.c index 8c055b7..6403542 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -1173,6 +1173,8 @@ typedef enum { /* We are exiting the TB, but have neither emitted a goto_tb, nor updated the PC for the next instruction to be executed. */ EXIT_PC_STALE, + /* We are exiting the TB to the main loop. */ + EXIT_PC_STALE_NOCHAIN, /* We are ending the TB with a noreturn function call, e.g. longjmp. No following code will be executed. */ EXIT_NORETURN, @@ -3795,7 +3797,8 @@ static ExitStatus op_ssm(DisasContext *s, DisasOps *o) { check_privileged(s); tcg_gen_deposit_i64(psw_mask, psw_mask, o->in2, 56, 8); - return NO_EXIT; + /* Exit to main loop to reevaluate s390_cpu_exec_interrupt. */ + return EXIT_PC_STALE_NOCHAIN; } static ExitStatus op_stap(DisasContext *s, DisasOps *o) @@ -4038,7 +4041,9 @@ static ExitStatus op_stnosm(DisasContext *s, DisasOps *o) } else { tcg_gen_ori_i64(psw_mask, psw_mask, i2 << 56); } - return NO_EXIT; + + /* Exit to main loop to reevaluate s390_cpu_exec_interrupt. */ + return EXIT_PC_STALE_NOCHAIN; } static ExitStatus op_stura(DisasContext *s, DisasOps *o) @@ -5788,6 +5793,7 @@ void gen_intermediate_code(CPUS390XState *env, struct TranslationBlock *tb) case EXIT_NORETURN: break; case EXIT_PC_STALE: + case EXIT_PC_STALE_NOCHAIN: update_psw_addr(&dc); /* FALLTHRU */ case EXIT_PC_UPDATED: @@ -5799,14 +5805,14 @@ void gen_intermediate_code(CPUS390XState *env, struct TranslationBlock *tb) /* Exit the TB, either by raising a debug exception or by return. */ if (do_debug) { gen_exception(EXCP_DEBUG); - } else if (use_exit_tb(&dc)) { + } else if (use_exit_tb(&dc) || status == EXIT_PC_STALE_NOCHAIN) { tcg_gen_exit_tb(0); } else { tcg_gen_lookup_and_goto_ptr(psw_addr); } break; default: - abort(); + g_assert_not_reached(); } gen_tb_end(tb, num_insns);