Module Name: src
Committed By: skrll
Date: Thu Aug 2 15:56:08 UTC 2012
Modified Files:
src/sys/arch/arm/arm32: genassym.cf
src/sys/arch/arm/at91: at91aic.c at91aicvar.h at91busvar.h
src/sys/arch/arm/ep93xx: ep93xx_intr.c
src/sys/arch/arm/include: cpu.h
src/sys/arch/arm/include/arm32: frame.h
src/sys/arch/arm/ixp12x0: ixp12x0_intr.c
src/sys/arch/arm/xscale: becc_icu.c i80200_icu.c i80200var.h
i80321_icu.c
src/sys/arch/evbarm/iq80310: iq80310_intr.c
Log Message:
Remove irqframe and replace with identical trapframe.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/arm/arm32/genassym.cf
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/at91/at91aic.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/at91/at91aicvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/at91/at91busvar.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/ep93xx/ep93xx_intr.c
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/arm/include/cpu.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/include/arm32/frame.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/ixp12x0/ixp12x0_intr.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/xscale/becc_icu.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/xscale/i80200_icu.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/xscale/i80200var.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/xscale/i80321_icu.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/iq80310/iq80310_intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/genassym.cf
diff -u src/sys/arch/arm/arm32/genassym.cf:1.46 src/sys/arch/arm/arm32/genassym.cf:1.47
--- src/sys/arch/arm/arm32/genassym.cf:1.46 Thu Apr 7 10:03:47 2011
+++ src/sys/arch/arm/arm32/genassym.cf Thu Aug 2 15:56:06 2012
@@ -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_R0 offsetof(struct trapframe
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)
Index: src/sys/arch/arm/at91/at91aic.c
diff -u src/sys/arch/arm/at91/at91aic.c:1.8 src/sys/arch/arm/at91/at91aic.c:1.9
--- src/sys/arch/arm/at91/at91aic.c:1.8 Fri Nov 4 17:16:38 2011
+++ src/sys/arch/arm/at91/at91aic.c Thu Aug 2 15:56:06 2012
@@ -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 @@ at91aic_intr_disestablish(void *cookie)
#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 @@ intr_process(struct intrq *iq, int pcpl,
}
void
-at91aic_intr_dispatch(struct irqframe *frame)
+at91aic_intr_dispatch(struct trapframe *frame)
{
struct intrq* iq;
int pcpl = curcpl();
Index: src/sys/arch/arm/at91/at91aicvar.h
diff -u src/sys/arch/arm/at91/at91aicvar.h:1.3 src/sys/arch/arm/at91/at91aicvar.h:1.4
--- src/sys/arch/arm/at91/at91aicvar.h:1.3 Fri Oct 23 06:53:13 2009
+++ src/sys/arch/arm/at91/at91aicvar.h Thu Aug 2 15:56:06 2012
@@ -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_init(void);
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_ */
Index: src/sys/arch/arm/at91/at91busvar.h
diff -u src/sys/arch/arm/at91/at91busvar.h:1.4 src/sys/arch/arm/at91/at91busvar.h:1.5
--- src/sys/arch/arm/at91/at91busvar.h:1.4 Fri Jul 1 19:31:16 2011
+++ src/sys/arch/arm/at91/at91busvar.h Thu Aug 2 15:56:06 2012
@@ -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 @@ struct at91bus_softc {
bus_dma_tag_t sc_dmat;
};
-struct irqframe;
+struct trapframe;
struct at91bus_machdep {
/* initialization: */
@@ -95,7 +95,7 @@ struct at91bus_machdep {
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);
Index: src/sys/arch/arm/ep93xx/ep93xx_intr.c
diff -u src/sys/arch/arm/ep93xx/ep93xx_intr.c:1.16 src/sys/arch/arm/ep93xx/ep93xx_intr.c:1.17
--- src/sys/arch/arm/ep93xx/ep93xx_intr.c:1.16 Fri Jul 1 19:31:17 2011
+++ src/sys/arch/arm/ep93xx/ep93xx_intr.c Thu Aug 2 15:56:06 2012
@@ -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 @@ volatile u_int32_t vic2_intr_enabled;
/* 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 @@ ep93xx_intr_disestablish(void *cookie)
}
void
-ep93xx_intr_dispatch(struct irqframe *frame)
+ep93xx_intr_dispatch(struct trapframe *frame)
{
struct intrq* iq;
struct intrhand* ih;
Index: src/sys/arch/arm/include/cpu.h
diff -u src/sys/arch/arm/include/cpu.h:1.64 src/sys/arch/arm/include/cpu.h:1.65
--- src/sys/arch/arm/include/cpu.h:1.64 Mon Jul 16 06:26:43 2012
+++ src/sys/arch/arm/include/cpu.h Thu Aug 2 15:56:07 2012
@@ -149,7 +149,7 @@ extern int cpu_do_powersave;
* 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 @@ extern int cpu_do_powersave;
/* 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 @@ extern int cpu_do_powersave;
* 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
Index: src/sys/arch/arm/include/arm32/frame.h
diff -u src/sys/arch/arm/include/arm32/frame.h:1.29 src/sys/arch/arm/include/arm32/frame.h:1.30
--- src/sys/arch/arm/include/arm32/frame.h:1.29 Wed Aug 1 22:46:07 2012
+++ src/sys/arch/arm/include/arm32/frame.h Thu Aug 2 15:56:07 2012
@@ -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 @@ LOCK_CAS_DEBUG_LOCALS
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.
*/
/*
Index: src/sys/arch/arm/ixp12x0/ixp12x0_intr.c
diff -u src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.22 src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.23
--- src/sys/arch/arm/ixp12x0/ixp12x0_intr.c:1.22 Fri Jul 1 20:27:50 2011
+++ src/sys/arch/arm/ixp12x0/ixp12x0_intr.c Thu Aug 2 15:56:07 2012
@@ -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 @@ volatile u_int32_t pci_intr_enabled;
/* 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 @@ ixp12x0_intr_disestablish(void *cookie)
}
void
-ixp12x0_intr_dispatch(struct irqframe *frame)
+ixp12x0_intr_dispatch(struct trapframe *frame)
{
struct intrq* iq;
struct intrhand* ih;
Index: src/sys/arch/arm/xscale/becc_icu.c
diff -u src/sys/arch/arm/xscale/becc_icu.c:1.12 src/sys/arch/arm/xscale/becc_icu.c:1.13
--- src/sys/arch/arm/xscale/becc_icu.c:1.12 Mon Dec 20 00:25:29 2010
+++ src/sys/arch/arm/xscale/becc_icu.c Thu Aug 2 15:56:07 2012
@@ -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 @@ const char * const becc_irqnames[] = {
"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 @@ becc_intr_disestablish(void *cookie)
}
void
-becc_intr_dispatch(struct irqframe *frame)
+becc_intr_dispatch(struct trapframe *frame)
{
struct intrq *iq;
struct intrhand *ih;
Index: src/sys/arch/arm/xscale/i80200_icu.c
diff -u src/sys/arch/arm/xscale/i80200_icu.c:1.9 src/sys/arch/arm/xscale/i80200_icu.c:1.10
--- src/sys/arch/arm/xscale/i80200_icu.c:1.9 Sat Dec 24 20:06:52 2005
+++ src/sys/arch/arm/xscale/i80200_icu.c Thu Aug 2 15:56:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: i80200_icu.c,v 1.9 2005/12/24 20:06:52 perry Exp $ */
+/* $NetBSD: i80200_icu.c,v 1.10 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: i80200_icu.c,v 1.9 2005/12/24 20:06:52 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80200_icu.c,v 1.10 2012/08/02 15:56:07 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -54,10 +54,10 @@ __KERNEL_RCSID(0, "$NetBSD: i80200_icu.c
static volatile uint32_t intctl;
/* Pointer to board-specific external IRQ dispatcher. */
-void (*i80200_extirq_dispatch)(struct irqframe *);
+void (*i80200_extirq_dispatch)(struct trapframe *);
static void
-i80200_default_extirq_dispatch(struct irqframe *framep)
+i80200_default_extirq_dispatch(struct trapframe *framep)
{
panic("external IRQ with no dispatch routine");
Index: src/sys/arch/arm/xscale/i80200var.h
diff -u src/sys/arch/arm/xscale/i80200var.h:1.5 src/sys/arch/arm/xscale/i80200var.h:1.6
--- src/sys/arch/arm/xscale/i80200var.h:1.5 Sun Jul 29 00:07:10 2012
+++ src/sys/arch/arm/xscale/i80200var.h Thu Aug 2 15:56:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: i80200var.h,v 1.5 2012/07/29 00:07:10 matt Exp $ */
+/* $NetBSD: i80200var.h,v 1.6 2012/08/02 15:56:07 skrll Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -43,7 +43,7 @@ void i80200_icu_init(void);
void i80200_intr_enable(uint32_t);
void i80200_intr_disable(uint32_t);
-struct irqframe;
-extern void (*i80200_extirq_dispatch)(struct irqframe *);
+struct trapframe;
+extern void (*i80200_extirq_dispatch)(struct trapframe *);
#endif /* _ARM_XSCALE_I80200VAR_H_ */
Index: src/sys/arch/arm/xscale/i80321_icu.c
diff -u src/sys/arch/arm/xscale/i80321_icu.c:1.23 src/sys/arch/arm/xscale/i80321_icu.c:1.24
--- src/sys/arch/arm/xscale/i80321_icu.c:1.23 Sun Feb 12 16:31:01 2012
+++ src/sys/arch/arm/xscale/i80321_icu.c Thu Aug 2 15:56:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: i80321_icu.c,v 1.23 2012/02/12 16:31:01 matt Exp $ */
+/* $NetBSD: i80321_icu.c,v 1.24 2012/08/02 15:56:07 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2006 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80321_icu.c,v 1.23 2012/02/12 16:31:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80321_icu.c,v 1.24 2012/08/02 15:56:07 skrll Exp $");
#ifndef EVBARM_SPL_NOINLINE
#define EVBARM_SPL_NOINLINE
@@ -434,7 +434,7 @@ i80321_intr_dispatch(struct clockframe *
* triggered interrupt will just keep
* coming back.
*/
- frame->cf_if.if_spsr |= I32_bit;
+ frame->cf_tf.tf_spsr |= I32_bit;
}
#endif
i80321_ipending |= ibit;
@@ -469,7 +469,7 @@ i80321_intr_dispatch(struct clockframe *
* Here's hoping the handler really did clear
* down the source...
*/
- frame->cf_if.if_spsr &= ~I32_bit;
+ frame->cf_tf.tf_spsr &= ~I32_bit;
}
#endif
ci->ci_cpl = ppl;
Index: src/sys/arch/evbarm/iq80310/iq80310_intr.c
diff -u src/sys/arch/evbarm/iq80310/iq80310_intr.c:1.29 src/sys/arch/evbarm/iq80310/iq80310_intr.c:1.30
--- src/sys/arch/evbarm/iq80310/iq80310_intr.c:1.29 Fri Jul 1 20:41:16 2011
+++ src/sys/arch/evbarm/iq80310/iq80310_intr.c Thu Aug 2 15:56:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iq80310_intr.c,v 1.29 2011/07/01 20:41:16 dyoung Exp $ */
+/* $NetBSD: iq80310_intr.c,v 1.30 2012/08/02 15:56:07 skrll Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.29 2011/07/01 20:41:16 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.30 2012/08/02 15:56:07 skrll Exp $");
#ifndef EVBARM_SPL_NOINLINE
#define EVBARM_SPL_NOINLINE
@@ -92,7 +92,7 @@ static const int si_to_ipl[SI_NQUEUES] =
};
#endif
-void iq80310_intr_dispatch(struct irqframe *frame);
+void iq80310_intr_dispatch(struct trapframe *frame);
static inline uint32_t
iq80310_intstat_read(void)
@@ -404,7 +404,7 @@ iq80310_intr_disestablish(void *cookie)
}
void
-iq80310_intr_dispatch(struct irqframe *frame)
+iq80310_intr_dispatch(struct trapframe *frame)
{
struct intrq *iq;
struct intrhand *ih;
