Commit cdfcad78 authored by Alex Smith's avatar Alex Smith Committed by Leon Alrae
Browse files

target-mips: Fix RDHWR on CP0.Count 



For RDHWR on the CP0.Count register, env->CP0_Count was being returned.
This value is a delta against the QEMU_CLOCK_VIRTUAL clock, not the
correct current value of CP0.Count. Use cpu_mips_get_count() instead.

Signed-off-by: default avatarAlex Smith <alex.smith@imgtec.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Reviewed-by: default avatarLeon Alrae <leon.alrae@imgtec.com>
Reviewed-by: default avatarAurelien Jarno <aurelien@aurel32.net>
Signed-off-by: default avatarLeon Alrae <leon.alrae@imgtec.com>
parent ca6c7803

target-mips/op_helper.c

+7 −2
Original line number Diff line number Diff line
@@ -2184,10 +2184,15 @@ target_ulong helper_rdhwr_synci_step(CPUMIPSState *env) 
target_ulong helper_rdhwr_cc(CPUMIPSState *env)

{

    if ((env->hflags & MIPS_HFLAG_CP0) ||

        (env->CP0_HWREna & (1 << 2)))

        (env->CP0_HWREna & (1 << 2))) {

#ifdef CONFIG_USER_ONLY

        return env->CP0_Count;

    else

#else

        return (int32_t)cpu_mips_get_count(env);

#endif

    } else {

        helper_raise_exception(env, EXCP_RI);

    }



    return 0;

}