Module Name: src
Committed By: matt
Date: Wed Sep 16 04:23:19 UTC 2009
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mips_machdep.c
Log Message:
Set early clobber on status. Make sure to preserve KX.
To generate a diff of this commit:
cvs rdiff -u -r1.205.4.1.2.1.2.13 -r1.205.4.1.2.1.2.14 \
src/sys/arch/mips/mips/mips_machdep.c
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/mips_machdep.c
diff -u src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.13 src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.14
--- src/sys/arch/mips/mips/mips_machdep.c:1.205.4.1.2.1.2.13 Tue Sep 15 06:51:02 2009
+++ src/sys/arch/mips/mips/mips_machdep.c Wed Sep 16 04:23:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.13 2009/09/15 06:51:02 cliff Exp $ */
+/* $NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.14 2009/09/16 04:23:19 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -112,7 +112,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.13 2009/09/15 06:51:02 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.205.4.1.2.1.2.14 2009/09/16 04:23:19 matt Exp $");
#include "opt_cputype.h"
#include "opt_compat_netbsd32.h"
@@ -1631,8 +1631,8 @@
"cfc1 %1, $31" "\n\t"
".set reorder" "\n\t"
".set at"
- : "=r" (status), "=r"(fpcsr)
- : "r"(f->f_regs[_R_SR] & (MIPS_SR_COP_1_BIT|MIPS3_SR_FR)));
+ : "=&r" (status), "=r"(fpcsr)
+ : "r"(f->f_regs[_R_SR] & (MIPS_SR_COP_1_BIT|MIPS3_SR_FR|MIPS_SR_KX)));
/*
* Make sure we don't reenable FP when we return to userspace.
@@ -1766,8 +1766,8 @@
___STRING(COP0_HAZARD_FPUENABLE)
".set reorder" "\n\t"
".set at"
- : "=r"(status)
- : "r"(f->f_regs[_R_SR] & (MIPS_SR_COP_1_BIT|MIPS3_SR_FR)));
+ : "=&r"(status)
+ : "r"(f->f_regs[_R_SR] & (MIPS_SR_COP_1_BIT|MIPS3_SR_FR|MIPS_SR_KX)));
/*
* load FP registers and establish processes' FP context.
