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 Set R_CAUSE into trapframe in curlwp befo...



details:   https://anonhg.NetBSD.org/src/rev/967ef55a4fd0
branches:  trunk
changeset: 763299:967ef55a4fd0
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Wed Mar 16 15:14:08 2011 +0000

description:
Set R_CAUSE into trapframe in curlwp before calling mips_fpu_trap()
for workaround PR port-mips/44639.

mipsX_user_gen_exception() in mipsX_subr.S (which may call
mips_fpu_trap()) doesn't set R_CAUSE in curlwp trapframe, while
mips1_use_intr() in locore_mips1.S (that may call mips_fpu_intr()) does.

All tests in tests/lib/libc/ieeefp on MIPS3 should pass now.

diffstat:

 sys/arch/mips/mips/trap.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 641dc0f87317 -r 967ef55a4fd0 sys/arch/mips/mips/trap.c
--- a/sys/arch/mips/mips/trap.c Wed Mar 16 14:54:31 2011 +0000
+++ b/sys/arch/mips/mips/trap.c Wed Mar 16 15:14:08 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.228 2011/03/15 07:39:23 matt Exp $  */
+/*     $NetBSD: trap.c,v 1.229 2011/03/16 15:14:08 tsutsui Exp $       */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.228 2011/03/15 07:39:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.229 2011/03/16 15:14:08 tsutsui Exp $");
 
 #include "opt_cputype.h"       /* which mips CPU levels do we support? */
 #include "opt_ddb.h"
@@ -619,6 +619,7 @@
 #if defined(FPEMUL)
                mips_emul_inst(status, cause, pc, utf);
 #elif !defined(NOFPU)
+               utf->tf_regs[_R_CAUSE] = cause;
                mips_fpu_trap(pc, utf);
 #endif
                userret(l);



Home | Main Index | Thread Index | Old Index