diff options
| -rw-r--r-- | sys/arch/sparc/sparc/cpu.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc/sparc/locore.s | 19 |
2 files changed, 8 insertions, 17 deletions
diff --git a/sys/arch/sparc/sparc/cpu.c b/sys/arch/sparc/sparc/cpu.c index 9556f108b32..ff6f5317b74 100644 --- a/sys/arch/sparc/sparc/cpu.c +++ b/sys/arch/sparc/sparc/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.22 2000/01/31 16:06:58 art Exp $ */ +/* $OpenBSD: cpu.c,v 1.23 2000/02/18 18:57:14 art Exp $ */ /* $NetBSD: cpu.c,v 1.56 1997/09/15 20:52:36 pk Exp $ */ /* @@ -425,7 +425,7 @@ struct module_info module_sun4 = { sun4_vcache_flush_region, sun4_vcache_flush_context, noop_pcache_flush_line, - memerr4_4c + 0 }; void @@ -548,7 +548,7 @@ struct module_info module_sun4c = { sun4_vcache_flush_region, sun4_vcache_flush_context, noop_pcache_flush_line, - memerr4_4c + 0 }; void diff --git a/sys/arch/sparc/sparc/locore.s b/sys/arch/sparc/sparc/locore.s index fa7d57743e9..4f34f686cb1 100644 --- a/sys/arch/sparc/sparc/locore.s +++ b/sys/arch/sparc/sparc/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.30 2000/02/18 16:05:36 art Exp $ */ +/* $OpenBSD: locore.s,v 1.31 2000/02/18 18:57:13 art Exp $ */ /* $NetBSD: locore.s,v 1.73 1997/09/13 20:36:48 pk Exp $ */ /* @@ -1734,9 +1734,7 @@ memfault_sun4: /* memory error = death for now XXX */ clr %o3 clr %o4 - set CPUINFO_VA+CPUINFO_MEMERR, %o0 - ld [%o0], %o0 - jmpl %o0, %o7 ! memerr(0, ser, sva, 0, 0) + call _memerr4_4c clr %o0 call _callrom nop @@ -1836,10 +1834,7 @@ memfault_sun4c: * If memerr() returns, return from the trap. */ wr %l0, PSR_ET, %psr - nop - set CPUINFO_VA+CPUINFO_MEMERR, %o0 - ld [%o0], %o0 - jmpl %o0, %o7 ! memerr(0, ser, sva, 0, 0) + call _memerr4_4c clr %o0 ld [%sp + CCFSZ + 20], %g1 ! restore g1 through g7 @@ -1859,9 +1854,7 @@ memfault_sun4c: * %o1 through %o4 still hold the error reg contents. */ 1: - set CPUINFO_VA+CPUINFO_MEMERR, %o0 - ld [%o0], %o0 - jmpl %o0, %o7 ! memerr(0, ser, sva, 0, 0) + call _memerr4_4c mov 1, %o0 ld [%sp + CCFSZ + 20], %g1 ! restore g1 through g7 @@ -2566,9 +2559,7 @@ nmi_sun4c: nmi_common: ! and call C code - set CPUINFO_VA+CPUINFO_MEMERR, %o0 - ld [%o0], %o0 - jmpl %o0, %o7 ! memerr(0, ser, sva, 0, 0) + call _memerr4_4c clr %o0 mov %l5, %g1 ! restore g1 through g7 |