From patchwork Mon May 9 21:34:39 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 94881 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 08684B6F17 for ; Tue, 10 May 2011 07:44:18 +1000 (EST) Received: from localhost ([::1]:44481 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJYFT-000266-Df for incoming@patchwork.ozlabs.org; Mon, 09 May 2011 17:44:15 -0400 Received: from eggs.gnu.org ([140.186.70.92]:38588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJY6q-0003qd-6m for qemu-devel@nongnu.org; Mon, 09 May 2011 17:35:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QJY6p-0006NR-E5 for qemu-devel@nongnu.org; Mon, 09 May 2011 17:35:20 -0400 Received: from mail-iw0-f173.google.com ([209.85.214.173]:38418) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJY6p-0006Af-B4 for qemu-devel@nongnu.org; Mon, 09 May 2011 17:35:19 -0400 Received: by mail-iw0-f173.google.com with SMTP id 42so5560360iwl.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=X23cC1wu4BBgVSUc4u9Ub6IZLN1icNhU3Wx5mSLQcFI=; b=l/eExU3ucUqRUwtGOz6ccWMza60Expt/6GgNIU79M3WB9Zdz49uG5Irsl0VJ2BjPNJ q6FCz7XfpMcPH/arR6BYPqsTgb7+0ppSmnxB+X48FpJPn6ex/u+gWTitlKK4kK0jdLFp QowaZLF3io9vd3V1WSvsLA9Sj2u7wsdSLzxXA= 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=IU++Xxxy2dPJwXVbFVxn1ktL9NdXqhFivtZ3qeBiAlPTPDnNWMUTpomApfNDuX7WhS 4QEFC8eJJp9QOWCI8FDSnfLiYG74aqjAHIbzKnJ2dyj1Sdix8lUhsdKG8m0hSDthuljS r/rKMfezkFiNbXi6UccPJsOQl+jnXm9Ybkk4E= Received: by 10.42.151.138 with SMTP id e10mr107562icw.251.1304976919084; 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.18 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 09 May 2011 14:35:18 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 9 May 2011 14:34:39 -0700 Message-Id: <1304976889-29675-26-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.214.173 Subject: [Qemu-devel] [PATCH 25/35] 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 91ef90a..42fec07 100644 --- a/target-alpha/op_helper.c +++ b/target-alpha/op_helper.c @@ -66,7 +66,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)