Re: [Qemu-devel] [PATCH] target-mips: correct DERET instruction

[Aurelien Jarno <aurelien@aurel32.net>]

On 2015-07-14 11:08, Leon Alrae wrote:
> Fix Debug Mode flag clearing, and when DERET is placed between LL and SC
> do not make SC fail.
> 
> Signed-off-by: Leon Alrae <leon.alrae@imgtec.com>
> ---
>  target-mips/op_helper.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
> index 2a9ddff..d461ad8 100644
> --- a/target-mips/op_helper.c
> +++ b/target-mips/op_helper.c
> @@ -2154,10 +2154,9 @@ void helper_deret(CPUMIPSState *env)
>      debug_pre_eret(env);
>      set_pc(env, env->CP0_DEPC);
>  
> -    env->hflags &= MIPS_HFLAG_DM;
> +    env->hflags &= ~MIPS_HFLAG_DM;
>      compute_hflags(env);
>      debug_post_eret(env);
> -    env->lladdr = 1;
>  }
>  #endif /* !CONFIG_USER_ONLY */

Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>

-- 
Aurelien Jarno                          GPG: 4096R/1DDD8C9B
aurelien@aurel32.net                 http://www.aurel32.net