Re: [Qemu-devel] [PATCH v2 25/33] target/mips: Adjust set_pc() for nanoMIPS

[Aleksandar Markovic]

> Subject: [PATCH v2 25/33] target/mips: Adjust set_pc() for nanoMIPS
>
> From: James Hogan <address@hidden>
>
> ERET and ERETNC shouldn't clear MIPS_HFLAG_M16 for nanoMIPS since there
> is no ISA bit, so fix set_pc() to skip the hflags update.
>
> Signed-off-by: James Hogan <address@hidden>
> Signed-off-by: Yongbok Kim <address@hidden>
> Signed-off-by: Aleksandar Markovic <address@hidden>
> Signed-off-by: Stefan Markovic <address@hidden>
> ---
>  target/mips/op_helper.c | 4 ++++
>  1 file changed, 4 insertions(+)
>

Reviewed-by: Aleksandar Markovic <address@hidden>

> diff --git a/target/mips/op_helper.c b/target/mips/op_helper.c
> index 5e10286..c55a1e6 100644
> --- a/target/mips/op_helper.c
> +++ b/target/mips/op_helper.c
> @@ -2428,6 +2428,10 @@ static void debug_post_eret(CPUMIPSState *env)
>  static void set_pc(CPUMIPSState *env, target_ulong error_pc)
>  {
>      env->active_tc.PC = error_pc & ~(target_ulong)1;
> +    if (env->insn_flags & ISA_NANOMIPS32) {
> +        /* Don't clear MIPS_HFLAG_M16 */
> +        return;
> +    }
>      if (error_pc & 1) {
>          env->hflags |= MIPS_HFLAG_M16;
>      } else {
> --
> 2.7.4
>
>