CVS commit: src/sys/arch/usermode

[Reinoud Zandijk]

Module Name:    src
Committed By:   reinoud
Date:           Thu Sep  8 15:13:27 UTC 2011

Modified Files:
        src/sys/arch/usermode/dev: cpu.c
        src/sys/arch/usermode/usermode: trap.c

Log Message:
Use the machdep.h and now use the md_check_syscall_opcode()


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/usermode/dev/cpu.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/usermode/usermode/trap.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.39 src/sys/arch/usermode/dev/cpu.c:1.40
--- src/sys/arch/usermode/dev/cpu.c:1.39	Thu Sep  8 14:47:17 2011
+++ src/sys/arch/usermode/dev/cpu.c	Thu Sep  8 15:13:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.39 2011/09/08 14:47:17 reinoud Exp $ */
+/* $NetBSD: cpu.c,v 1.40 2011/09/08 15:13:27 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -30,7 +30,7 @@
 #include "opt_hz.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.39 2011/09/08 14:47:17 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.40 2011/09/08 15:13:27 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -48,6 +48,7 @@
 #include <machine/cpu.h>
 #include <machine/mainbus.h>
 #include <machine/pcb.h>
+#include <machine/machdep.h>
 #include <machine/thunk.h>
 
 #include <uvm/uvm_extern.h>
@@ -297,7 +298,6 @@
 	panic("%s: shouldn't return", __func__);
 }
 
-extern void syscall(void);
 void
 cpu_lwp_fork(struct lwp *l1, struct lwp *l2, void *stack, size_t stacksize,
     void (*func)(void *), void *arg)

Index: src/sys/arch/usermode/usermode/trap.c
diff -u src/sys/arch/usermode/usermode/trap.c:1.35 src/sys/arch/usermode/usermode/trap.c:1.36
--- src/sys/arch/usermode/usermode/trap.c:1.35	Thu Sep  8 14:49:42 2011
+++ src/sys/arch/usermode/usermode/trap.c	Thu Sep  8 15:13:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.35 2011/09/08 14:49:42 reinoud Exp $ */
+/* $NetBSD: trap.c,v 1.36 2011/09/08 15:13:27 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2011 Reinoud Zandijk <rein...@netbsd.org>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.35 2011/09/08 14:49:42 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.36 2011/09/08 15:13:27 reinoud Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -41,6 +41,7 @@
 #include <machine/cpu.h>
 #include <machine/pcb.h>
 #include <machine/pmap.h>
+#include <machine/machdep.h>
 #include <machine/thunk.h>
 
 
@@ -285,10 +286,10 @@
 		memcpy(&pcb->pcb_userland_ucp, uct, sizeof(ucontext_t));
 
 		/* if its a syscall, switch to the syscall entry */
-//		if (syscall_check_opcode(info->si_addr)) {
+		if (md_check_syscall_opcode(info->si_addr)) {
 			thunk_setcontext(&pcb->pcb_syscall_ucp);
 			/* NOT REACHED */
-//		}
+		}
 
 		panic("should deliver a trap to the process : illegal instruction "
 			"encountered\n");