target/mips: Fix ERET/ERETNC behavior related to ADEL exception

Fix ERET/ERETNC so that ADEL exception can be raised.

Backports commit 26324ded91a5ad08a5de8f32b8ed5e5e243154cf from qemu
This commit is contained in:
Yongbok Kim 2018-08-27 15:00:51 -04:00 committed by Lioncash
parent 7473e6dbe6
commit d53c021cea
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -2421,10 +2421,12 @@ void helper_eretnc(CPUMIPSState *env)
void helper_deret(CPUMIPSState *env) void helper_deret(CPUMIPSState *env)
{ {
debug_pre_eret(env); debug_pre_eret(env);
set_pc(env, env->CP0_DEPC);
env->hflags &= ~MIPS_HFLAG_DM; env->hflags &= ~MIPS_HFLAG_DM;
compute_hflags(env); compute_hflags(env);
set_pc(env, env->CP0_DEPC);
debug_post_eret(env); debug_post_eret(env);
} }
#endif /* !CONFIG_USER_ONLY */ #endif /* !CONFIG_USER_ONLY */