Module Name: src
Committed By: ad
Date: Wed Jan 15 18:47:23 UTC 2020
Modified Files:
src/sys/arch/amd64/amd64: locore.S
src/sys/arch/i386/i386: locore.S
Log Message:
Back out the cpu_switchto() workaround now that it's no longer needed.
To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.176 -r1.177 src/sys/arch/i386/i386/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/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.199 src/sys/arch/amd64/amd64/locore.S:1.200
--- src/sys/arch/amd64/amd64/locore.S:1.199 Mon Jan 13 11:40:15 2020
+++ src/sys/arch/amd64/amd64/locore.S Wed Jan 15 18:47:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.199 2020/01/13 11:40:15 ad Exp $ */
+/* $NetBSD: locore.S,v 1.200 2020/01/15 18:47:23 ad Exp $ */
/*
* Copyright-o-rama!
@@ -1079,14 +1079,10 @@ ENTRY(cpu_switchto)
movq %rdi,%r13 /* oldlwp */
movq %rsi,%r12 /* newlwp */
- testq %r13,%r13 /* oldlwp = NULL ? */
- jz .Lskip_save
-
/* Save old context. */
movq L_PCB(%r13),%rax
movq %rsp,PCB_RSP(%rax)
movq %rbp,PCB_RBP(%rax)
-.Lskip_save:
/* Switch to newlwp's stack. */
movq L_PCB(%r12),%r14
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.176 src/sys/arch/i386/i386/locore.S:1.177
--- src/sys/arch/i386/i386/locore.S:1.176 Mon Jan 13 12:03:41 2020
+++ src/sys/arch/i386/i386/locore.S Wed Jan 15 18:47:23 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.176 2020/01/13 12:03:41 ad Exp $ */
+/* $NetBSD: locore.S,v 1.177 2020/01/15 18:47:23 ad Exp $ */
/*
* Copyright-o-rama!
@@ -128,7 +128,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.176 2020/01/13 12:03:41 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.177 2020/01/15 18:47:23 ad Exp $");
#include "opt_copy_symtab.h"
#include "opt_ddb.h"
@@ -1316,14 +1316,10 @@ ENTRY(cpu_switchto)
movl 20(%esp),%edi /* newlwp */
movl 24(%esp),%edx /* returning */
- testl %esi,%esi /* oldlwp = NULL ? */
- jz skip_save
-
/* Save old context. */
movl L_PCB(%esi),%eax
movl %esp,PCB_ESP(%eax)
movl %ebp,PCB_EBP(%eax)
-skip_save:
/* Switch to newlwp's stack. */
movl L_PCB(%edi),%ebx
