[src/trunk]: src/sys/arch/sun2/sun2 avoid local redefinitions

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5865fed94b5a
branches:  trunk
changeset: 328035:5865fed94b5a
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Mar 24 18:50:08 2014 +0000

description:
avoid local redefinitions

diffstat:

 sys/arch/sun2/sun2/locore.s |  17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

diffs (54 lines):

diff -r 3d849cc77d73 -r 5865fed94b5a sys/arch/sun2/sun2/locore.s
--- a/sys/arch/sun2/sun2/locore.s       Mon Mar 24 18:42:56 2014 +0000
+++ b/sys/arch/sun2/sun2/locore.s       Mon Mar 24 18:50:08 2014 +0000
@@ -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 @@
  *   %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 @@
 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_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_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