From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34109) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eKRha-0005VZ-8N for qemu-devel@nongnu.org; Thu, 30 Nov 2017 11:28:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eKRhZ-0003Ne-F8 for qemu-devel@nongnu.org; Thu, 30 Nov 2017 11:28:42 -0500 From: David Hildenbrand Date: Thu, 30 Nov 2017 17:27:40 +0100 Message-Id: <20171130162744.25442-13-david@redhat.com> In-Reply-To: <20171130162744.25442-1-david@redhat.com> References: <20171130162744.25442-1-david@redhat.com> Subject: [Qemu-devel] [PATCH v3 for-2.12 12/16] s390x/tcg: use s390_program_interrupt() in per_check_exception() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-s390x@nongnu.org, qemu-devel@nongnu.org Cc: Christian Borntraeger , Cornelia Huck , Richard Henderson , Alexander Graf , Thomas Huth , David Hildenbrand We can now drop updating the cc. Reviewed-by: Richard Henderson Signed-off-by: David Hildenbrand --- target/s390x/misc_helper.c | 2 +- target/s390x/translate.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c index ee6179ef89..a911bff706 100644 --- a/target/s390x/misc_helper.c +++ b/target/s390x/misc_helper.c @@ -412,7 +412,7 @@ void HELPER(per_check_exception)(CPUS390XState *env) * of EXECUTE, while per_address contains the target of EXECUTE. */ ilen = get_ilen(cpu_ldub_code(env, env->per_address)); - program_interrupt(env, PGM_PER, ilen); + s390_program_interrupt(env, PGM_PER, ilen, GETPC()); } } diff --git a/target/s390x/translate.c b/target/s390x/translate.c index cf8ffa217e..f26fa64a78 100644 --- a/target/s390x/translate.c +++ b/target/s390x/translate.c @@ -5837,9 +5837,6 @@ static ExitStatus translate_one(CPUS390XState *env, DisasContext *s) tcg_gen_movi_i64(psw_addr, s->next_pc); } - /* Save off cc. */ - update_cc_op(s); - /* Call the helper to check for a possible PER exception. */ gen_helper_per_check_exception(cpu_env); } -- 2.14.3