Module Name: src
Committed By: matt
Date: Thu May 6 05:31:49 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: trap.c
Log Message:
Don't grab error pc from trapframe when it was passed as an argument.
To generate a diff of this commit:
cvs rdiff -u -r1.217.12.25 -r1.217.12.26 src/sys/arch/mips/mips/trap.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/trap.c
diff -u src/sys/arch/mips/mips/trap.c:1.217.12.25 src/sys/arch/mips/mips/trap.c:1.217.12.26
--- src/sys/arch/mips/mips/trap.c:1.217.12.25 Thu May 6 04:23:14 2010
+++ src/sys/arch/mips/mips/trap.c Thu May 6 05:31:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.217.12.25 2010/05/06 04:23:14 matt Exp $ */
+/* $NetBSD: trap.c,v 1.217.12.26 2010/05/06 05:31:49 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -78,7 +78,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.217.12.25 2010/05/06 04:23:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.217.12.26 2010/05/06 05:31:49 matt Exp $");
#include "opt_cputype.h" /* which mips CPU levels do we support? */
#include "opt_ddb.h"
@@ -580,7 +580,7 @@
case T_TRAP+T_USER:
ksi.ksi_trap = type & ~T_USER;
ksi.ksi_signo = SIGFPE;
- ksi.ksi_addr = (void *)(intptr_t)tf->tf_regs[_R_PC];
+ ksi.ksi_addr = (void *)(intptr_t)opc /*utf->tf_regs[_R_PC]*/;
ksi.ksi_code = FPE_FLTOVF; /* XXX */
break; /* SIGNAL */
}
