Module Name: src
Committed By: thorpej
Date: Thu Sep 3 15:38:17 UTC 2020
Modified Files:
src/sys/arch/alpha/alpha: locore.s multiproc.s
Log Message:
Garbage-collect the SWITCH_CONTEXT macro, since it now expands to
just "call_pal PAL_OSF1_swpctx".
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/alpha/alpha/locore.s
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/alpha/alpha/multiproc.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/alpha/alpha/locore.s
diff -u src/sys/arch/alpha/alpha/locore.s:1.127 src/sys/arch/alpha/alpha/locore.s:1.128
--- src/sys/arch/alpha/alpha/locore.s:1.127 Thu Sep 3 04:18:30 2020
+++ src/sys/arch/alpha/alpha/locore.s Thu Sep 3 15:38:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.127 2020/09/03 04:18:30 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.128 2020/09/03 15:38:17 thorpej Exp $ */
/*-
* Copyright (c) 1999, 2000, 2019 The NetBSD Foundation, Inc.
@@ -67,21 +67,12 @@
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.127 2020/09/03 04:18:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.s,v 1.128 2020/09/03 15:38:17 thorpej Exp $");
#include "assym.h"
.stabs __FILE__,132,0,0,kernel_text
-/*
- * Perform actions necessary to switch to a new context. The
- * hwpcb should be in a0. Clobbers v0, t0, t8..t11, a0.
- */
-#define SWITCH_CONTEXT \
- /* Swap in the new context. */ \
- call_pal PAL_OSF1_swpctx
-
-
/* don't reorder instructions; paranoia. */
.set noreorder
.text
@@ -152,7 +143,7 @@ NESTED_NOPROFILE(locorestart,1,0,ra,0,0)
*/
lda a0, lwp0
ldq a0, L_MD_PCBPADDR(a0) /* phys addr of PCB */
- SWITCH_CONTEXT
+ call_pal PAL_OSF1_swpctx /* clobbers a0, t0, t8-t11, a0 */
/* PROM is no longer mapped. */
lda t0, prom_mapped
@@ -680,9 +671,10 @@ LEAF(cpu_switchto, 0)
mov a0, s4 /* save old curlwp */
mov a1, s2 /* save new lwp */
- ldq a0, L_MD_PCBPADDR(s2) /* save new pcbpaddr */
- SWITCH_CONTEXT /* swap the context */
+ /* Switch to the new PCB. */
+ ldq a0, L_MD_PCBPADDR(s2)
+ call_pal PAL_OSF1_swpctx /* clobbers a0, t0, t8-t11, a0 */
GET_CPUINFO
stq s2, CPU_INFO_CURLWP(v0) /* curlwp = l */
Index: src/sys/arch/alpha/alpha/multiproc.s
diff -u src/sys/arch/alpha/alpha/multiproc.s:1.13 src/sys/arch/alpha/alpha/multiproc.s:1.14
--- src/sys/arch/alpha/alpha/multiproc.s:1.13 Mon Apr 28 20:23:10 2008
+++ src/sys/arch/alpha/alpha/multiproc.s Thu Sep 3 15:38:17 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: multiproc.s,v 1.13 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: multiproc.s,v 1.14 2020/09/03 15:38:17 thorpej Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-__KERNEL_RCSID(5, "$NetBSD: multiproc.s,v 1.13 2008/04/28 20:23:10 martin Exp $")
+__KERNEL_RCSID(5, "$NetBSD: multiproc.s,v 1.14 2020/09/03 15:38:17 thorpej Exp $")
/*
* Multiprocessor glue code.
@@ -67,7 +67,7 @@ NESTED_NOPROFILE(cpu_spinup_trampoline,0
ldq a0, CPU_INFO_IDLE_LWP(s0)
stq a0, CPU_INFO_CURLWP(s0) /* set curlwp */
ldq a0, L_MD_PCBPADDR(a0)
- SWITCH_CONTEXT
+ call_pal PAL_OSF1_swpctx
/* Invalidate TLB and I-stream. */
ldiq a0, -2 /* TBIA */
