From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFYBn-0005gc-4C for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:51:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QFYBm-0005gw-7d for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:51:55 -0400 Received: from mail-px0-f179.google.com ([209.85.212.179]:58851) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFYBm-0005Xi-1x for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:51:54 -0400 Received: by mail-px0-f179.google.com with SMTP id 2so298049pxi.10 for ; Thu, 28 Apr 2011 13:51:53 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Thu, 28 Apr 2011 13:51:09 -0700 Message-Id: <1304023875-25040-28-git-send-email-rth@twiddle.net> In-Reply-To: <1304023875-25040-1-git-send-email-rth@twiddle.net> References: <1304023875-25040-1-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 27/33] target-alpha: Use a fixed frequency for the RPCC in system mode. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Richard Henderson --- target-alpha/cpu.h | 2 -- target-alpha/op_helper.c | 14 +++++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h index 59b3bc3..30ecf2d 100644 --- a/target-alpha/cpu.h +++ b/target-alpha/cpu.h @@ -256,7 +256,6 @@ struct CPUAlphaState { uint64_t trap_arg1; uint64_t trap_arg2; -#if !defined(CONFIG_USER_ONLY) /* The internal data required by our emulation of the Unix PALcode. */ uint64_t exc_addr; uint64_t palbr; @@ -266,7 +265,6 @@ struct CPUAlphaState { uint64_t usp; uint64_t shadow[8]; uint64_t scratch[24]; -#endif #if TARGET_LONG_BITS > HOST_LONG_BITS /* temporary fixed-point registers diff --git a/target-alpha/op_helper.c b/target-alpha/op_helper.c index 42fec07..36b8289 100644 --- a/target-alpha/op_helper.c +++ b/target-alpha/op_helper.c @@ -65,9 +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. */ - uint64_t ret = env->pcc_ofs; - return ret << 32 | (uint32_t)cpu_get_real_ticks(); +#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) -- 1.7.4.4