Module Name: src
Committed By: reinoud
Date: Mon Aug 29 12:46:59 UTC 2011
Modified Files:
src/sys/arch/usermode/dev: cpu.c
src/sys/arch/usermode/usermode: machdep.c
Log Message:
Dirty commit of machdep.c and cpu.c
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/usermode/dev/cpu.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/usermode/usermode/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/usermode/dev/cpu.c
diff -u src/sys/arch/usermode/dev/cpu.c:1.22 src/sys/arch/usermode/dev/cpu.c:1.23
--- src/sys/arch/usermode/dev/cpu.c:1.22 Sun Aug 28 21:31:41 2011
+++ src/sys/arch/usermode/dev/cpu.c Mon Aug 29 12:46:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.22 2011/08/28 21:31:41 jmcneill Exp $ */
+/* $NetBSD: cpu.c,v 1.23 2011/08/29 12:46:58 reinoud Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_cpu.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.22 2011/08/28 21:31:41 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.23 2011/08/29 12:46:58 reinoud Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -277,14 +277,11 @@
func(arg);
-printf("%s: setting ucontext on lwp %p\n", __func__, curlwp);
-pcb = lwp_getpcb(curlwp);
-printf("pcb %p\n", pcb);
-printf("\tpcb->pcb_ucp.uc_stack.ss_sp = %p\n", pcb->pcb_ucp.uc_stack.ss_sp);
-printf("\tpcb->pcb_ucp.uc_stack.ss_size = %d\n", (int) pcb->pcb_ucp.uc_stack.ss_size);
+ pcb = lwp_getpcb(curlwp);
/* switch to userland */
- thunk_setcontext(&pcb->pcb_ucp);
+printf("switching to userland\n");
+ thunk_setcontext(&pcb->pcb_userland_ucp);
panic("%s: shouldn't return", __func__);
}
@@ -294,7 +291,8 @@
void (*func)(void *), void *arg)
{
extern int errno;
- struct pcb *pcb = lwp_getpcb(l2);
+ struct pcb *pcb1 = lwp_getpcb(l1);
+ struct pcb *pcb2 = lwp_getpcb(l2);
#ifdef CPU_DEBUG
printf("cpu_lwp_fork [%s/%p] -> [%s/%p] stack=%p stacksize=%d\n",
@@ -303,21 +301,25 @@
stack, (int)stacksize);
#endif
+ /* copy the PCB and its switchframes from parent */
+ memcpy(pcb2, pcb1, sizeof(struct pcb));
+
/* XXXJDM */
if (stack == NULL) {
stack = malloc(PAGE_SIZE, M_TEMP, M_NOWAIT);
stacksize = PAGE_SIZE;
- pcb->pcb_needfree = true;
+ pcb2->pcb_needfree = true;
} else
- pcb->pcb_needfree = false;
+ pcb2->pcb_needfree = false;
- if (thunk_getcontext(&pcb->pcb_ucp))
+ if (thunk_getcontext(&pcb2->pcb_ucp))
panic("getcontext failed: %d", errno);
- pcb->pcb_ucp.uc_stack.ss_sp = stack;
- pcb->pcb_ucp.uc_stack.ss_size = stacksize;
- pcb->pcb_ucp.uc_link = NULL;
- pcb->pcb_ucp.uc_flags = _UC_STACK | _UC_CPU;
- thunk_makecontext(&pcb->pcb_ucp, (void (*)(void))cpu_lwp_trampoline,
+
+ pcb2->pcb_ucp.uc_stack.ss_sp = stack;
+ pcb2->pcb_ucp.uc_stack.ss_size = stacksize;
+ pcb2->pcb_ucp.uc_link = NULL;
+ pcb2->pcb_ucp.uc_flags = _UC_STACK | _UC_CPU;
+ thunk_makecontext(&pcb2->pcb_ucp, (void (*)(void))cpu_lwp_trampoline,
2, func, arg);
}
@@ -326,6 +328,7 @@
{
}
+int syscall(lwp_t *l, struct trapframe *tr);
void
cpu_startup(void)
{
@@ -341,6 +344,11 @@
if (thunk_getcontext(&lwp0pcb.pcb_ucp))
panic("getcontext failed");
uvm_lwp_setuarea(&lwp0, (vaddr_t)&lwp0pcb);
+
+ /* init trapframe (going nowhere!), maybe a panic func? */
+ lwp0pcb.pcb_tf.tf_syscall = syscall;
+ memcpy(&lwp0pcb.pcb_userland_ucp, &lwp0pcb.pcb_ucp, sizeof(ucontext_t));
+// thunk_makecontext_trapframe2go(&lwp0pcb.pcb_userland_ucp, NULL, NULL);
}
void
Index: src/sys/arch/usermode/usermode/machdep.c
diff -u src/sys/arch/usermode/usermode/machdep.c:1.17 src/sys/arch/usermode/usermode/machdep.c:1.18
--- src/sys/arch/usermode/usermode/machdep.c:1.17 Sun Aug 28 19:39:42 2011
+++ src/sys/arch/usermode/usermode/machdep.c Mon Aug 29 12:46:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.17 2011/08/28 19:39:42 reinoud Exp $ */
+/* $NetBSD: machdep.c,v 1.18 2011/08/29 12:46:58 reinoud Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.17 2011/08/28 19:39:42 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.18 2011/08/29 12:46:58 reinoud Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -137,19 +137,24 @@
setregs(struct lwp *l, struct exec_package *pack, vaddr_t stack)
{
struct pcb *pcb = lwp_getpcb(l);
+ ucontext_t *ucp = &pcb->pcb_userland_ucp;
printf("setregs called: lwp %p, exec package %p, stack %p\n", l, pack, (void *) stack);
-printf("cur pcb %p\n", pcb);
+printf("current stat of pcb %p\n", pcb);
printf("\tpcb->pcb_ucp.uc_stack.ss_sp = %p\n", pcb->pcb_ucp.uc_stack.ss_sp);
printf("\tpcb->pcb_ucp.uc_stack.ss_size = %d\n", (int) pcb->pcb_ucp.uc_stack.ss_size);
+printf("\tpcb->pcb_userland_ucp.uc_stack.ss_sp = %p\n", pcb->pcb_userland_ucp.uc_stack.ss_sp);
+printf("\tpcb->pcb_userland_ucp.uc_stack.ss_size = %d\n", (int) pcb->pcb_userland_ucp.uc_stack.ss_size);
- pcb->pcb_ucp.uc_stack.ss_sp = (void *) stack;
- pcb->pcb_ucp.uc_stack.ss_size = pack->ep_ssize;
- thunk_makecontext_trapframe2go(&pcb->pcb_ucp, (void *) pack->ep_entry, &pcb->pcb_tf);
+ ucp->uc_stack.ss_sp = (void *) stack;
+ ucp->uc_stack.ss_size = pack->ep_ssize;
+ thunk_makecontext_trapframe2go(ucp, (void *) pack->ep_entry, &pcb->pcb_tf);
-printf("new pcb %p\n", pcb);
+printf("updated pcb %p\n", pcb);
printf("\tpcb->pcb_ucp.uc_stack.ss_sp = %p\n", pcb->pcb_ucp.uc_stack.ss_sp);
printf("\tpcb->pcb_ucp.uc_stack.ss_size = %d\n", (int) pcb->pcb_ucp.uc_stack.ss_size);
+printf("\tpcb->pcb_userland_ucp.uc_stack.ss_sp = %p\n", pcb->pcb_userland_ucp.uc_stack.ss_sp);
+printf("\tpcb->pcb_userland_ucp.uc_stack.ss_size = %d\n", (int) pcb->pcb_userland_ucp.uc_stack.ss_size);
printf("\tpack->ep_entry = %p\n", (void *) pack->ep_entry);
printf("\t argument = %p\n", &pcb->pcb_tf);
}
