[src/trunk]: src/sys/arch/atari/atari Fix silent hang after isa_intr_establis...

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

details:   https://anonhg.NetBSD.org/src/rev/ad50261b9158
branches:  trunk
changeset: 358870:ad50261b9158
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sat Jan 20 18:04:28 2018 +0000

description:
Fix silent hang after isa_intr_establish() on Milan.

The problems (wrong macro replacements) were slipped in rev 1.107:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/atari/atari/locore.s#rev1.107

diffstat:

 sys/arch/atari/atari/locore.s |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 002d70cebfd2 -r ad50261b9158 sys/arch/atari/atari/locore.s
--- a/sys/arch/atari/atari/locore.s     Sat Jan 20 18:01:53 2018 +0000
+++ b/sys/arch/atari/atari/locore.s     Sat Jan 20 18:04:28 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.110 2011/12/22 15:33:28 tsutsui Exp $     */
+/*     $NetBSD: locore.s,v 1.111 2018/01/20 18:04:28 tsutsui Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -399,7 +399,7 @@
        movel   %d1,%sp@-               | Call handler
        jbsr    _C_LABEL(milan_isa_intr)
        addql   #8,%sp
-       INTERRUPT_RESTOREREG
+       moveml  %sp@+,%d0-%d2/%a0-%a1
        subql   #1,_C_LABEL(idepth)
        jra     _ASM_LABEL(rei)
 
@@ -450,7 +450,6 @@
        tstl    _ASM_LABEL(plx_nonmi)   | milan_conf_read shortcut
        jne     1f                      | .... get out immediately
        INTERRUPT_SAVEREG
-       moveml  %d0-%d1/%a0-%a1,%sp@-
        movl    _C_LABEL(stio_addr),%a0 | get KVA of ST-IO area
        movw    %a0@(PLX_PCICR),_C_LABEL(plx_status)
        movw    #0xf900,%a0@(PLX_PCICR) | Clear error bits
@@ -464,7 +463,6 @@
 ENTRY_NOPROFILE(lev3intr)
 ENTRY_NOPROFILE(badtrap)
        addql   #1,_C_LABEL(idepth)
-       moveml  #0xC0C0,%sp@-           |  save scratch regs
        INTERRUPT_SAVEREG
        movw    %sp@(22),%sp@-          |  push exception vector info
        clrw    %sp@-