On 2015-09-08 11:34, Alex Smith wrote:
> 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: Alex Smith <alex.sm...@imgtec.com>
> Cc: Aurelien Jarno <aurel...@aurel32.net>
> Cc: Leon Alrae <leon.al...@imgtec.com>
> ---
> Changes in v2:
> - Fix build breakage for user builds.
> - Correct existing code to follow QEMU coding style.
> ---
> target-mips/op_helper.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/target-mips/op_helper.c b/target-mips/op_helper.c
> index 809a061e296b..99574322a29c 100644
> --- a/target-mips/op_helper.c
> +++ b/target-mips/op_helper.c
> @@ -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;
> }
Reviewed-by: Aurelien Jarno <aurel...@aurel32.net>
Independently of your patch, I do wonder if we shouldn't change the
return type of cpu_mips_get_count to int32_t. With your patch, there
are now 2 calls to this functions, and both cast the value to int32_t.
--
Aurelien Jarno GPG: 4096R/1DDD8C9B
aurel...@aurel32.net http://www.aurel32.net
