mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tricore: renamed masking of PIE

Browse Source 
Signed-off-by: David Brenken <david.brenken@efs-auto.de>
Signed-off-by: Florian Artmeier <florian.artmeier@efs-auto.de>
Signed-off-by: Georg Hofstetter <georg.hofstetter@efs-auto.de>
Message-Id: <20180301155619.8640-5-david.brenken@efs-auto.org>
Signed-off-by: Bastian Koppelmann <kbastian@mail.uni-paderborn.de>
This commit is contained in:
David Brenken 2018-03-01 16:56:19 +01:00 committed by Bastian Koppelmann
parent d1cbc28ae1
commit ce46335c9f
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/tricore/cpu.h
View File

@ -229,7 +229,8 @@ void tricore_cpu_dump_state(CPUState *cpu, FILE *f,
#define MASK_PCXI_PCPN 0xff000000 #define MASK_PCXI_PCPN 0xff000000
#define MASK_PCXI_PIE 0x00800000 #define MASK_PCXI_PIE_1_3 0x00800000
#define MASK_PCXI_PIE_1_6 0x00200000
#define MASK_PCXI_UL 0x00400000 #define MASK_PCXI_UL 0x00400000
#define MASK_PCXI_PCXS 0x000f0000 #define MASK_PCXI_PCXS 0x000f0000
#define MASK_PCXI_PCXO 0x0000ffff #define MASK_PCXI_PCXO 0x0000ffff

16
target/tricore/op_helper.c
View File

@ -84,7 +84,7 @@ raise_exception_sync_internal(CPUTriCoreState *env, uint32_t class, int tin,
ICR.IE and ICR.CCPN are saved */ ICR.IE and ICR.CCPN are saved */
/* PCXI.PIE = ICR.IE */ /* PCXI.PIE = ICR.IE */
env->PCXI = ((env->PCXI & ~MASK_PCXI_PIE) + env->PCXI = ((env->PCXI & ~MASK_PCXI_PIE_1_3) +
((env->ICR & MASK_ICR_IE_1_3) << 15)); ((env->ICR & MASK_ICR_IE_1_3) << 15));
/* PCXI.PCPN = ICR.CCPN */ /* PCXI.PCPN = ICR.CCPN */
env->PCXI = (env->PCXI & 0xffffff) + env->PCXI = (env->PCXI & 0xffffff) +
@ -2464,7 +2464,7 @@ void helper_call(CPUTriCoreState *env, uint32_t next_pc)
env->PCXI = (env->PCXI & 0xffffff) + env->PCXI = (env->PCXI & 0xffffff) +
((env->ICR & MASK_ICR_CCPN) << 24); ((env->ICR & MASK_ICR_CCPN) << 24);
/* PCXI.PIE = ICR.IE; */ /* PCXI.PIE = ICR.IE; */
env->PCXI = ((env->PCXI & ~MASK_PCXI_PIE) + env->PCXI = ((env->PCXI & ~MASK_PCXI_PIE_1_3) +
((env->ICR & MASK_ICR_IE_1_3) << 15)); ((env->ICR & MASK_ICR_IE_1_3) << 15));
/* PCXI.UL = 1; */ /* PCXI.UL = 1; */
env->PCXI |= MASK_PCXI_UL; env->PCXI |= MASK_PCXI_UL;
@ -2562,7 +2562,7 @@ void helper_bisr(CPUTriCoreState *env, uint32_t const9)
env->PCXI = (env->PCXI & 0xffffff) + env->PCXI = (env->PCXI & 0xffffff) +
((env->ICR & MASK_ICR_CCPN) << 24); ((env->ICR & MASK_ICR_CCPN) << 24);
/* PCXI.PIE = ICR.IE */ /* PCXI.PIE = ICR.IE */
env->PCXI = ((env->PCXI & ~MASK_PCXI_PIE) + env->PCXI = ((env->PCXI & ~MASK_PCXI_PIE_1_3) +
((env->ICR & MASK_ICR_IE_1_3) << 15)); ((env->ICR & MASK_ICR_IE_1_3) << 15));
/* PCXI.UL = 0 */ /* PCXI.UL = 0 */
env->PCXI &= ~(MASK_PCXI_UL); env->PCXI &= ~(MASK_PCXI_UL);
@ -2604,7 +2604,7 @@ void helper_rfe(CPUTriCoreState *env)
env->PC = env->gpr_a[11] & ~0x1; env->PC = env->gpr_a[11] & ~0x1;
/* ICR.IE = PCXI.PIE; */ /* ICR.IE = PCXI.PIE; */
env->ICR = (env->ICR & ~MASK_ICR_IE_1_3) env->ICR = (env->ICR & ~MASK_ICR_IE_1_3)
+ ((env->PCXI & MASK_PCXI_PIE) >> 15); + ((env->PCXI & MASK_PCXI_PIE_1_3) >> 15);
/* ICR.CCPN = PCXI.PCPN; */ /* ICR.CCPN = PCXI.PCPN; */
env->ICR = (env->ICR & ~MASK_ICR_CCPN) + env->ICR = (env->ICR & ~MASK_ICR_CCPN) +
((env->PCXI & MASK_PCXI_PCPN) >> 24); ((env->PCXI & MASK_PCXI_PCPN) >> 24);
@ -2628,8 +2628,8 @@ void helper_rfm(CPUTriCoreState *env)
{ {
env->PC = (env->gpr_a[11] & ~0x1); env->PC = (env->gpr_a[11] & ~0x1);
/* ICR.IE = PCXI.PIE; */ /* ICR.IE = PCXI.PIE; */
env->ICR = (env->ICR & ~MASK_ICR_IE_1_3) | env->ICR = (env->ICR & ~MASK_ICR_IE_1_3)
((env->PCXI & MASK_PCXI_PIE) >> 15); | ((env->PCXI & MASK_PCXI_PIE_1_3) >> 15);
/* ICR.CCPN = PCXI.PCPN; */ /* ICR.CCPN = PCXI.PCPN; */
env->ICR = (env->ICR & ~MASK_ICR_CCPN) | env->ICR = (env->ICR & ~MASK_ICR_CCPN) |
((env->PCXI & MASK_PCXI_PCPN) >> 24); ((env->PCXI & MASK_PCXI_PCPN) >> 24);
@ -2694,7 +2694,7 @@ void helper_svlcx(CPUTriCoreState *env)
env->PCXI = (env->PCXI & 0xffffff) + env->PCXI = (env->PCXI & 0xffffff) +
((env->ICR & MASK_ICR_CCPN) << 24); ((env->ICR & MASK_ICR_CCPN) << 24);
/* PCXI.PIE = ICR.IE; */ /* PCXI.PIE = ICR.IE; */
env->PCXI = ((env->PCXI & ~MASK_PCXI_PIE) + env->PCXI = ((env->PCXI & ~MASK_PCXI_PIE_1_3) +
((env->ICR & MASK_ICR_IE_1_3) << 15)); ((env->ICR & MASK_ICR_IE_1_3) << 15));
/* PCXI.UL = 0; */ /* PCXI.UL = 0; */
env->PCXI &= ~MASK_PCXI_UL; env->PCXI &= ~MASK_PCXI_UL;
@ -2737,7 +2737,7 @@ void helper_svucx(CPUTriCoreState *env)
env->PCXI = (env->PCXI & 0xffffff) + env->PCXI = (env->PCXI & 0xffffff) +
((env->ICR & MASK_ICR_CCPN) << 24); ((env->ICR & MASK_ICR_CCPN) << 24);
/* PCXI.PIE = ICR.IE; */ /* PCXI.PIE = ICR.IE; */
env->PCXI = ((env->PCXI & ~MASK_PCXI_PIE) + env->PCXI = ((env->PCXI & ~MASK_PCXI_PIE_1_3) +
((env->ICR & MASK_ICR_IE_1_3) << 15)); ((env->ICR & MASK_ICR_IE_1_3) << 15));
/* PCXI.UL = 1; */ /* PCXI.UL = 1; */
env->PCXI |= MASK_PCXI_UL; env->PCXI |= MASK_PCXI_UL;