From patchwork Thu Apr 28 20:51:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 93321 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 62FEBB6FBD for ; Fri, 29 Apr 2011 07:00:17 +1000 (EST) Received: from localhost ([::1]:36223 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFYJq-0004D4-IJ for incoming@patchwork.ozlabs.org; Thu, 28 Apr 2011 17:00:14 -0400 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) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=kMPFAJukGsMFam/dDE1TmWSVjbWdmjJpd98kVcFxteg=; b=uFFN3w/slTiKyOX9alcAvwdj2+nZp+m8mSEXxSmobsCb7Q9FDu/EugUsRmiGfAsDEq LVhiuLaJA+CCINSvl/VN7H9WdYzIgtjDAAG3+/W1ahbkftN6R7A6NNmc09MBrRi3xRqx 2xGYx5luC0QPOy6rfyT/Tfw/66Ke1I270D5lQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; b=CQtNsCCWCpx0qTJ06csITedGC0gNXZA1i70lYzPz6F2P8kt9rtHNufEcfv/WWDDG4h hEMnQDgaNBSMuCKr6bZDlzSyW/Wvw0gVDyxa6wmgkZ7f+9E4YOff/wdTjBUR2612OHzE T3Ed/dH+bi5IXjv999BXakbgYUybkfTBS50Tk= Received: by 10.142.248.38 with SMTP id v38mr1353322wfh.15.1304023913516; Thu, 28 Apr 2011 13:51:53 -0700 (PDT) Received: from localhost.localdomain (are.twiddle.net [75.101.38.216]) by mx.google.com with ESMTPS id z10sm2266797wfj.12.2011.04.28.13.51.52 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Apr 2011 13:51:53 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 28 Apr 2011 13:51:09 -0700 Message-Id: <1304023875-25040-28-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1304023875-25040-1-git-send-email-rth@twiddle.net> References: <1304023875-25040-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.212.179 Subject: [Qemu-devel] [PATCH 27/33] target-alpha: Use a fixed frequency for the RPCC in system mode. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@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)