Module Name: src
Committed By: tsutsui
Date: Sun Mar 9 16:28:43 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/mac68k/mac68k: locore.s
src/sys/arch/next68k/next68k: locore.s
Log Message:
Remove an instruction for nonexistent 060 branch prediction error accounting.
It's amiga and atari specific and copied from amiga/locore.s
to mac68k/locore.s in rev 1.80, then pasted into other ports.
Note this is harmless because all these ports don't have 68060 variants
(i.e. it's inside #if defined(M68060) block) and mvme68k (which has 68060)
has removed it since the initial import.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.168 -r1.169 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.168 -r1.169 src/sys/arch/mac68k/mac68k/locore.s
cvs rdiff -u -r1.63 -r1.64 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.30 src/sys/arch/cesfic/cesfic/locore.s:1.31
--- src/sys/arch/cesfic/cesfic/locore.s:1.30 Sun Mar 9 16:18:00 2014
+++ src/sys/arch/cesfic/cesfic/locore.s Sun Mar 9 16:28:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.30 2014/03/09 16:18:00 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.31 2014/03/09 16:28:43 tsutsui Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -411,7 +411,6 @@ ENTRY_NOPROFILE(addrerr4060)
orl #IC60_CABC,%d2 | clear all branch cache entries
movc %d2,%cacr
movl %d0,%d1
- addql #1,L60bpe
andl #0x7ffd,%d1
jeq _ASM_LABEL(faultstkadjnotrap2)
Lnobpe:
Index: src/sys/arch/hp300/hp300/locore.s
diff -u src/sys/arch/hp300/hp300/locore.s:1.168 src/sys/arch/hp300/hp300/locore.s:1.169
--- src/sys/arch/hp300/hp300/locore.s:1.168 Sun Mar 9 16:18:00 2014
+++ src/sys/arch/hp300/hp300/locore.s Sun Mar 9 16:28:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.168 2014/03/09 16:18:00 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.169 2014/03/09 16:28:43 tsutsui Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -646,7 +646,6 @@ ENTRY_NOPROFILE(buserr60)
orl #IC60_CABC,%d2 | clear all branch cache entries
movc %d2,%cacr
movl %d0,%d1
- addql #1,L60bpe
andl #0x7ffd,%d1
jeq _ASM_LABEL(faultstkadjnotrap2)
Lnobpe:
Index: src/sys/arch/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.56 src/sys/arch/luna68k/luna68k/locore.s:1.57
--- src/sys/arch/luna68k/luna68k/locore.s:1.56 Sun Mar 9 16:18:00 2014
+++ src/sys/arch/luna68k/luna68k/locore.s Sun Mar 9 16:28:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.56 2014/03/09 16:18:00 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.57 2014/03/09 16:28:43 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -375,7 +375,6 @@ ENTRY_NOPROFILE(buserr60)
orl #IC60_CABC,%d2 | clear all branch cache entries
movc %d2,%cacr
movl %d0,%d1
- addql #1,L60bpe
andl #0x7ffd,%d1
jeq _ASM_LABEL(faultstkadjnotrap2)
Lnobpe:
Index: src/sys/arch/mac68k/mac68k/locore.s
diff -u src/sys/arch/mac68k/mac68k/locore.s:1.168 src/sys/arch/mac68k/mac68k/locore.s:1.169
--- src/sys/arch/mac68k/mac68k/locore.s:1.168 Sat Sep 7 19:06:29 2013
+++ src/sys/arch/mac68k/mac68k/locore.s Sun Mar 9 16:28:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.168 2013/09/07 19:06:29 chs Exp $ */
+/* $NetBSD: locore.s,v 1.169 2014/03/09 16:28:43 tsutsui Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -505,7 +505,6 @@ ENTRY_NOPROFILE(buserr60)
orl #IC60_CABC,%d2 | clear all branch cache entries
movc %d2,%cacr
movl %d0,%d1
- addql #1,L60bpe
andl #0x7ffd,%d1
jeq _ASM_LABEL(faultstkadjnotrap2)
Lnobpe:
Index: src/sys/arch/next68k/next68k/locore.s
diff -u src/sys/arch/next68k/next68k/locore.s:1.63 src/sys/arch/next68k/next68k/locore.s:1.64
--- src/sys/arch/next68k/next68k/locore.s:1.63 Sun Mar 9 16:18:00 2014
+++ src/sys/arch/next68k/next68k/locore.s Sun Mar 9 16:28:43 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.63 2014/03/09 16:18:00 tsutsui Exp $ */
+/* $NetBSD: locore.s,v 1.64 2014/03/09 16:28:43 tsutsui Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -532,7 +532,6 @@ ENTRY_NOPROFILE(buserr60)
orl #IC60_CABC,%d2 | clear all branch cache entries
movc %d2,%cacr
movl %d0,%d1
- addql #1,L60bpe
andl #0x7ffd,%d1
jeq _ASM_LABEL(faultstkadjnotrap2)
Lnobpe:
