From e5214853eac8f86aca2f5493e7171d6f36ddde38 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Mon, 18 Apr 2011 19:53:31 -0700 Subject: [PATCH] target-alpha: Use a fixed frequency for the RPCC in system mode. Also include the PCC_OFS in the return value. For user mode we can pretend the PCC_OFS value is always zero. Signed-off-by: Richard Henderson --- target-alpha/op_helper.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/target-alpha/op_helper.c b/target-alpha/op_helper.c index 91ef90a07c..36b82899d0 100644 --- a/target-alpha/op_helper.c +++ b/target-alpha/op_helper.c @@ -65,8 +65,17 @@ static void QEMU_NORETURN arith_excp(int exc, uint64_t mask) uint64_t helper_load_pcc (void) { - /* ??? This isn't a timer for which we have any rate info. */ +#ifndef CONFIG_USER_ONLY + /* In system mode we have access to a decent high-resolution clock. + In order to make OS-level time accounting work with the RPCC, + present it with a well-timed clock fixed at 250MHz. */ + return (((uint64_t)env->pcc_ofs << 32) + | (uint32_t)(qemu_get_clock_ns(vm_clock) >> 2)); +#else + /* In user-mode, vm_clock doesn't exist. Just pass through the host cpu + clock ticks. Also, don't bother taking PCC_OFS into account. */ return (uint32_t)cpu_get_real_ticks(); +#endif } uint64_t helper_load_fpcr (void)