Module Name: src
Committed By: mrg
Date: Thu May 31 22:44:13 UTC 2018
Modified Files:
src/sys/arch/sparc/sparc: locore.s
Log Message:
convert Lfp_null_fpstate (which is invoked if savefpstate() is called
with NULL) into a panic for DIAGNOSTIC kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.270 -r1.271 src/sys/arch/sparc/sparc/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/sparc/sparc/locore.s
diff -u src/sys/arch/sparc/sparc/locore.s:1.270 src/sys/arch/sparc/sparc/locore.s:1.271
--- src/sys/arch/sparc/sparc/locore.s:1.270 Fri Mar 16 09:29:24 2018
+++ src/sys/arch/sparc/sparc/locore.s Thu May 31 22:44:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.270 2018/03/16 09:29:24 mrg Exp $ */
+/* $NetBSD: locore.s,v 1.271 2018/05/31 22:44:13 mrg Exp $ */
/*
* Copyright (c) 1996 Paul Kranenburg
@@ -5754,24 +5754,20 @@ Lfp_finish:
retl
std %f30, [%o0 + FS_REGS + (4*30)]
-/*
- * We really should panic here but while we figure out what the bug is
- * that a remote CPU gets a NULL struct fpstate *, this lets the system
- * work at least seemingly stably.
- */
+/* Handle NULL fpstate argument for savefpstate */
Lfp_null_fpstate:
-#if 1
+#ifdef DIAGNOSTIC
+ ld [%o5 + CPUINFO_CPUNO], %o1
+ sethi %hi(Lpanic_savefpstate), %o0
+ call _C_LABEL(panic)
+ or %o0, %lo(Lpanic_savefpstate), %o0
+#else
sethi %hi(CPUINFO_VA), %o5
ldd [%o5 + CPUINFO_SAVEFPSTATE_NULL], %o2
inccc %o3
addx %o2, 0, %o2
retl
std %o2, [%o5 + CPUINFO_SAVEFPSTATE_NULL]
-#else
- ld [%o5 + CPUINFO_CPUNO], %o1
- sethi %hi(Lpanic_savefpstate), %o0
- call _C_LABEL(panic)
- or %o0, %lo(Lpanic_savefpstate), %o0
#endif
/*
