Message ID | 1295306982-29629-4-git-send-email-edgar.iglesias@gmail.com |
---|---|
State | New |
Headers | show |
diff --git a/hw/mips_timer.c b/hw/mips_timer.c index 8c32087..4e5c0b5 100644 --- a/hw/mips_timer.c +++ b/hw/mips_timer.c @@ -69,9 +69,16 @@ uint32_t cpu_mips_get_count (CPUState *env) if (env->CP0_Cause & (1 << CP0Ca_DC)) { return env->CP0_Count; } else { + uint64_t now; + + now = qemu_get_clock(vm_clock); + if (qemu_timer_expired(env->timer, now)) { + /* The timer has already expired. */ + cpu_mips_timer_expire(env); + } + return env->CP0_Count + - (uint32_t)muldiv64(qemu_get_clock(vm_clock), - TIMER_FREQ, get_ticks_per_sec()); + (uint32_t)muldiv64(now, TIMER_FREQ, get_ticks_per_sec()); } }