From patchwork Tue Apr 19 15:04:58 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 91997 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 10BD0B6F94 for ; Wed, 20 Apr 2011 01:38:45 +1000 (EST) Received: from localhost ([::1]:54353 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QCD0k-0001I0-Ah for incoming@patchwork.ozlabs.org; Tue, 19 Apr 2011 11:38:42 -0400 Received: from eggs.gnu.org ([140.186.70.92]:52348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QCD0d-0001Hv-8l for qemu-devel@nongnu.org; Tue, 19 Apr 2011 11:38:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QCD0b-0004qY-56 for qemu-devel@nongnu.org; Tue, 19 Apr 2011 11:38:35 -0400 Received: from a.mail.sonic.net ([64.142.16.245]:55822) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QCD0a-0004q9-UF for qemu-devel@nongnu.org; Tue, 19 Apr 2011 11:38:33 -0400 Received: from are.twiddle.net (are.twiddle.net [75.101.38.216]) by a.mail.sonic.net (8.13.8.Beta0-Sonic/8.13.7) with ESMTP id p3JF5AoH030884 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 19 Apr 2011 08:05:10 -0700 Received: from are.twiddle.net (localhost [127.0.0.1]) by are.twiddle.net (8.14.4/8.14.4) with ESMTP id p3JF5Amv012896 for ; Tue, 19 Apr 2011 08:05:10 -0700 Received: (from rth@localhost) by are.twiddle.net (8.14.4/8.14.4/Submit) id p3JF5Acl012895 for qemu-devel@nongnu.org; Tue, 19 Apr 2011 08:05:10 -0700 From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 19 Apr 2011 08:04:58 -0700 Message-Id: <1303225501-12778-22-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1303225501-12778-1-git-send-email-rth@twiddle.net> References: <1303225501-12778-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 64.142.16.245 Subject: [Qemu-devel] [PATCH 21/24] target-alpha: Include the PCC_OFS in the RPCC return value. 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/op_helper.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/target-alpha/op_helper.c b/target-alpha/op_helper.c index cc8a33d..5902cd6 100644 --- a/target-alpha/op_helper.c +++ b/target-alpha/op_helper.c @@ -44,7 +44,8 @@ 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. */ - return (uint32_t)cpu_get_real_ticks(); + uint64_t ret = env->pcc_ofs; + return ret << 32 | (uint32_t)cpu_get_real_ticks(); } uint64_t helper_load_fpcr (void)