Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mips/mips Fix code inversion in an #ifdef NOFPU case



details:   https://anonhg.NetBSD.org/src/rev/419a3dc48921
branches:  trunk
changeset: 346274:419a3dc48921
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon Jul 04 14:29:55 2016 +0000

description:
Fix code inversion in an #ifdef NOFPU case

diffstat:

 sys/arch/mips/mips/mipsX_subr.S |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (25 lines):

diff -r bc88512eb166 -r 419a3dc48921 sys/arch/mips/mips/mipsX_subr.S
--- a/sys/arch/mips/mips/mipsX_subr.S   Mon Jul 04 08:10:50 2016 +0000
+++ b/sys/arch/mips/mips/mipsX_subr.S   Mon Jul 04 14:29:55 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mipsX_subr.S,v 1.63 2016/07/02 19:40:57 maya Exp $     */
+/*     $NetBSD: mipsX_subr.S,v 1.64 2016/07/04 14:29:55 skrll Exp $    */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -1651,12 +1651,12 @@
         * Turn off FPU and enter kernel mode
         */
 #ifdef NOFPU
+       and     t0, a1, MIPS_SR_KSU_MASK|MIPS_SR_EXL
+       xor     t0, a1                          # clear the bits
+#else
        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
-#else
-       and     t0, a1, MIPS_SR_EXL|MIPS_SR_KSU_MASK
-       xor     t0, a1                          # turns off the FPU & ints on
 #endif
        mtc0    t0, MIPS_COP_0_STATUS           # re-enable interrupts
        COP0_SYNC



Home | Main Index | Thread Index | Old Index