target/xtensa: fix ps.ring use in MPU configs
PATCH 1/1 target/xtensa: fix ps.ring use in MPU configs
Allow ps.ring modification by wsr.ps/xsr.ps and use ps.ring value in xtensa_get_[c]ring on configurations with MPU.
Signed-off-by Max Filippov <[email protected]>
--- target/xtensa/cpu.h | 10 +++++++--- target/xtensa/translate.c | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-)
target/xtensa/cpu.h +7 -3
@@ -645,7 +645,9 @@ static inline int xtensa_get_cintlevel(const CPUXtensaState *env)static inline int xtensa_get_ring (const CPUXtensaState *env) { -if (xtensa_option_enabled (env->config,XTENSA_OPTION_MMU )) { +if (xtensa_option_bits_enabled (env->config, +XTENSA_OPTION_BIT (XTENSA_OPTION_MMU ) | +XTENSA_OPTION_BIT (XTENSA_OPTION_MPU ))) {return (env->sregs[PS ] &PS_RING ) >>PS_RING_SHIFT ; }else {return 0 ;
@@ -654,8 +656,10 @@ static inline int xtensa_get_ring(const CPUXtensaState *env)static inline int xtensa_get_cring (const CPUXtensaState *env) { -if (xtensa_option_enabled (env->config,XTENSA_OPTION_MMU ) && - (env->sregs[PS ] &PS_EXCM ) ==0 ) { +if (xtensa_option_bits_enabled (env->config, +XTENSA_OPTION_BIT (XTENSA_OPTION_MMU ) | +XTENSA_OPTION_BIT (XTENSA_OPTION_MPU )) && + (env->sregs[PS ] &PS_EXCM ) ==0 ) {return (env->sregs[PS ] &PS_RING ) >>PS_RING_SHIFT ; }else {return 0 ;
target/xtensa/translate.c +2 -1
@@ -2713,7 +2713,8 @@ static void translate_wsr_ps(DisasContext *dc, const OpcodeArg arg[],uint32_t mask =PS_WOE |PS_CALLINC |PS_OWB |PS_UM |PS_EXCM |PS_INTLEVEL ; -if (option_enabled (dc,XTENSA_OPTION_MMU )) { +if (option_enabled (dc,XTENSA_OPTION_MMU ) || +option_enabled (dc,XTENSA_OPTION_MPU )) { mask |=PS_RING ; }tcg_gen_andi_i32 (cpu_SR[par[0 ]], arg[0 ].in, mask);
Signature · 1 line
2.20.1