From mboxrd@z Thu Jan 1 00:00:00 1970 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) 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 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> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 6/9] sparc64: add macros to deal with softint and timer interrupt List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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;