From patchwork Thu Jan 7 20:28:21 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Igor V. Kovalenko" X-Patchwork-Id: 42475 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E7013B6EEB for ; Fri, 8 Jan 2010 07:41:38 +1100 (EST) Received: from localhost ([127.0.0.1]:39138 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSzAk-0002QW-Iy for incoming@patchwork.ozlabs.org; Thu, 07 Jan 2010 15:41:34 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NSyy7-0004yr-Bo for qemu-devel@nongnu.org; Thu, 07 Jan 2010 15:28:31 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NSyy2-0004tE-Mi for qemu-devel@nongnu.org; Thu, 07 Jan 2010 15:28:30 -0500 Received: from [199.232.76.173] (port=38280 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NSyy2-0004t4-Db for qemu-devel@nongnu.org; Thu, 07 Jan 2010 15:28:26 -0500 Received: from mail-fx0-f222.google.com ([209.85.220.222]:33820) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NSyy1-0000ti-Sq for qemu-devel@nongnu.org; Thu, 07 Jan 2010 15:28:26 -0500 Received: by mail-fx0-f222.google.com with SMTP id 22so21243905fxm.2 for ; Thu, 07 Jan 2010 12:28:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:received:subject:to:from:date :message-id:in-reply-to:references:user-agent:mime-version :content-type:content-transfer-encoding; bh=SoyQkNT32AA4rGsGzV0z58lOoNIW67+SBxuPD+ZM2YU=; b=iQ/4eO9f87EVqBetGVTb6KF0vNJGoqAkgfXvza2iHKMmF1QFsTKDB36a41+h+a015w 44CBzyJbmB3gN+6PjcjT0ZfBiK0znBO3rbJb7K1xZdgAEnu/JXcieyiPijm3AmxyvvFY PGidyP4nKENIIb6BhpcCf2ZNDWbRrjnK8yNag= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:to:from:date:message-id:in-reply-to:references:user-agent :mime-version:content-type:content-transfer-encoding; b=bJOpwpaI8gppRzDqblslJuS9NwLxO1PlMowgSygzufwEDVG4vaghzRPApkFW5WIkTZ xPPZ6R0fdSbl5HUwupJVypPu+wFF6qwMWqmh7BAshFuLiFGB0vordWWbACGNmQDGBzhE nrLG9hb3lnlQYX5+LXy6AH6vbMv6gq7U3Nq6c= Received: by 10.223.15.148 with SMTP id k20mr1502996faa.6.1262896102371; Thu, 07 Jan 2010 12:28:22 -0800 (PST) Received: from skyserv (host-87-255-14-75.bigtelecom.ru [87.255.14.75]) by mx.google.com with ESMTPS id 13sm7888739fxm.5.2010.01.07.12.28.21 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 07 Jan 2010 12:28:22 -0800 (PST) Received: from localhost ([127.0.0.1] helo=[192.168.1.2]) by skyserv with esmtp (Exim 4.71) (envelope-from ) id 1NSyxx-0004Qb-2C for qemu-devel@nongnu.org; Thu, 07 Jan 2010 23:28:21 +0300 To: qemu-devel@nongnu.org From: "Igor V. Kovalenko" Date: Thu, 07 Jan 2010 23:28:21 +0300 Message-ID: <20100107202820.16653.91025.stgit@skyserv> In-Reply-To: <20100107201810.16653.85771.stgit@skyserv> References: <20100107201810.16653.85771.stgit@skyserv> User-Agent: StGit/0.15 MIME-Version: 1.0 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH 6/9] sparc64: add macros to deal with softint and timer interrupt X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Igor V. Kovalenko Signed-off-by: Igor V. Kovalenko --- hw/sun4u.c | 1 - target-sparc/cpu.h | 4 ++++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hw/sun4u.c b/hw/sun4u.c index 9d46f08..029e3ed 100644 --- a/hw/sun4u.c +++ b/hw/sun4u.c @@ -73,7 +73,6 @@ #define MAX_PILS 16 -#define TICK_INT_DIS 0x8000000000000000ULL #define TICK_MAX 0x7fffffffffffffffULL struct hwdef { diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index 1fe4d0f..0f0e38c 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -394,6 +394,8 @@ typedef struct CPUSPARCState { uint64_t fprs; uint64_t tick_cmpr, stick_cmpr; void *tick, *stick; +#define TICK_NPT_MASK 0x8000000000000000ULL +#define TICK_INT_DIS 0x8000000000000000ULL uint64_t gsr; uint32_t gl; // UA2005 /* UA 2005 hyperprivileged registers */ @@ -402,6 +404,8 @@ typedef struct CPUSPARCState { uint32_t softint; #define SOFTINT_TIMER 1 #define SOFTINT_STIMER (1 << 16) +#define SOFTINT_INTRMASK (0xFFFE) +#define SOFTINT_REG_MASK (SOFTINT_STIMER|SOFTINT_INTRMASK|SOFTINT_TIMER) #endif sparc_def_t *def; } CPUSPARCState;