[src/trunk]: src/sys/arch/evbppc/include Make compat_16_sys___sigreturn14() w...

[hannken <hannken%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cf895b1212b5
branches:  trunk
changeset: 566551:cf895b1212b5
user:      hannken <hannken%NetBSD.org@localhost>
date:      Wed May 12 14:38:17 2004 +0000

description:
Make compat_16_sys___sigreturn14() work again.
The 4XX family has no PSL_RI bit in MSR.
The 403 (explora) runs with machine check enabled.

diffstat:

 sys/arch/evbppc/include/psl.h |  11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r df365fa3e7d9 -r cf895b1212b5 sys/arch/evbppc/include/psl.h
--- a/sys/arch/evbppc/include/psl.h     Wed May 12 14:25:08 2004 +0000
+++ b/sys/arch/evbppc/include/psl.h     Wed May 12 14:38:17 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: psl.h,v 1.1 2002/12/09 12:16:13 scw Exp $      */
+/*     $NetBSD: psl.h,v 1.2 2004/05/12 14:38:17 hannken Exp $  */
 
 #ifdef _KERNEL_OPT
 #include "opt_ppcarch.h"
@@ -7,9 +7,14 @@
 #include <powerpc/psl.h>
 
 #ifdef PPC_IBM4XX
-/* Apparently we get unexplained machine checks, so disable them. */
+/* 4xx don't have PSL_RI */
 #undef PSL_USERSET
-#define        PSL_USERSET     (PSL_EE | PSL_PR | PSL_IR | PSL_DR | PSL_RI)
+#ifdef PPC_IBM403
+#define        PSL_USERSET     (PSL_EE | PSL_PR | PSL_ME | PSL_IR | PSL_DR)
+#else
+/* Apparently we get unexplained machine checks, so disable them. */
+#define        PSL_USERSET     (PSL_EE | PSL_PR | PSL_IR | PSL_DR)
+#endif
 
 /* 
  * We also need to override the PSL_SE bit.  4xx have completely