 @@ -1,14 +1,14 @@
-/*	$NetBSD: sh3_machdep.c,v 1.100 2012/07/08 20:14:12 dsl Exp $	*/
+/*	$NetBSD: sh3_machdep.c,v 1.101 2012/09/21 09:05:08 ryo Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -55,27 +55,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)machdep.c	7.4 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.100 2012/07/08 20:14:12 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sh3_machdep.c,v 1.101 2012/09/21 09:05:08 ryo Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_memsize.h"
 #include "opt_kstack_debug.h"
 #include "opt_ptrace.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/exec.h>
 #include <sys/kernel.h>
 @@ -422,27 +422,27 @@ cpu_getmcontext(struct lwp *l, mcontext_
 	gr[_REG_R6]     = tf->tf_r6;
 	gr[_REG_R5]     = tf->tf_r5;
 	gr[_REG_R4]     = tf->tf_r4;
 	gr[_REG_R3]     = tf->tf_r3;
 	gr[_REG_R2]     = tf->tf_r2;
 	gr[_REG_R1]     = tf->tf_r1;
 	gr[_REG_R0]     = tf->tf_r0;
 	gr[_REG_R15]    = tf->tf_r15;
 	if ((ras_pc = (__greg_t)ras_lookup(l->l_proc,
 	    (void *) gr[_REG_PC])) != -1)
 		gr[_REG_PC] = ras_pc;
-	*flags |= _UC_CPU;
+	*flags |= (_UC_CPU|_UC_TLSBASE);
 	/* FPU context is currently not handled by the kernel. */
 	memset(&mcp->__fpregs, 0, sizeof (mcp->__fpregs));
+}
 int
 cpu_mcontext_validate(struct lwp *l, const mcontext_t *mcp)
+{
 	struct trapframe *tf = l->l_md.md_regs;
 	const __greg_t *gr = mcp->__gregs;
 	if (((tf->tf_ssr ^ gr[_REG_SR]) & PSL_USERSTATIC) != 0)
 		return EINVAL;
 @@ -455,50 +455,52 @@ cpu_setmcontext(struct lwp *l, const mco
+{
 	struct trapframe *tf = l->l_md.md_regs;
 	const __greg_t *gr = mcp->__gregs;
 	struct proc *p = l->l_proc;
 	int error;
 	/* Restore register context, if any. */
 	if ((flags & _UC_CPU) != 0) {
 		/* Check for security violations. */
 		error = cpu_mcontext_validate(l, mcp);
 		if (error)
 			return error;
-		tf->tf_gbr    = gr[_REG_GBR];
+		/* done in lwp_setprivate */
 		/* tf->tf_gbr    = gr[_REG_GBR];  */
 		tf->tf_spc    = gr[_REG_PC];
 		tf->tf_ssr    = gr[_REG_SR];
 		tf->tf_macl   = gr[_REG_MACL];
 		tf->tf_mach   = gr[_REG_MACH];
 		tf->tf_pr     = gr[_REG_PR];
 		tf->tf_r14    = gr[_REG_R14];
 		tf->tf_r13    = gr[_REG_R13];
 		tf->tf_r12    = gr[_REG_R12];
 		tf->tf_r11    = gr[_REG_R11];
 		tf->tf_r10    = gr[_REG_R10];
 		tf->tf_r9     = gr[_REG_R9];
 		tf->tf_r8     = gr[_REG_R8];
 		tf->tf_r7     = gr[_REG_R7];
 		tf->tf_r6     = gr[_REG_R6];
 		tf->tf_r5     = gr[_REG_R5];
 		tf->tf_r4     = gr[_REG_R4];
 		tf->tf_r3     = gr[_REG_R3];
 		tf->tf_r2     = gr[_REG_R2];
 		tf->tf_r1     = gr[_REG_R1];
 		tf->tf_r0     = gr[_REG_R0];
 		tf->tf_r15    = gr[_REG_R15];
-		lwp_setprivate(l, (void *)(uintptr_t)gr[_REG_GBR]);
+		if (flags & _UC_TLSBASE)
 			lwp_setprivate(l, (void *)(uintptr_t)gr[_REG_GBR]);
+	}
 #if 0
 	/* XXX: FPU context is currently not handled by the kernel. */
 	if (flags & _UC_FPU) {
 		/* TODO */;
+	}
 #endif
 	mutex_enter(p->p_lock);
 	if (flags & _UC_SETSTACK)
 		l->l_sigstk.ss_flags |= SS_ONSTACK;
 	if (flags & _UC_CLRSTACK)