Module Name: src
Committed By: skrll
Date: Sat Aug 27 07:22:15 UTC 2016
Modified Files:
src/sys/arch/mips/mips: mipsX_subr.S
Log Message:
Comment consistency. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/mips/mips/mipsX_subr.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/mips/mips/mipsX_subr.S
diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.92 src/sys/arch/mips/mips/mipsX_subr.S:1.93
--- src/sys/arch/mips/mips/mipsX_subr.S:1.92 Wed Aug 17 20:59:08 2016
+++ src/sys/arch/mips/mips/mipsX_subr.S Sat Aug 27 07:22:14 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mipsX_subr.S,v 1.92 2016/08/17 20:59:08 skrll Exp $ */
+/* $NetBSD: mipsX_subr.S,v 1.93 2016/08/27 07:22:14 skrll Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -1540,10 +1540,16 @@ NESTED_NOPROFILE(MIPSX(user_intr), CALLF
*/
mfc0 v1, MIPS_COP_0_STATUS
#ifdef NOFPU
+ /*
+ * enter kernel mode
+ */
MFC0_HAZARD
- and v0, v1, MIPS_SR_KSU_MASK|MIPS_SR_EXL
- xor v0, v1 # clear the bits
+ and v0, v1, MIPS_SR_EXL|MIPS_SR_KSU_MASK # bits to clear
+ xor v0, v1 # clear them.
#else
+ /*
+ * Turn off FPU and enter kernel mode
+ */
lui v0, %hi(~(MIPS_SR_COP_1_BIT|MIPS_SR_EXL|MIPS_SR_KSU_MASK))
addiu v0, %lo(~(MIPS_SR_COP_1_BIT|MIPS_SR_EXL|MIPS_SR_KSU_MASK))
and v0, v1
@@ -1729,18 +1735,21 @@ NESTED_NOPROFILE(MIPSX(systemcall), CALL
#endif
PTR_L s0, L_PROC(MIPS_CURLWP) # curlwp->l_proc
PTR_L t9, P_MD_SYSCALL(s0) # t9 = syscall
+#ifdef NOFPU
/*
- * Turn off FPU and enter kernel mode
+ * enter kernel mode
*/
-#ifdef NOFPU
- and t0, a1, MIPS_SR_EXL|MIPS_SR_KSU_MASK
- xor t0, a1 # turns off the FPU & ints on
+ and t0, a1, MIPS_SR_EXL|MIPS_SR_KSU_MASK # bits to clear
+ xor t0, a1 # clear them.
#else
+ /*
+ * Turn off FPU and enter kernel mode
+ */
lui t0, %hi(~(MIPS_SR_COP_1_BIT|MIPS_SR_EXL|MIPS_SR_KSU_MASK))
addiu t0, %lo(~(MIPS_SR_COP_1_BIT|MIPS_SR_EXL|MIPS_SR_KSU_MASK))
and t0, a1
#endif
- mtc0 t0, MIPS_COP_0_STATUS # re-enable interrupts
+ mtc0 t0, MIPS_COP_0_STATUS
COP0_SYNC
/*
* Call the system call handler.
