Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Remove irqframe and replace with identical trapframe.
details: https://anonhg.NetBSD.org/src/rev/ebe80bdeb7a9
branches: trunk
changeset: 780664:ebe80bdeb7a9
user: skrll <skrll%NetBSD.org@localhost>
date: Thu Aug 02 15:56:06 2012 +0000
description:
Remove irqframe and replace with identical trapframe.
diffstat:
sys/arch/arm/arm32/genassym.cf | 4 +---
sys/arch/arm/at91/at91aic.c | 10 +++++-----
sys/arch/arm/at91/at91aicvar.h | 4 ++--
sys/arch/arm/at91/at91busvar.h | 8 ++++----
sys/arch/arm/ep93xx/ep93xx_intr.c | 8 ++++----
sys/arch/arm/include/arm32/frame.h | 34 +++++-----------------------------
sys/arch/arm/include/cpu.h | 6 +++---
sys/arch/arm/ixp12x0/ixp12x0_intr.c | 8 ++++----
sys/arch/arm/xscale/becc_icu.c | 8 ++++----
sys/arch/arm/xscale/i80200_icu.c | 8 ++++----
sys/arch/arm/xscale/i80200var.h | 6 +++---
sys/arch/arm/xscale/i80321_icu.c | 8 ++++----
sys/arch/evbarm/iq80310/iq80310_intr.c | 8 ++++----
13 files changed, 47 insertions(+), 73 deletions(-)
diffs (truncated from 424 to 300 lines):
diff -r 343d8a554cd4 -r ebe80bdeb7a9 sys/arch/arm/arm32/genassym.cf
--- a/sys/arch/arm/arm32/genassym.cf Thu Aug 02 14:07:47 2012 +0000
+++ b/sys/arch/arm/arm32/genassym.cf Thu Aug 02 15:56:06 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.46 2011/04/07 10:03:47 matt Exp $
+# $NetBSD: genassym.cf,v 1.47 2012/08/02 15:56:06 skrll Exp $
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@@ -142,8 +142,6 @@
define TF_R10 offsetof(struct trapframe, tf_r10)
define TF_PC offsetof(struct trapframe, tf_pc)
-define IF_PC offsetof(struct irqframe, if_pc)
-
define PROCSIZE sizeof(struct proc)
define TRAPFRAMESIZE sizeof(struct trapframe)
diff -r 343d8a554cd4 -r ebe80bdeb7a9 sys/arch/arm/at91/at91aic.c
--- a/sys/arch/arm/at91/at91aic.c Thu Aug 02 14:07:47 2012 +0000
+++ b/sys/arch/arm/at91/at91aic.c Thu Aug 02 15:56:06 2012 +0000
@@ -1,5 +1,5 @@
-/* $Id: at91aic.c,v 1.8 2011/11/04 17:16:38 aymeric Exp $ */
-/* $NetBSD: at91aic.c,v 1.8 2011/11/04 17:16:38 aymeric Exp $ */
+/* $Id: at91aic.c,v 1.9 2012/08/02 15:56:06 skrll Exp $ */
+/* $NetBSD: at91aic.c,v 1.9 2012/08/02 15:56:06 skrll Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy.
@@ -362,10 +362,10 @@
#include <arm/at91/at91dbgureg.h>
#include <arm/at91/at91pdcreg.h>
-static inline void intr_process(struct intrq *iq, int pcpl, struct irqframe *frame);
+static inline void intr_process(struct intrq *iq, int pcpl, struct trapframe *frame);
static inline void
-intr_process(struct intrq *iq, int pcpl, struct irqframe *frame)
+intr_process(struct intrq *iq, int pcpl, struct trapframe *frame)
{
struct intrhand* ih;
u_int oldirqstate, intr;
@@ -404,7 +404,7 @@
}
void
-at91aic_intr_dispatch(struct irqframe *frame)
+at91aic_intr_dispatch(struct trapframe *frame)
{
struct intrq* iq;
int pcpl = curcpl();
diff -r 343d8a554cd4 -r ebe80bdeb7a9 sys/arch/arm/at91/at91aicvar.h
--- a/sys/arch/arm/at91/at91aicvar.h Thu Aug 02 14:07:47 2012 +0000
+++ b/sys/arch/arm/at91/at91aicvar.h Thu Aug 02 15:56:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: at91aicvar.h,v 1.3 2009/10/23 06:53:13 snj Exp $ */
+/* $NetBSD: at91aicvar.h,v 1.4 2012/08/02 15:56:06 skrll Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -57,6 +57,6 @@
void *at91aic_intr_establish(int irq, int ipl, int type, int (*ih_func)(void *), void *arg);
void at91aic_intr_disestablish(void *cookie);
void at91aic_intr_poll(void *ihp, int flags);
-void at91aic_intr_dispatch(struct irqframe *frame);
+void at91aic_intr_dispatch(struct trapframe *frame);
#endif /* _AT91AICVAR_H_ */
diff -r 343d8a554cd4 -r ebe80bdeb7a9 sys/arch/arm/at91/at91busvar.h
--- a/sys/arch/arm/at91/at91busvar.h Thu Aug 02 14:07:47 2012 +0000
+++ b/sys/arch/arm/at91/at91busvar.h Thu Aug 02 15:56:06 2012 +0000
@@ -1,5 +1,5 @@
-/* $Id: at91busvar.h,v 1.4 2011/07/01 19:31:16 dyoung Exp $ */
-/* $NetBSD: at91busvar.h,v 1.4 2011/07/01 19:31:16 dyoung Exp $ */
+/* $Id: at91busvar.h,v 1.5 2012/08/02 15:56:06 skrll Exp $ */
+/* $NetBSD: at91busvar.h,v 1.5 2012/08/02 15:56:06 skrll Exp $ */
/*
* Copyright (c) 2007 Embedtronics Oy
@@ -75,7 +75,7 @@
bus_dma_tag_t sc_dmat;
};
-struct irqframe;
+struct trapframe;
struct at91bus_machdep {
/* initialization: */
@@ -95,7 +95,7 @@
void *(*intr_establish)(int pid, int ipl, int type, int (*ih_func)(void *), void *arg);
void (*intr_disestablish)(void *cookie);
void (*intr_poll)(void *cookie, int flags);
- void (*intr_dispatch)(struct irqframe *);
+ void (*intr_dispatch)(struct trapframe *);
/* configuration */
const char *(*peripheral_name)(int pid);
diff -r 343d8a554cd4 -r ebe80bdeb7a9 sys/arch/arm/ep93xx/ep93xx_intr.c
--- a/sys/arch/arm/ep93xx/ep93xx_intr.c Thu Aug 02 14:07:47 2012 +0000
+++ b/sys/arch/arm/ep93xx/ep93xx_intr.c Thu Aug 02 15:56:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ep93xx_intr.c,v 1.16 2011/07/01 19:31:17 dyoung Exp $ */
+/* $NetBSD: ep93xx_intr.c,v 1.17 2012/08/02 15:56:06 skrll Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ep93xx_intr.c,v 1.16 2011/07/01 19:31:17 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ep93xx_intr.c,v 1.17 2012/08/02 15:56:06 skrll Exp $");
/*
* Interrupt support for the Cirrus Logic EP93XX
@@ -69,7 +69,7 @@
/* Interrupts pending. */
static volatile int ipending;
-void ep93xx_intr_dispatch(struct irqframe *frame);
+void ep93xx_intr_dispatch(struct trapframe *);
#define VIC1REG(reg) *((volatile u_int32_t*) (EP93XX_AHB_VBASE + \
EP93XX_AHB_VIC1 + (reg)))
@@ -324,7 +324,7 @@
}
void
-ep93xx_intr_dispatch(struct irqframe *frame)
+ep93xx_intr_dispatch(struct trapframe *frame)
{
struct intrq* iq;
struct intrhand* ih;
diff -r 343d8a554cd4 -r ebe80bdeb7a9 sys/arch/arm/include/arm32/frame.h
--- a/sys/arch/arm/include/arm32/frame.h Thu Aug 02 14:07:47 2012 +0000
+++ b/sys/arch/arm/include/arm32/frame.h Thu Aug 02 15:56:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.29 2012/08/01 22:46:07 matt Exp $ */
+/* $NetBSD: frame.h,v 1.30 2012/08/02 15:56:07 skrll Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@@ -54,31 +54,8 @@
* System stack frames.
*/
-typedef struct irqframe {
- unsigned int if_spsr;
- unsigned int if_fill; /* fill here so r0 will dword aligned */
- unsigned int if_r0;
- unsigned int if_r1;
- unsigned int if_r2;
- unsigned int if_r3;
- unsigned int if_r4;
- unsigned int if_r5;
- unsigned int if_r6;
- unsigned int if_r7;
- unsigned int if_r8;
- unsigned int if_r9;
- unsigned int if_r10;
- unsigned int if_r11;
- unsigned int if_r12;
- unsigned int if_usr_sp;
- unsigned int if_usr_lr;
- unsigned int if_svc_sp;
- unsigned int if_svc_lr;
- unsigned int if_pc;
-} irqframe_t;
-
struct clockframe {
- struct irqframe cf_if;
+ struct trapframe cf_tf;
};
/*
@@ -286,21 +263,20 @@
and r0, r0, #(PSR_MODE) /* check for SVC32 mode */ ;\
teq r0, #(PSR_SVC32_MODE) ;\
bne 99f /* nope, get out now */ ;\
- ldr r0, [sp, #(IF_PC)] ;\
+ ldr r0, [sp, #(TF_PC)] ;\
ldr r1, .L_lock_cas_end ;\
cmp r0, r1 ;\
bge 99f ;\
ldr r1, .L_lock_cas ;\
cmp r0, r1 ;\
- strgt r1, [sp, #(IF_PC)] ;\
+ strgt r1, [sp, #(TF_PC)] ;\
LOCK_CAS_DEBUG_COUNT_RESTART ;\
99:
/*
* ASM macros for pushing and pulling trapframes from the stack
*
- * These macros are used to handle the irqframe and trapframe structures
- * defined above.
+ * These macros are used to handle the trapframe structure defined above.
*/
/*
diff -r 343d8a554cd4 -r ebe80bdeb7a9 sys/arch/arm/include/cpu.h
--- a/sys/arch/arm/include/cpu.h Thu Aug 02 14:07:47 2012 +0000
+++ b/sys/arch/arm/include/cpu.h Thu Aug 02 15:56:06 2012 +0000
@@ -149,7 +149,7 @@
* frame came from USR mode or not.
*/
#ifdef __PROG32
-#define CLKF_USERMODE(frame) ((frame->cf_if.if_spsr & PSR_MODE) == PSR_USR32_MODE)
+#define CLKF_USERMODE(frame) ((frame->cf_tf.tf_spsr & PSR_MODE) == PSR_USR32_MODE)
#else
#define CLKF_USERMODE(frame) ((frame->cf_if.if_r15 & R15_MODE) == R15_MODE_USR)
#endif
@@ -162,7 +162,7 @@
/* Hack to treat FPE time as interrupt time so we can measure it */
#define CLKF_INTR(frame) \
((curcpu()->ci_intr_depth > 1) || \
- (frame->cf_if.if_spsr & PSR_MODE) == PSR_UND32_MODE)
+ (frame->cf_tf.tf_spsr & PSR_MODE) == PSR_UND32_MODE)
#else
#define CLKF_INTR(frame) (curcpu()->ci_intr_depth > 1)
#endif
@@ -171,7 +171,7 @@
* CLKF_PC: Extract the program counter from a clockframe
*/
#ifdef __PROG32
-#define CLKF_PC(frame) (frame->cf_if.if_pc)
+#define CLKF_PC(frame) (frame->cf_tf.tf_pc)
#else
#define CLKF_PC(frame) (frame->cf_if.if_r15 & R15_PC)
#endif
diff -r 343d8a554cd4 -r ebe80bdeb7a9 sys/arch/arm/ixp12x0/ixp12x0_intr.c
--- a/sys/arch/arm/ixp12x0/ixp12x0_intr.c Thu Aug 02 14:07:47 2012 +0000
+++ b/sys/arch/arm/ixp12x0/ixp12x0_intr.c Thu Aug 02 15:56:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp12x0_intr.c,v 1.22 2011/07/01 20:27:50 dyoung Exp $ */
+/* $NetBSD: ixp12x0_intr.c,v 1.23 2012/08/02 15:56:07 skrll Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr.c,v 1.22 2011/07/01 20:27:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp12x0_intr.c,v 1.23 2012/08/02 15:56:07 skrll Exp $");
/*
* Interrupt support for the Intel ixp12x0
@@ -74,7 +74,7 @@
/* Interrupts pending. */
static volatile int ipending;
-void ixp12x0_intr_dispatch(struct irqframe *frame);
+void ixp12x0_intr_dispatch(struct trapframe *);
#define IXPREG(reg) *((volatile u_int32_t*) (reg))
@@ -382,7 +382,7 @@
}
void
-ixp12x0_intr_dispatch(struct irqframe *frame)
+ixp12x0_intr_dispatch(struct trapframe *frame)
{
struct intrq* iq;
struct intrhand* ih;
diff -r 343d8a554cd4 -r ebe80bdeb7a9 sys/arch/arm/xscale/becc_icu.c
--- a/sys/arch/arm/xscale/becc_icu.c Thu Aug 02 14:07:47 2012 +0000
+++ b/sys/arch/arm/xscale/becc_icu.c Thu Aug 02 15:56:06 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: becc_icu.c,v 1.12 2010/12/20 00:25:29 matt Exp $ */
+/* $NetBSD: becc_icu.c,v 1.13 2012/08/02 15:56:07 skrll Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: becc_icu.c,v 1.12 2010/12/20 00:25:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: becc_icu.c,v 1.13 2012/08/02 15:56:07 skrll Exp $");
#ifndef EVBARM_SPL_NOINLINE
#define EVBARM_SPL_NOINLINE
@@ -117,7 +117,7 @@
"irq 31",
};
-void becc_intr_dispatch(struct irqframe *frame);
+void becc_intr_dispatch(struct trapframe *frame);
static inline uint32_t
becc_icsr_read(void)
@@ -335,7 +335,7 @@
}
void
-becc_intr_dispatch(struct irqframe *frame)
+becc_intr_dispatch(struct trapframe *frame)
{
Home |
Main Index |
Thread Index |
Old Index