Module Name: src
Committed By: thorpej
Date: Tue Dec 26 02:38:28 UTC 2023
Modified Files:
src/sys/arch/amiga/amiga: locore.s
src/sys/arch/atari/atari: locore.s
src/sys/arch/cesfic/cesfic: locore.s
src/sys/arch/hp300/hp300: locore.s
src/sys/arch/luna68k/luna68k: locore.s
src/sys/arch/mvme68k/mvme68k: locore.s
src/sys/arch/news68k/news68k: locore.s
src/sys/arch/next68k/next68k: locore.s
src/sys/arch/x68k/x68k: locore.s
Log Message:
G/C unused ploadw().
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/arch/amiga/amiga/locore.s
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/atari/atari/locore.s
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/cesfic/cesfic/locore.s
cvs rdiff -u -r1.175 -r1.176 src/sys/arch/hp300/hp300/locore.s
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/luna68k/luna68k/locore.s
cvs rdiff -u -r1.119 -r1.120 src/sys/arch/mvme68k/mvme68k/locore.s
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/news68k/news68k/locore.s
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/next68k/next68k/locore.s
cvs rdiff -u -r1.123 -r1.124 src/sys/arch/x68k/x68k/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/amiga/amiga/locore.s
diff -u src/sys/arch/amiga/amiga/locore.s:1.163 src/sys/arch/amiga/amiga/locore.s:1.164
--- src/sys/arch/amiga/amiga/locore.s:1.163 Tue Dec 26 02:31:57 2023
+++ src/sys/arch/amiga/amiga/locore.s Tue Dec 26 02:38:26 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.163 2023/12/26 02:31:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.164 2023/12/26 02:38:26 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -1148,14 +1148,6 @@ Lldustp040:
.word 0x4e7b,0x0806 | movec d0,URP
rts
-ENTRY(ploadw)
- movl %sp@(4),%a0 | address to load
- cmpl #MMU_68040,_C_LABEL(mmutype)
- jeq Lploadw040
- ploadw #1,%a0@ | pre-load translation
-Lploadw040: | should 68040 do a ptest?
- rts
-
/*
* Handle the nitty-gritty of rebooting the machine.
*
Index: src/sys/arch/atari/atari/locore.s
diff -u src/sys/arch/atari/atari/locore.s:1.119 src/sys/arch/atari/atari/locore.s:1.120
--- src/sys/arch/atari/atari/locore.s:1.119 Tue Dec 26 02:31:57 2023
+++ src/sys/arch/atari/atari/locore.s Tue Dec 26 02:38:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.119 2023/12/26 02:31:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.120 2023/12/26 02:38:27 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -1165,14 +1165,6 @@ Lldustp040:
.word 0x4e7b,0x0806 | movec d0,URP
rts
-ENTRY(ploadw)
- movl %sp@(4),%a0 | address to load
- cmpl #MMU_68040,_C_LABEL(mmutype)
- jeq Lploadw040
- ploadw #1,%a0@ | pre-load translation
-Lploadw040: | should 68040 do a ptest?
- rts
-
/*
* Set processor priority level calls. Most are implemented with
* inline asm expansions. However, spl0 requires special handling
Index: src/sys/arch/cesfic/cesfic/locore.s
diff -u src/sys/arch/cesfic/cesfic/locore.s:1.35 src/sys/arch/cesfic/cesfic/locore.s:1.36
--- src/sys/arch/cesfic/cesfic/locore.s:1.35 Mon Dec 25 21:32:56 2023
+++ src/sys/arch/cesfic/cesfic/locore.s Tue Dec 26 02:38:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.35 2023/12/25 21:32:56 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.36 2023/12/26 02:38:27 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -839,22 +839,6 @@ Lhpmmu9:
#endif
rts
-ENTRY(ploadw)
-#if defined(M68K_MMU_MOTOROLA)
- movl %sp@(4),%a0 | address to load
-#if defined(M68K_MMU_HP)
- tstl _C_LABEL(mmutype) | HP MMU?
- jeq Lploadwskp | yes, skip
-#endif
-#if defined(M68040)
- cmpl #MMU_68040,_C_LABEL(mmutype) | 68040?
- jeq Lploadwskp | yes, skip
-#endif
- ploadw #1,%a0@ | pre-load translation
-Lploadwskp:
-#endif
- rts
-
/*
* Set processor priority level calls. Most are implemented with
* inline asm expansions. However, spl0 requires special handling
Index: src/sys/arch/hp300/hp300/locore.s
diff -u src/sys/arch/hp300/hp300/locore.s:1.175 src/sys/arch/hp300/hp300/locore.s:1.176
--- src/sys/arch/hp300/hp300/locore.s:1.175 Mon Dec 25 21:32:57 2023
+++ src/sys/arch/hp300/hp300/locore.s Tue Dec 26 02:38:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.175 2023/12/25 21:32:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.176 2023/12/26 02:38:27 thorpej Exp $ */
/*
* Copyright (c) 1980, 1990, 1993
@@ -1121,22 +1121,6 @@ Lhpmmu9:
#endif
rts
-ENTRY(ploadw)
-#if defined(M68K_MMU_MOTOROLA)
- movl %sp@(4),%a0 | address to load
-#if defined(M68K_MMU_HP)
- tstl _C_LABEL(mmutype) | HP MMU?
- jeq Lploadwskp | yes, skip
-#endif
-#if defined(M68040)
- cmpl #MMU_68040,_C_LABEL(mmutype) | 68040?
- jeq Lploadwskp | yes, skip
-#endif
- ploadw #1,%a0@ | pre-load translation
-Lploadwskp:
-#endif
- rts
-
/*
* _delay(u_int N)
*
Index: src/sys/arch/luna68k/luna68k/locore.s
diff -u src/sys/arch/luna68k/luna68k/locore.s:1.69 src/sys/arch/luna68k/luna68k/locore.s:1.70
--- src/sys/arch/luna68k/luna68k/locore.s:1.69 Mon Dec 25 21:32:57 2023
+++ src/sys/arch/luna68k/luna68k/locore.s Tue Dec 26 02:38:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.69 2023/12/25 21:32:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.70 2023/12/26 02:38:27 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -800,18 +800,6 @@ LmotommuC:
movc %d0,%cacr | invalidate cache(s)
rts
-ENTRY(ploadw)
-#if defined(M68040)
- cmpl #MMU_68040,_C_LABEL(mmutype) | 68040?
- jeq Lploadwskp | yes, skip
-#endif
- movl %sp@(4),%a0 | address to load
- ploadw #1,%a0@ | pre-load translation
-#if defined(M68040)
-Lploadwskp:
-#endif
- rts
-
ENTRY(getsr)
moveq #0,%d0
movw %sr,%d0
Index: src/sys/arch/mvme68k/mvme68k/locore.s
diff -u src/sys/arch/mvme68k/mvme68k/locore.s:1.119 src/sys/arch/mvme68k/mvme68k/locore.s:1.120
--- src/sys/arch/mvme68k/mvme68k/locore.s:1.119 Mon Dec 25 21:32:57 2023
+++ src/sys/arch/mvme68k/mvme68k/locore.s Tue Dec 26 02:38:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.119 2023/12/25 21:32:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.120 2023/12/26 02:38:27 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -1121,18 +1121,6 @@ LmotommuC:
movc %d0,%cacr | invalidate cache(s)
rts
-ENTRY(ploadw)
-#ifdef M68030
-#if defined(M68040) || defined(M68060)
- cmpl #MMU_68040,_C_LABEL(mmutype) | 68040?
- jeq Lploadwskp | yes, skip
-#endif
- movl %sp@(4),%a0 | address to load
- ploadw #1,%a0@ | pre-load translation
-Lploadwskp:
-#endif
- rts
-
ENTRY(getsr)
moveq #0,%d0
movw %sr,%d0
Index: src/sys/arch/news68k/news68k/locore.s
diff -u src/sys/arch/news68k/news68k/locore.s:1.72 src/sys/arch/news68k/news68k/locore.s:1.73
--- src/sys/arch/news68k/news68k/locore.s:1.72 Mon Dec 25 21:32:57 2023
+++ src/sys/arch/news68k/news68k/locore.s Tue Dec 26 02:38:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.72 2023/12/25 21:32:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.73 2023/12/26 02:38:27 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -905,11 +905,6 @@ ENTRY(loadustp)
movc %d0,%cacr | invalidate cache(s)
rts
-ENTRY(ploadw)
- movl %sp@(4),%a0 | address to load
- ploadw #1,%a0@ | pre-load translation
- rts
-
ENTRY(getsr)
moveq #0,%d0
movw %sr,%d0
Index: src/sys/arch/next68k/next68k/locore.s
diff -u src/sys/arch/next68k/next68k/locore.s:1.74 src/sys/arch/next68k/next68k/locore.s:1.75
--- src/sys/arch/next68k/next68k/locore.s:1.74 Mon Dec 25 21:32:57 2023
+++ src/sys/arch/next68k/next68k/locore.s Tue Dec 26 02:38:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.74 2023/12/25 21:32:57 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.75 2023/12/26 02:38:27 thorpej Exp $ */
/*
* Copyright (c) 1998 Darrin B. Jewell
@@ -922,22 +922,6 @@ Lhpmmu9:
#endif
rts
-ENTRY(ploadw)
-#if defined(M68K_MMU_MOTOROLA)
- movl %sp@(4),%a0 | address to load
-#if defined(M68K_MMU_HP)
- tstl _C_LABEL(mmutype) | HP MMU?
- jeq Lploadwskp | yes, skip
-#endif
-#if defined(M68040)
- cmpl #MMU_68040,_C_LABEL(mmutype) | 68040?
- jeq Lploadwskp | yes, skip
-#endif
- ploadw #1,%a0@ | pre-load translation
-Lploadwskp:
-#endif
- rts
-
/*
* Set processor priority level calls. Most are implemented with
* inline asm expansions. However, spl0 requires special handling
Index: src/sys/arch/x68k/x68k/locore.s
diff -u src/sys/arch/x68k/x68k/locore.s:1.123 src/sys/arch/x68k/x68k/locore.s:1.124
--- src/sys/arch/x68k/x68k/locore.s:1.123 Mon Dec 25 21:32:58 2023
+++ src/sys/arch/x68k/x68k/locore.s Tue Dec 26 02:38:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.123 2023/12/25 21:32:58 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.124 2023/12/26 02:38:27 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -857,18 +857,6 @@ LmotommuC:
movc %d0,%cacr | invalidate cache(s)
rts
-ENTRY(ploadw)
-#if defined(M68030)
- movl %sp@(4),%a0 | address to load
-#if defined(M68040) || defined(M68060)
- cmpl #MMU_68040,_C_LABEL(mmutype) | 68040?
- jeq Lploadwskp | yes, skip
-#endif
- ploadw #1,%a0@ | pre-load translation
-Lploadwskp:
-#endif
- rts
-
/*
* _delay(u_int N)
*
