Source-Changes-HG archive

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

[src/trunk]: src Revert previous:



details:   https://anonhg.NetBSD.org/src/rev/76251548a5e4
branches:  trunk
changeset: 1009057:76251548a5e4
user:      rin <rin%NetBSD.org@localhost>
date:      Sat Apr 11 09:15:23 2020 +0000

description:
Revert previous:
http://mail-index.netbsd.org/source-changes/2020/02/20/msg114173.html

Comment turned out to be wrong, and KASSERT fires for oea.

XXX
Need to revisit shortly...

diffstat:

 lib/libpthread/arch/powerpc/pthread_md.h |  7 ++-----
 sys/arch/powerpc/powerpc/sig_machdep.c   |  6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diffs (48 lines):

diff -r ea2847964b21 -r 76251548a5e4 lib/libpthread/arch/powerpc/pthread_md.h
--- a/lib/libpthread/arch/powerpc/pthread_md.h  Sat Apr 11 09:02:04 2020 +0000
+++ b/lib/libpthread/arch/powerpc/pthread_md.h  Sat Apr 11 09:15:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pthread_md.h,v 1.8 2020/02/20 07:07:02 rin Exp $       */
+/*     $NetBSD: pthread_md.h,v 1.9 2020/04/11 09:15:23 rin Exp $       */
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -53,10 +53,7 @@
 /*
  * Set initial, sane values for registers whose values aren't just
  * "don't care".
- *
- * XXX
- * "Sane value" for MSR differs between oea/booke/ibm4xx, but no way to
- * obtain from userland. It should be corrected by cpu_setmcontext().
+ * 0xd032 is PSL_USERSET from arch/powerpc/include/psl.h
  */
 #define _INITCONTEXT_U_MD(ucp)                                         \
        (ucp)->uc_mcontext.__gregs[_REG_MSR] = 0xd032;
diff -r ea2847964b21 -r 76251548a5e4 sys/arch/powerpc/powerpc/sig_machdep.c
--- a/sys/arch/powerpc/powerpc/sig_machdep.c    Sat Apr 11 09:02:04 2020 +0000
+++ b/sys/arch/powerpc/powerpc/sig_machdep.c    Sat Apr 11 09:15:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sig_machdep.c,v 1.47 2020/02/20 07:07:02 rin Exp $     */
+/*     $NetBSD: sig_machdep.c,v 1.48 2020/04/11 09:15:23 rin Exp $     */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.47 2020/02/20 07:07:02 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.48 2020/04/11 09:15:23 rin Exp $");
 
 #include "opt_ppcarch.h"
 #include "opt_altivec.h"
@@ -191,8 +191,6 @@
 int
 cpu_mcontext_validate(struct lwp *l, const mcontext_t *mcp)
 {
-
-       KASSERT(PSL_USEROK_P(mcp->__gregs[_REG_MSR]));
        return 0;
 }
 



Home | Main Index | Thread Index | Old Index