Module Name:    src
Committed By:   reinoud
Date:           Wed Sep  7 10:10:10 UTC 2011

Modified Files:
        src/sys/arch/usermode/usermode: machdep.c

Log Message:
Move all i386 specific stuff in a #ifdef __i386__


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 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/usermode/machdep.c
diff -u src/sys/arch/usermode/usermode/machdep.c:1.24 src/sys/arch/usermode/usermode/machdep.c:1.25
--- src/sys/arch/usermode/usermode/machdep.c:1.24	Mon Sep  5 18:31:04 2011
+++ src/sys/arch/usermode/usermode/machdep.c	Wed Sep  7 10:10:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.24 2011/09/05 18:31:04 reinoud Exp $ */
+/* $NetBSD: machdep.c,v 1.25 2011/09/07 10:10:10 reinoud Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
 #include "opt_urkelvisor.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.24 2011/09/05 18:31:04 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.25 2011/09/07 10:10:10 reinoud Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -142,10 +142,25 @@
 }
 
 void
+sendsig_siginfo(const ksiginfo_t *ksi, const sigset_t *mask)
+{
+}
+
+int
+mm_md_physacc(paddr_t pa, vm_prot_t prog)
+{
+	return 0;
+}
+
+
+#ifdef __i386__
+
+void
 setregs(struct lwp *l, struct exec_package *pack, vaddr_t stack)
 {
 	struct pcb *pcb = lwp_getpcb(l);
 	ucontext_t *ucp = &pcb->pcb_userland_ucp;
+	uint *reg, i;
 
 #ifdef DEBUG_EXEC
 	printf("setregs called: lwp %p, exec package %p, stack %p\n",
@@ -161,10 +176,7 @@
 		(int) pcb->pcb_userland_ucp.uc_stack.ss_size);
 #endif
 
-#ifdef __i386__
-	uint *reg, i;
 	reg = (int *) &ucp->uc_mcontext;
-
 	for (i = 4; i < 11; i++)
 		reg[i] = 0;
 
@@ -185,9 +197,6 @@
 	for (i =0; i < 19; i++)
 		printf("reg[%02d] (%6s) = %"PRIx32"\n", i, name[i], reg[i]);
 #endif
-#else
-#	error setregs() not yet ported to this architecture
-#endif
 
 #ifdef DEBUG_EXEC
 	printf("updated pcb %p\n", pcb);
@@ -204,13 +213,8 @@
 #endif
 }
 
-void
-sendsig_siginfo(const ksiginfo_t *ksi, const sigset_t *mask)
-{
-}
 
-int
-mm_md_physacc(paddr_t pa, vm_prot_t prog)
-{
-	return 0;
-}
+#else
+#	error setregs() not yet ported to this architecture
+#endif
+

Reply via email to