Module Name: src
Committed By: christos
Date: Thu Nov 7 17:50:02 UTC 2013
Modified Files:
src/sys/arch/sun3/sun3: locore.s
Log Message:
don't duplicate definitions
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/sun3/sun3/locore.s
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/sun3/sun3/locore.s
diff -u src/sys/arch/sun3/sun3/locore.s:1.96 src/sys/arch/sun3/sun3/locore.s:1.97
--- src/sys/arch/sun3/sun3/locore.s:1.96 Sat Sep 7 11:56:11 2013
+++ src/sys/arch/sun3/sun3/locore.s Thu Nov 7 12:50:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.96 2013/09/07 15:56:11 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.97 2013/11/07 17:50:02 christos Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -446,12 +446,6 @@ Lbrkpt2:
* %d0,%d1,%a0,%a1, sr, pc, vo
*/
-#define INTERRUPT_SAVEREG \
- moveml #0xC0C0,%sp@-
-
-#define INTERRUPT_RESTORE \
- moveml %sp@+,#0x0303
-
/*
* This is the common auto-vector interrupt handler,
* for which the CPU provides the vector=0x18+level.
@@ -465,7 +459,7 @@ Lbrkpt2:
GLOBAL(_isr_autovec)
INTERRUPT_SAVEREG
jbsr _C_LABEL(isr_autovec)
- INTERRUPT_RESTORE
+ INTERRUPT_RESTOREREG
jra _ASM_LABEL(rei)
/* clock: see clock.c */
@@ -477,7 +471,7 @@ GLOBAL(_isr_autovec)
GLOBAL(_isr_clock)
INTERRUPT_SAVEREG
jbsr _C_LABEL(clock_intr)
- INTERRUPT_RESTORE
+ INTERRUPT_RESTOREREG
jra _ASM_LABEL(rei)
| Handler for all vectored interrupts (i.e. VME interrupts)
@@ -489,12 +483,9 @@ GLOBAL(_isr_clock)
GLOBAL(_isr_vectored)
INTERRUPT_SAVEREG
jbsr _C_LABEL(isr_vectored)
- INTERRUPT_RESTORE
+ INTERRUPT_RESTOREREG
jra _ASM_LABEL(rei)
-#undef INTERRUPT_SAVEREG
-#undef INTERRUPT_RESTORE
-
/* interrupt counters (needed by vmstat) */
GLOBAL(intrnames)
.asciz "spur" | 0
