From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yrmqx-0000mR-Am for qemu-devel@nongnu.org; Mon, 11 May 2015 08:30:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yrmqs-0004qo-LS for qemu-devel@nongnu.org; Mon, 11 May 2015 08:30:34 -0400 Received: from mail.uni-paderborn.de ([131.234.142.9]:55737) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yrmqs-0004q9-Ew for qemu-devel@nongnu.org; Mon, 11 May 2015 08:30:30 -0400 From: Bastian Koppelmann Date: Mon, 11 May 2015 14:30:16 +0200 Message-Id: <1431347416-32365-6-git-send-email-kbastian@mail.uni-paderborn.de> In-Reply-To: <1431347416-32365-1-git-send-email-kbastian@mail.uni-paderborn.de> References: <1431347416-32365-1-git-send-email-kbastian@mail.uni-paderborn.de> Subject: [Qemu-devel] [PULL 5/5] target-tricore: fix rfe not restoring the PC List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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 1dc25c2..9919b5b 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; */ -- 2.4.0