diff options
| author | Philippe Mathieu-Daudé | 2020-10-12 11:57:49 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé | 2020-10-17 11:13:15 +0200 |
| commit | 62f8f2603da7fbcc481489d2903558001a896cad (patch) | |
| tree | b182174fe7f6500379c3de424e3ec2f67eff6a01 /target/mips | |
| parent | target/mips: Move cpu_mips_get_random() with CP0 helpers (diff) | |
| download | qemu-62f8f2603da7fbcc481489d2903558001a896cad.tar.gz qemu-62f8f2603da7fbcc481489d2903558001a896cad.tar.xz qemu-62f8f2603da7fbcc481489d2903558001a896cad.zip | |
target/mips/cp0_timer: Explicit unit in variable name
Name variables holding nanoseconds with the '_ns' suffix.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
Message-Id: <20201012095804.3335117-7-f4bug@amsat.org>
Diffstat (limited to 'target/mips')
| -rw-r--r-- | target/mips/cp0_timer.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/target/mips/cp0_timer.c b/target/mips/cp0_timer.c index 9c38e9da1c..5194c967ae 100644 --- a/target/mips/cp0_timer.c +++ b/target/mips/cp0_timer.c @@ -32,13 +32,14 @@ /* MIPS R4K timer */ static void cpu_mips_timer_update(CPUMIPSState *env) { - uint64_t now, next; + uint64_t now_ns, next_ns; uint32_t wait; - now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - wait = env->CP0_Compare - env->CP0_Count - (uint32_t)(now / TIMER_PERIOD); - next = now + (uint64_t)wait * TIMER_PERIOD; - timer_mod(env->timer, next); + now_ns = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + wait = env->CP0_Compare - env->CP0_Count - + (uint32_t)(now_ns / TIMER_PERIOD); + next_ns = now_ns + (uint64_t)wait * TIMER_PERIOD; + timer_mod(env->timer, next_ns); } /* Expire the timer. */ @@ -56,16 +57,16 @@ uint32_t cpu_mips_get_count(CPUMIPSState *env) if (env->CP0_Cause & (1 << CP0Ca_DC)) { return env->CP0_Count; } else { - uint64_t now; + uint64_t now_ns; - now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + now_ns = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); if (timer_pending(env->timer) - && timer_expired(env->timer, now)) { + && timer_expired(env->timer, now_ns)) { /* The timer has already expired. */ cpu_mips_timer_expire(env); } - return env->CP0_Count + (uint32_t)(now / TIMER_PERIOD); + return env->CP0_Count + (uint32_t)(now_ns / TIMER_PERIOD); } } |