[src/trunk]: src/sys/arch Remove an instruction for nonexistent 060 branch pr...

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

details:   https://anonhg.NetBSD.org/src/rev/86d6f445537f
branches:  trunk
changeset: 327490:86d6f445537f
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Mar 09 16:28:43 2014 +0000

description:
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.

diffstat:

 sys/arch/cesfic/cesfic/locore.s   |  3 +--
 sys/arch/hp300/hp300/locore.s     |  3 +--
 sys/arch/luna68k/luna68k/locore.s |  3 +--
 sys/arch/mac68k/mac68k/locore.s   |  3 +--
 sys/arch/next68k/next68k/locore.s |  3 +--
 5 files changed, 5 insertions(+), 10 deletions(-)

diffs (85 lines):

diff -r 350b2718b93e -r 86d6f445537f sys/arch/cesfic/cesfic/locore.s
--- a/sys/arch/cesfic/cesfic/locore.s   Sun Mar 09 16:25:59 2014 +0000
+++ b/sys/arch/cesfic/cesfic/locore.s   Sun Mar 09 16:28:43 2014 +0000
@@ -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 @@
        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:
diff -r 350b2718b93e -r 86d6f445537f sys/arch/hp300/hp300/locore.s
--- a/sys/arch/hp300/hp300/locore.s     Sun Mar 09 16:25:59 2014 +0000
+++ b/sys/arch/hp300/hp300/locore.s     Sun Mar 09 16:28:43 2014 +0000
@@ -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 @@
        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:
diff -r 350b2718b93e -r 86d6f445537f sys/arch/luna68k/luna68k/locore.s
--- a/sys/arch/luna68k/luna68k/locore.s Sun Mar 09 16:25:59 2014 +0000
+++ b/sys/arch/luna68k/luna68k/locore.s Sun Mar 09 16:28:43 2014 +0000
@@ -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 @@
        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:
diff -r 350b2718b93e -r 86d6f445537f sys/arch/mac68k/mac68k/locore.s
--- a/sys/arch/mac68k/mac68k/locore.s   Sun Mar 09 16:25:59 2014 +0000
+++ b/sys/arch/mac68k/mac68k/locore.s   Sun Mar 09 16:28:43 2014 +0000
@@ -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 @@
        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:
diff -r 350b2718b93e -r 86d6f445537f sys/arch/next68k/next68k/locore.s
--- a/sys/arch/next68k/next68k/locore.s Sun Mar 09 16:25:59 2014 +0000
+++ b/sys/arch/next68k/next68k/locore.s Sun Mar 09 16:28:43 2014 +0000
@@ -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 @@
        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: