Module Name: src
Committed By: martin
Date: Sat May 30 16:52:32 UTC 2009
Modified Files:
src/sys/arch/sparc64/include: cpu.h
src/sys/arch/sparc64/sparc64: locore.s vm_machdep.c
Log Message:
cpu_setfunc() can not use lwp_trampoline, as that has additional lwp startup
semantics. Use a simpler setfunc_trampoline instead.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/sparc64/include/cpu.h
cvs rdiff -u -r1.290 -r1.291 src/sys/arch/sparc64/sparc64/locore.s
cvs rdiff -u -r1.88 -r1.89 src/sys/arch/sparc64/sparc64/vm_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc64/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.85 src/sys/arch/sparc64/include/cpu.h:1.86
--- src/sys/arch/sparc64/include/cpu.h:1.85 Sat May 16 19:15:34 2009
+++ src/sys/arch/sparc64/include/cpu.h Sat May 30 16:52:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.85 2009/05/16 19:15:34 nakayama Exp $ */
+/* $NetBSD: cpu.h,v 1.86 2009/05/30 16:52:32 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -338,7 +338,6 @@
#define write_all_windows() __asm volatile("flushw" : : )
#define write_user_windows() __asm volatile("flushw" : : )
-void lwp_trampoline(void);
struct pcb;
void snapshot(struct pcb *);
struct frame *getfp(void);
Index: src/sys/arch/sparc64/sparc64/locore.s
diff -u src/sys/arch/sparc64/sparc64/locore.s:1.290 src/sys/arch/sparc64/sparc64/locore.s:1.291
--- src/sys/arch/sparc64/sparc64/locore.s:1.290 Mon May 18 11:42:30 2009
+++ src/sys/arch/sparc64/sparc64/locore.s Sat May 30 16:52:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.290 2009/05/18 11:42:30 nakayama Exp $ */
+/* $NetBSD: locore.s,v 1.291 2009/05/30 16:52:32 martin Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath
@@ -6851,6 +6851,16 @@
ba,a,pt %icc, return_from_trap
nop
+ /*
+ * Like lwp_trampoline, but for cpu_setfunc(), i.e. without newlwp
+ * arguement and will not call lwp_startup.
+ */
+ENTRY(setfunc_trampoline)
+ call %l0 ! re-use current frame
+ mov %l1, %o0
+ ba,a,pt %icc, return_from_trap
+ nop
+
/*
* {fu,su}{,i}{byte,word}
*/
Index: src/sys/arch/sparc64/sparc64/vm_machdep.c
diff -u src/sys/arch/sparc64/sparc64/vm_machdep.c:1.88 src/sys/arch/sparc64/sparc64/vm_machdep.c:1.89
--- src/sys/arch/sparc64/sparc64/vm_machdep.c:1.88 Thu May 21 13:24:38 2009
+++ src/sys/arch/sparc64/sparc64/vm_machdep.c Sat May 30 16:52:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.88 2009/05/21 13:24:38 martin Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.89 2009/05/30 16:52:32 martin Exp $ */
/*
* Copyright (c) 1996-2002 Eduardo Horvath. All rights reserved.
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.88 2009/05/21 13:24:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.89 2009/05/30 16:52:32 martin Exp $");
#include "opt_multiprocessor.h"
@@ -157,6 +157,7 @@
char cpu_forkname[] = "cpu_lwp_fork()";
#endif
+void setfunc_trampoline(void);
inline void
cpu_setfunc(struct lwp *l, void (*func)(void *), void *arg)
{
@@ -166,9 +167,8 @@
rp = (struct rwindow *)((u_long)npcb + TOPFRAMEOFF);
rp->rw_local[0] = (long)func; /* Function to call */
rp->rw_local[1] = (long)arg; /* and its argument */
- rp->rw_local[2] = (long)l; /* new lwp */
- npcb->pcb_pc = (long)lwp_trampoline - 8;
+ npcb->pcb_pc = (long)setfunc_trampoline - 8;
npcb->pcb_sp = (long)rp - STACK_OFFSET;
}
@@ -190,6 +190,7 @@
* in both the stack and stacksize args), set up the user stack pointer
* accordingly.
*/
+void lwp_trampoline(void);
void
cpu_lwp_fork(register struct lwp *l1, register struct lwp *l2, void *stack, size_t stacksize, void (*func)(void *), void *arg)
{
@@ -274,7 +275,12 @@
rp = (struct rwindow *)((u_long)npcb + TOPFRAMEOFF);
*rp = *(struct rwindow *)((u_long)opcb + TOPFRAMEOFF);
- cpu_setfunc(l2, func, arg);
+ rp->rw_local[0] = (long)func; /* Function to call */
+ rp->rw_local[1] = (long)arg; /* and its argument */
+ rp->rw_local[2] = (long)l2; /* new lwp */
+
+ npcb->pcb_pc = (long)lwp_trampoline - 8;
+ npcb->pcb_sp = (long)rp - STACK_OFFSET;
}
static inline void
