Module Name: src
Committed By: tsutsui
Date: Sun Mar 9 16:18:00 UTC 2014
Modified Files:
src/sys/arch/cesfic/cesfic: locore.s
src/sys/arch/hp300/hp300: locore.s
src/sys/arch/luna68k/luna68k: locore.s
src/sys/arch/news68k/news68k: locore.s
src/sys/arch/next68k/next68k: locore.s
Log Message:
Remove unused m68k_fault_addr, which is required only on mac68k for SBC.
It looks hp300 one was copied from mac68k in rev 1.75
and then it was pasted to other ports again and again.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.167 -r1.168 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/news68k/news68k/locore.s
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/next68k/next68k/locore.s
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cesfic/cesfic/locore.s
diff -u src/sys/arch/cesfic/cesfic/locore.s:1.29 src/sys/arch/cesfic/cesfic/locore.s:1.30
--- src/sys/arch/cesfic/cesfic/locore.s:1.29 Fri Jan 31 18:49:35 2014
+++ src/sys/arch/cesfic/cesfic/locore.s Sun Mar 9 16:18:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.29 2014/01/31 18:49:35 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.30 2014/03/09 16:18:00 tsutsui Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -387,10 +387,6 @@ Lmainreturned:
*/
#include <m68k/m68k/trap_subr.s>
- .data
-GLOBAL(m68k_fault_addr)
- .long 0
-
#if defined(M68040) || defined(M68060)
ENTRY_NOPROFILE(addrerr4060)
clrl %sp@- | stack adjust count
@@ -437,7 +433,6 @@ Lberr3:
Lberr60:
tstl _C_LABEL(nofault) | catch bus error?
jeq Lisberr | no, handle as usual
- 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)
/* NOTREACHED */
@@ -465,7 +460,6 @@ Lbe1stpg:
Lberr40:
tstl _C_LABEL(nofault) | catch bus error?
jeq Lisberr | no, handle as usual
- 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)
/* NOTREACHED */
@@ -571,7 +565,6 @@ Lisberr1:
clrw %sp@ | re-clear pad word
tstl _C_LABEL(nofault) | catch bus error?
jeq Lisberr | no, handle as usual
- 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)
/* NOTREACHED */
Index: src/sys/arch/hp300/hp300/locore.s
diff -u src/sys/arch/hp300/hp300/locore.s:1.167 src/sys/arch/hp300/hp300/locore.s:1.168
--- src/sys/arch/hp300/hp300/locore.s:1.167 Fri Jan 31 18:49:35 2014
+++ src/sys/arch/hp300/hp300/locore.s Sun Mar 9 16:18:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.167 2014/01/31 18:49:35 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.168 2014/03/09 16:18:00 tsutsui Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -621,10 +621,6 @@ Lnocache0:
*/
#include <m68k/m68k/trap_subr.s>
- .data
-GLOBAL(m68k_fault_addr)
- .long 0
-
#if defined(M68040) || defined(M68060)
ENTRY_NOPROFILE(addrerr4060)
clrl %sp@- | stack adjust count
@@ -672,7 +668,6 @@ Lberr3:
Lberr60:
tstl _C_LABEL(nofault) | catch bus error?
jeq Lisberr | no, handle as usual
- 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)
/* NOTREACHED */
@@ -700,7 +695,6 @@ Lbe1stpg:
Lberr40:
tstl _C_LABEL(nofault) | catch bus error?
jeq Lisberr | no, handle as usual
- 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)
/* NOTREACHED */
@@ -806,7 +800,6 @@ Lisberr1:
clrw %sp@ | re-clear pad word
tstl _C_LABEL(nofault) | catch bus error?
jeq Lisberr | no, handle as usual
- 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)
/* NOTREACHED */
Index: src/sys/arch/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.55 src/sys/arch/luna68k/luna68k/locore.s:1.56
--- src/sys/arch/luna68k/luna68k/locore.s:1.55 Fri Jan 31 18:49:35 2014
+++ src/sys/arch/luna68k/luna68k/locore.s Sun Mar 9 16:18:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.55 2014/01/31 18:49:35 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.56 2014/03/09 16:18:00 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -350,10 +350,6 @@ Lenab3:
*/
#include <m68k/m68k/trap_subr.s>
- .data
-GLOBAL(m68k_fault_addr)
- .long 0
-
#if defined(M68040) || defined(M68060)
ENTRY_NOPROFILE(addrerr4060)
clrl %sp@- | stack adjust count
@@ -401,7 +397,6 @@ Lberr3:
Lberr60:
tstl _C_LABEL(nofault) | catch bus error?
jeq Lisberr | no, handle as usual
- 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)
/* NOTREACHED */
@@ -429,7 +424,6 @@ Lbe1stpg:
Lberr40:
tstl _C_LABEL(nofault) | catch bus error?
jeq Lisberr | no, handle as usual
- 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)
/* NOTREACHED */
@@ -516,7 +510,6 @@ Lisberr1:
clrw %sp@ | re-clear pad word
tstl _C_LABEL(nofault) | catch bus error?
jeq Lisberr | no, handle as usual
- 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)
/* NOTREACHED */
Index: src/sys/arch/news68k/news68k/locore.s
diff -u src/sys/arch/news68k/news68k/locore.s:1.63 src/sys/arch/news68k/news68k/locore.s:1.64
--- src/sys/arch/news68k/news68k/locore.s:1.63 Fri Jan 31 18:49:35 2014
+++ src/sys/arch/news68k/news68k/locore.s Sun Mar 9 16:18:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.63 2014/01/31 18:49:35 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.64 2014/03/09 16:18:00 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -479,10 +479,6 @@ Lenab3:
*/
#include <m68k/m68k/trap_subr.s>
- .data
-GLOBAL(m68k_fault_addr)
- .long 0
-
#if defined(M68020) || defined(M68030)
ENTRY_NOPROFILE(busaddrerr2030)
clrl %sp@- | stack adjust count
@@ -569,7 +565,6 @@ Lisberr1:
clrw %sp@ | re-clear pad word
tstl _C_LABEL(nofault) | catch bus error?
jeq Lisberr | no, handle as usual
- 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)
/* NOTREACHED */
Index: src/sys/arch/next68k/next68k/locore.s
diff -u src/sys/arch/next68k/next68k/locore.s:1.62 src/sys/arch/next68k/next68k/locore.s:1.63
--- src/sys/arch/next68k/next68k/locore.s:1.62 Fri Jan 31 18:49:35 2014
+++ src/sys/arch/next68k/next68k/locore.s Sun Mar 9 16:18:00 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.62 2014/01/31 18:49:35 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.63 2014/03/09 16:18:00 tsutsui Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -507,10 +507,6 @@ Lenab3:
*/
#include <m68k/m68k/trap_subr.s>
- .data
-GLOBAL(m68k_fault_addr)
- .long 0
-
#if defined(M68040) || defined(M68060)
ENTRY_NOPROFILE(addrerr4060)
clrl %sp@- | stack adjust count
@@ -558,7 +554,6 @@ Lberr3:
Lberr60:
tstl _C_LABEL(nofault) | catch bus error?
jeq Lisberr | no, handle as usual
- 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)
/* NOTREACHED */
@@ -586,7 +581,6 @@ Lbe1stpg:
Lberr40:
tstl _C_LABEL(nofault) | catch bus error?
jeq Lisberr | no, handle as usual
- 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)
/* NOTREACHED */
@@ -692,7 +686,6 @@ Lisberr1:
clrw %sp@ | re-clear pad word
tstl _C_LABEL(nofault) | catch bus error?
jeq Lisberr | no, handle as usual
- 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)
/* NOTREACHED */
