From patchwork Thu Sep 27 22:39:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 187527 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 07C9B2C00B5 for ; Fri, 28 Sep 2012 09:00:36 +1000 (EST) Received: from localhost ([::1]:38873 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THMlR-0004Oa-Gt for incoming@patchwork.ozlabs.org; Thu, 27 Sep 2012 18:41:01 -0400 Received: from eggs.gnu.org ([208.118.235.92]:35937) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THMkw-0003QK-Iu for qemu-devel@nongnu.org; Thu, 27 Sep 2012 18:40:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1THMku-00036Q-Hx for qemu-devel@nongnu.org; Thu, 27 Sep 2012 18:40:30 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:37069) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1THMku-00031E-Bj for qemu-devel@nongnu.org; Thu, 27 Sep 2012 18:40:28 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so1737833pad.4 for ; Thu, 27 Sep 2012 15:40:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=9EDoL4p98kR0gKNXzcaviSXixqT3a1iClJTe2iqY8FU=; b=yrolGjQMrlujnMYkOwDzBx+0IP0f6Nk+JVRl6m5muwFgCJyPA1Pru1FOW5yLxDtHkH 3s6ULbn/9TLevltdw5nQaO3IBPmo0t2nHDx4AF8b7bW05OXNXevahXCnxzP4RihOc7Oo Gqp4E9RcBQSzN1HaJjAJoFuvoGwk6VR1w3eEYmFFpRPsc8En3+fvgXZgCiAH7xDGdA92 eeGcNZQbsZxtU0GP4w1Fyy6oBO1jZ5+Mwx0tge90/mPYeaLTEQBHzpTD03zd2xuZbaNa 4RNm6J+piNJpW/SenhG0P2qymYwDu3jl8tjJwkvdWWR4EH3FKnfn0tEwzcnpM2W5lX1a 9L6g== Received: by 10.68.232.163 with SMTP id tp3mr15406986pbc.44.1348785627633; Thu, 27 Sep 2012 15:40:27 -0700 (PDT) Received: from anchor.twiddle.home.com ([173.160.232.49]) by mx.google.com with ESMTPS id sj5sm4480267pbc.30.2012.09.27.15.40.26 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 15:40:27 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 27 Sep 2012 15:39:50 -0700 Message-Id: <1348785610-23418-10-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1348785610-23418-1-git-send-email-rth@twiddle.net> References: <1348785610-23418-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.220.45 Cc: Alexander Graf Subject: [Qemu-devel] [PATCH 009/147] target-s390: Fix SACF exit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org DISAS_EXCP is exit via exception; we wanted DISAS_JUMP. This matters when we start cleaning up the TB exit paths. Signed-off-by: Richard Henderson --- target-s390x/translate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target-s390x/translate.c b/target-s390x/translate.c index 23e1042..f0fadf2 100644 --- a/target-s390x/translate.c +++ b/target-s390x/translate.c @@ -2933,7 +2933,7 @@ static void disas_b2(CPUS390XState *env, DisasContext *s, int op, tcg_temp_free_i64(tmp); break; case 0x79: /* SACF D2(B2) [S] */ - /* Store Clock Extended */ + /* Set Address Space Control Fast */ check_privileged(env, s, ilc); decode_rs(s, insn, &r1, &r3, &b2, &d2); tmp = get_address(s, 0, b2, d2); @@ -2943,7 +2943,7 @@ static void disas_b2(CPUS390XState *env, DisasContext *s, int op, /* addressing mode has changed, so end the block */ s->pc += ilc * 2; update_psw_addr(s); - s->is_jmp = DISAS_EXCP; + s->is_jmp = DISAS_JUMP; break; case 0x7d: /* STSI D2,(B2) [S] */ check_privileged(env, s, ilc);