Module Name: src
Committed By: christos
Date: Mon Mar 24 18:50:08 UTC 2014
Modified Files:
src/sys/arch/sun2/sun2: locore.s
Log Message:
avoid local redefinitions
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sun2/sun2/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/sun2/sun2/locore.s
diff -u src/sys/arch/sun2/sun2/locore.s:1.24 src/sys/arch/sun2/sun2/locore.s:1.25
--- src/sys/arch/sun2/sun2/locore.s:1.24 Tue Nov 15 05:57:04 2011
+++ src/sys/arch/sun2/sun2/locore.s Mon Mar 24 14:50:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.24 2011/11/15 10:57:04 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.25 2014/03/24 18:50:08 christos Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -400,12 +400,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.
@@ -419,7 +413,7 @@ Lbrkpt2:
GLOBAL(_isr_autovec)
INTERRUPT_SAVEREG
jbsr _C_LABEL(isr_autovec)
- INTERRUPT_RESTORE
+ INTERRUPT_RESTOREREG
jra _ASM_LABEL(rei)
/* clock: see clock.c */
@@ -431,7 +425,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)
@@ -443,12 +437,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
