[src/trunk]: src/sys/arch/mips/mips We need to jump out of two switches to em...

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

details:   https://anonhg.NetBSD.org/src/rev/c68e74199b4d
branches:  trunk
changeset: 782396:c68e74199b4d
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Nov 01 22:15:25 2012 +0000

description:
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 949dec442393 -r c68e74199b4d sys/arch/mips/mips/mips_emul.c
--- a/sys/arch/mips/mips/mips_emul.c    Thu Nov 01 21:33:12 2012 +0000
+++ b/sys/arch/mips/mips/mips_emul.c    Thu Nov 01 22:15:25 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.26 2012/11/01 22:15:25 skrll 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.26 2012/11/01 22:15:25 skrll 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);
 }