Module Name: src
Committed By: reinoud
Date: Fri Sep 2 16:09:01 UTC 2011
Modified Files:
src/sys/arch/usermode/include: pcb.h thunk.h
src/sys/arch/usermode/usermode: thunk.c
Log Message:
Revert
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/usermode/include/pcb.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/usermode/include/thunk.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/usermode/usermode/thunk.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/include/pcb.h
diff -u src/sys/arch/usermode/include/pcb.h:1.7 src/sys/arch/usermode/include/pcb.h:1.8
--- src/sys/arch/usermode/include/pcb.h:1.7 Fri Sep 2 14:56:48 2011
+++ src/sys/arch/usermode/include/pcb.h Fri Sep 2 16:09:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcb.h,v 1.7 2011/09/02 14:56:48 reinoud Exp $ */
+/* $NetBSD: pcb.h,v 1.8 2011/09/02 16:09:01 reinoud Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -37,17 +37,15 @@
* XXX move to frame.h?
*/
-/* XXX NOT USED YET */
typedef struct trapframe {
-// int (*tf_syscall)(lwp_t *, struct trapframe *);
-// int tf_reason; /* XXX unused */
-// uintptr_t tf_io[8]; /* to transport info */
+ int (*tf_syscall)(lwp_t *, struct trapframe *);
+ int tf_reason; /* XXX unused */
+ uintptr_t tf_io[8]; /* to transport info */
} trapframe_t;
struct pcb {
ucontext_t pcb_ucp; /* lwp switchframe */
- ucontext_t pcb_syscall_ucp; /* syscall switchframe */
ucontext_t pcb_userland_ucp; /* userland switchframe */
bool pcb_needfree;
struct trapframe pcb_tf;
Index: src/sys/arch/usermode/include/thunk.h
diff -u src/sys/arch/usermode/include/thunk.h:1.22 src/sys/arch/usermode/include/thunk.h:1.23
--- src/sys/arch/usermode/include/thunk.h:1.22 Fri Sep 2 14:55:22 2011
+++ src/sys/arch/usermode/include/thunk.h Fri Sep 2 16:09:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: thunk.h,v 1.22 2011/09/02 14:55:22 reinoud Exp $ */
+/* $NetBSD: thunk.h,v 1.23 2011/09/02 16:09:01 reinoud Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -70,7 +70,7 @@
int thunk_getcontext(ucontext_t *);
int thunk_setcontext(const ucontext_t *);
void thunk_makecontext(ucontext_t *, void (*)(void), int, void (*)(void *), void *);
-void thunk_makecontext_1(ucontext_t *, void (*)(void), void *);
+void thunk_makecontext_trapframe2go(ucontext_t *, void *func, void *trapframe);
int thunk_swapcontext(ucontext_t *, ucontext_t *);
int thunk_tcgetattr(int, struct thunk_termios *);
Index: src/sys/arch/usermode/usermode/thunk.c
diff -u src/sys/arch/usermode/usermode/thunk.c:1.25 src/sys/arch/usermode/usermode/thunk.c:1.26
--- src/sys/arch/usermode/usermode/thunk.c:1.25 Fri Sep 2 14:55:22 2011
+++ src/sys/arch/usermode/usermode/thunk.c Fri Sep 2 16:09:01 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: thunk.c,v 1.25 2011/09/02 14:55:22 reinoud Exp $ */
+/* $NetBSD: thunk.c,v 1.26 2011/09/02 16:09:01 reinoud Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__RCSID("$NetBSD: thunk.c,v 1.25 2011/09/02 14:55:22 reinoud Exp $");
+__RCSID("$NetBSD: thunk.c,v 1.26 2011/09/02 16:09:01 reinoud Exp $");
#include <sys/types.h>
#include <sys/ansi.h>
@@ -205,9 +205,9 @@
}
void
-thunk_makecontext_1(ucontext_t *ucp, void (*func)(void), void *arg)
+thunk_makecontext_trapframe2go(ucontext_t *ucp, void *func, void *trapframe)
{
- makecontext(ucp, func, 1, arg);
+ makecontext(ucp, func, 1, trapframe);
}
int
