From patchwork Mon May 9 21:34:40 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 94875 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 BCD0EB6F1B for ; Tue, 10 May 2011 07:42:24 +1000 (EST) Received: from localhost ([::1]:38530 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJYDe-0007In-1S for incoming@patchwork.ozlabs.org; Mon, 09 May 2011 17:42:22 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38600) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJY6r-0003rm-4f for qemu-devel@nongnu.org; Mon, 09 May 2011 17:35:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QJY6q-0006Nf-6b for qemu-devel@nongnu.org; Mon, 09 May 2011 17:35:21 -0400 Received: from mail-iy0-f173.google.com ([209.85.210.173]:48729) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJY6q-0006A3-0g for qemu-devel@nongnu.org; Mon, 09 May 2011 17:35:20 -0400 Received: by mail-iy0-f173.google.com with SMTP id 10so5564538iym.4 for ; Mon, 09 May 2011 14:35:19 -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=Uz6KCIVi/FylpjTThTFxpYg3kh9fwi2Tu+dNqX8P+O4=; b=cEXZQMLYA225uU42Nhs4p0b/PQ+EGi1tN2JMi2+5y+BcIfEfgz2u/8gTeDA5S3hdRy RGQLcs5KOSGpITz6ZhYm8T21B+KqqhWTWYq2lkvKTdHJLHxWEEegiLAQLu6U+L2OFnbT OUAImdtg4ZfNbXChjx10Od01R1xzbM37X/o4s= 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=Yoa0r44SrVcyTS2S05vUOghO+D4Hw5ut11LGAJY832pMpoief4wM/icJeQewMCThPI QQ8tbuCa5NsFxGWQLdavUPrdBFYVErEf7yHdtBuzXhqDVkvdp/t929aUSGBZA9N2GOT1 wldhl0VUy4P4YhTMAjFQv07hYkZ/HaoU88bts= Received: by 10.43.60.210 with SMTP id wt18mr3822268icb.25.1304976919781; Mon, 09 May 2011 14:35:19 -0700 (PDT) Received: from localhost.localdomain (are.twiddle.net [75.101.38.216]) by mx.google.com with ESMTPS id ui7sm2549819icb.14.2011.05.09.14.35.19 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 May 2011 14:35:19 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 9 May 2011 14:34:40 -0700 Message-Id: <1304976889-29675-27-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1304976889-29675-1-git-send-email-rth@twiddle.net> References: <1304976889-29675-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.210.173 Subject: [Qemu-devel] [PATCH 26/35] 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 d26a870..c94becf 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)