From patchwork Tue May 5 17:47:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Koppelmann X-Patchwork-Id: 468290 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0687A14033F for ; Wed, 6 May 2015 03:49:59 +1000 (AEST) Received: from localhost ([::1]:41040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ypgyj-0003tq-2k for incoming@patchwork.ozlabs.org; Tue, 05 May 2015 13:49:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ypgw9-0007di-UK for qemu-devel@nongnu.org; Tue, 05 May 2015 13:47:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ypgw7-0003Un-LA for qemu-devel@nongnu.org; Tue, 05 May 2015 13:47:17 -0400 Received: from mail.uni-paderborn.de ([131.234.142.9]:45925) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ypgw7-0003Tb-FU for qemu-devel@nongnu.org; Tue, 05 May 2015 13:47:15 -0400 From: Bastian Koppelmann To: qemu-devel@nongnu.org Date: Tue, 5 May 2015 19:47:03 +0200 Message-Id: <1430848023-21048-6-git-send-email-kbastian@mail.uni-paderborn.de> X-Mailer: git-send-email 2.3.7 In-Reply-To: <1430848023-21048-1-git-send-email-kbastian@mail.uni-paderborn.de> References: <1430848023-21048-1-git-send-email-kbastian@mail.uni-paderborn.de> X-IMT-Spam-Score: 0.0 () X-PMX-Version: 6.2.0.2453472, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2015.5.5.173618 X-IMT-Authenticated-Sender: uid=kbastian,ou=People,o=upb,c=de X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 131.234.142.9 Subject: [Qemu-devel] [PATCH 5/5] target-tricore: fix rfe not restoring the PC 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 Signed-off-by: Bastian Koppelmann --- target-tricore/op_helper.c | 1 + 1 file changed, 1 insertion(+) diff --git a/target-tricore/op_helper.c b/target-tricore/op_helper.c index 011f09f..1c23aeb 100644 --- a/target-tricore/op_helper.c +++ b/target-tricore/op_helper.c @@ -2458,6 +2458,7 @@ void helper_rfe(CPUTriCoreState *env) if (!cdc_zero(&(env->PSW)) && (env->PSW & MASK_PSW_CDE)) { /* raise MNG trap */ } + env->PC = env->gpr_a[11] & ~0x1; /* ICR.IE = PCXI.PIE; */ env->ICR = (env->ICR & ~MASK_ICR_IE) + ((env->PCXI & MASK_PCXI_PIE) >> 15); /* ICR.CCPN = PCXI.PCPN; */