[src/netbsd-1-5]: src/sys/arch/mac68k/mac68k Pull up revision 1.133 (requeste...

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

details:   https://anonhg.NetBSD.org/src/rev/6ac68b818bb5
branches:  netbsd-1-5
changeset: 490503:6ac68b818bb5
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Thu Jan 25 17:39:18 2001 +0000

description:
Pull up revision 1.133 (requested by briggs):
 Improve performance of the pseudo-DMA mode of the esp driver, and handle
 residual FIFO data on write.

diffstat:

 sys/arch/mac68k/mac68k/locore.s |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (42 lines):

diff -r 2c14ade04e2d -r 6ac68b818bb5 sys/arch/mac68k/mac68k/locore.s
--- a/sys/arch/mac68k/mac68k/locore.s   Thu Jan 25 17:24:17 2001 +0000
+++ b/sys/arch/mac68k/mac68k/locore.s   Thu Jan 25 17:39:18 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.129 2000/05/31 05:06:51 thorpej Exp $     */
+/*     $NetBSD: locore.s,v 1.129.2.1 2001/01/25 17:39:18 jhawk Exp $   */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -366,6 +366,8 @@
 #include <m68k/m68k/trap_subr.s>
 
        .data
+GLOBAL(mac68k_a2_fromfault)
+       .long   0
 GLOBAL(m68k_fault_addr)
        .long   0
 
@@ -416,6 +418,7 @@
 Lberr60:
        tstl    _C_LABEL(nofault)       | catch bus error?
        jeq     Lisberr                 | no, handle as usual
+       movl    a2,_C_LABEL(mac68k_a2_fromfault) | save a2
        movl    sp@(FR_HW+8+8),_C_LABEL(m68k_fault_addr) | save fault addr
        movl    _C_LABEL(nofault),sp@-  | yes,
        jbsr    _C_LABEL(longjmp)       |  longjmp(nofault)
@@ -444,6 +447,7 @@
 Lberr40:
        tstl    _C_LABEL(nofault)       | catch bus error?
        jeq     Lisberr                 | no, handle as usual
+       movl    a2,_C_LABEL(mac68k_a2_fromfault) | save a2
        movl    sp@(FR_HW+8+20),_C_LABEL(m68k_fault_addr) | save fault addr
        movl    _C_LABEL(nofault),sp@-  | yes,
        jbsr    _C_LABEL(longjmp)       |  longjmp(nofault)
@@ -534,6 +538,7 @@
        clrw    sp@                     | re-clear pad word
        tstl    _C_LABEL(nofault)       | catch bus error?
        jeq     Lisberr                 | no, handle as usual
+       movl    a2,_C_LABEL(mac68k_a2_fromfault) | save a2
        movl    sp@(FR_HW+8+16),_C_LABEL(m68k_fault_addr) | save fault addr
        movl    _C_LABEL(nofault),sp@-  | yes,
        jbsr    _C_LABEL(longjmp)       |  longjmp(nofault)