From patchwork Thu Apr 28 20:51:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 93318 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 192A7B6F62 for ; Fri, 29 Apr 2011 06:59:00 +1000 (EST) Received: from localhost ([::1]:50326 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFYIb-0001uz-G6 for incoming@patchwork.ozlabs.org; Thu, 28 Apr 2011 16:58:57 -0400 Received: from eggs.gnu.org ([140.186.70.92]:48038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFYBl-0005e6-UH for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:51:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QFYBl-0005gM-2h for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:51:53 -0400 Received: from mail-pw0-f45.google.com ([209.85.160.45]:41062) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QFYBk-0005Yq-UR for qemu-devel@nongnu.org; Thu, 28 Apr 2011 16:51:53 -0400 Received: by mail-pw0-f45.google.com with SMTP id 6so1870069pwi.4 for ; Thu, 28 Apr 2011 13:51:52 -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=w+rjNowl01Pxz0gVYKr6FcfaI1Ugjch/x0/L7axwTFVTQReRHt1ug4IScEX690GaDs ZeM+7D1NqyYfCoPERadF+q53UyC9A8gJlvrCAjthk0DSFSeXCwiiL0dpgtM3+4j7v5G/ apXVcDQYA/gFSFZ2LHu83B4kXnVdKBzDsRt30= 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=XQm/a7mpNUs3lxI2e6xTUHAatBKZi9sQ01BTEnU2NBXXwzsuhYGTOt+aTIAcIsO5GY o+n1zVMNh9vE3r+VjXYPC3c0gppFwsmtaf252YHS5jTLx4u1SEyb+0dmMPNfZZV3ahfz /kJ6Isj5/UPdQn0hU3k/ojk0h1StDr7Zz8YrY= Received: by 10.142.151.20 with SMTP id y20mr1321312wfd.220.1304023912460; Thu, 28 Apr 2011 13:51:52 -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.51 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 28 Apr 2011 13:51:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 28 Apr 2011 13:51:08 -0700 Message-Id: <1304023875-25040-27-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.160.45 Subject: [Qemu-devel] [PATCH 26/33] 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)