[src/netbsd-6]: src/sys/arch/mips/mips Pull up following revision(s) (request...

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

details:   https://anonhg.NetBSD.org/src/rev/ff643c5f2df2
branches:  netbsd-6
changeset: 775431:ff643c5f2df2
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sun Nov 18 18:14:39 2012 +0000

description:
Pull up following revision(s) (requested by skrll in ticket #661):
        sys/arch/mips/mips/mips_emul.c: revision 1.26
We need to jump out of two switches to emulate rdhwr rt,$29 correctly.
Only one would result in segv.
Fixes pthread apps on mips1. Tested using gxemul.

diffstat:

 sys/arch/mips/mips/mips_emul.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r aed186dc4e33 -r ff643c5f2df2 sys/arch/mips/mips/mips_emul.c
--- a/sys/arch/mips/mips/mips_emul.c    Sun Nov 18 18:06:00 2012 +0000
+++ b/sys/arch/mips/mips/mips_emul.c    Sun Nov 18 18:14:39 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mips_emul.c,v 1.25 2011/08/18 21:04:23 matt Exp $ */
+/*     $NetBSD: mips_emul.c,v 1.25.8.1 2012/11/18 18:14:39 msaitoh Exp $ */
 
 /*
  * Copyright (c) 1999 Shuichiro URATA.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mips_emul.c,v 1.25 2011/08/18 21:04:23 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_emul.c,v 1.25.8.1 2012/11/18 18:14:39 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -457,7 +457,7 @@
                case 29:
                        tf->tf_regs[instfmt.RType.rt] =
                            (mips_reg_t)(intptr_t)curlwp->l_private;
-                       break;
+                       goto done;
                }
                /* FALLTHROUGH */
        illopc:
@@ -472,7 +472,7 @@
                (*curproc->p_emul->e_trapsignal)(curlwp, &ksi);
                return;
        }
-
+done:
        update_pc(tf, cause);
 }