[src/trunk]: src/sys/arch/sh3 Revert previous. Looks like it requires a more...

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

details:   https://anonhg.NetBSD.org/src/rev/255ffc7c2f94
branches:  trunk
changeset: 967115:255ffc7c2f94
user:      ad <ad%NetBSD.org@localhost>
date:      Sat Nov 30 15:53:36 2019 +0000

description:
Revert previous.  Looks like it requires a more extensive fix.

diffstat:

 sys/arch/sh3/include/userret.h |  13 ++-----------
 sys/arch/sh3/sh3/exception.c   |  16 +++++++++++++---
 2 files changed, 15 insertions(+), 14 deletions(-)

diffs (62 lines):

diff -r 25aba06b6287 -r 255ffc7c2f94 sys/arch/sh3/include/userret.h
--- a/sys/arch/sh3/include/userret.h    Sat Nov 30 15:34:07 2019 +0000
+++ b/sys/arch/sh3/include/userret.h    Sat Nov 30 15:53:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: userret.h,v 1.15 2019/11/29 18:27:32 ad Exp $  */
+/*     $NetBSD: userret.h,v 1.16 2019/11/30 15:53:36 ad Exp $  */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -52,16 +52,7 @@
 {
 
        /* Invoke MI userret code */
-       do {
-               //curcpu()->ci_data.cpu_nast++;
-               l->l_md.md_astpending = 0;
-               mi_userret(l);
-       } while (l->l_md.md_astpending);
-
-       if (l->l_pflag & LP_OWEUPC) {
-               l->l_pflag &= ~LP_OWEUPC;
-               ADDUPROF(l);
-       }
+       mi_userret(l);
 
 #ifdef PTRACE_HOOKS
        /* Check if lwp is being PT_STEP'ed */
diff -r 25aba06b6287 -r 255ffc7c2f94 sys/arch/sh3/sh3/exception.c
--- a/sys/arch/sh3/sh3/exception.c      Sat Nov 30 15:34:07 2019 +0000
+++ b/sys/arch/sh3/sh3/exception.c      Sat Nov 30 15:53:36 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exception.c,v 1.69 2019/11/29 18:27:33 ad Exp $        */
+/*     $NetBSD: exception.c,v 1.70 2019/11/30 15:53:36 ad Exp $        */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exception.c,v 1.69 2019/11/29 18:27:33 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exception.c,v 1.70 2019/11/30 15:53:36 ad Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -471,5 +471,15 @@
        KDASSERT(l != NULL);
        KDASSERT(l->l_md.md_regs == tf);
 
-       userret(l);
+       while (l->l_md.md_astpending) {
+               //curcpu()->ci_data.cpu_nast++;
+               l->l_md.md_astpending = 0;
+
+               if (l->l_pflag & LP_OWEUPC) {
+                       l->l_pflag &= ~LP_OWEUPC;
+                       ADDUPROF(l);
+               }
+
+               userret(l);
+       }
 }