Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/sun3/sun3x avoid dup defs, use global macros



details:   https://anonhg.NetBSD.org/src/rev/c1b1abc05ba1
branches:  trunk
changeset: 794774:c1b1abc05ba1
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Mar 24 18:42:56 2014 +0000

description:
avoid dup defs, use global macros

diffstat:

 sys/arch/sun3/sun3x/locore.s |  16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diffs (54 lines):

diff -r d32c854fd784 -r c1b1abc05ba1 sys/arch/sun3/sun3x/locore.s
--- a/sys/arch/sun3/sun3x/locore.s      Mon Mar 24 18:39:57 2014 +0000
+++ b/sys/arch/sun3/sun3x/locore.s      Mon Mar 24 18:42:56 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.64 2011/12/22 15:33:30 tsutsui Exp $      */
+/*     $NetBSD: locore.s,v 1.65 2014/03/24 18:42:56 christos Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -431,12 +431,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.
@@ -450,7 +444,7 @@
 GLOBAL(_isr_autovec)
        INTERRUPT_SAVEREG
        jbsr    _C_LABEL(isr_autovec)
-       INTERRUPT_RESTORE
+       INTERRUPT_RESTOREREG
        jra     _ASM_LABEL(rei)
 
 /* clock: see clock.c */
@@ -462,7 +456,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)
@@ -474,11 +468,11 @@
 GLOBAL(_isr_vectored)
        INTERRUPT_SAVEREG
        jbsr    _C_LABEL(isr_vectored)
-       INTERRUPT_RESTORE
+       INTERRUPT_RESTOREREG
        jra     _ASM_LABEL(rei)
 
 #undef INTERRUPT_SAVEREG
-#undef INTERRUPT_RESTORE
+#undef INTERRUPT_RESTOREREG
 
 /* interrupt counters (needed by vmstat) */
 GLOBAL(intrnames)



Home | Main Index | Thread Index | Old Index