[src/trunk]: src/sys Get rid of #ifdef __sparc__ in uvm code - as noted by cg...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/634f19e1572a
branches:  trunk
changeset: 767794:634f19e1572a
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Jul 30 19:29:12 2011 +0000

description:
Get rid of #ifdef __sparc__ in uvm code - as noted by cgd back 1996,
now that we have __HAVE_CPU_VMSPACE_EXEC/cpu_vmspace_exec().

diffstat:

 sys/arch/sparc/include/cpu.h    |  4 ++--
 sys/arch/sparc/include/types.h  |  3 ++-
 sys/arch/sparc/sparc/trap.c     |  6 +++---
 sys/arch/sparc64/include/cpu.h  |  4 ++--
 sys/arch/sparc64/sparc64/trap.c |  6 +++---
 sys/uvm/uvm_map.c               |  8 ++------
 6 files changed, 14 insertions(+), 17 deletions(-)

diffs (136 lines):

diff -r 52987bf63802 -r 634f19e1572a sys/arch/sparc/include/cpu.h
--- a/sys/arch/sparc/include/cpu.h      Sat Jul 30 19:25:43 2011 +0000
+++ b/sys/arch/sparc/include/cpu.h      Sat Jul 30 19:29:12 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.91 2011/01/24 10:05:22 martin Exp $ */
+/*     $NetBSD: cpu.h,v 1.92 2011/07/30 19:29:12 martin Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -213,7 +213,7 @@
 void   qzero(void *, size_t);
 
 /* trap.c */
-void   kill_user_windows(struct lwp *);
+void   cpu_vmspace_exec(struct lwp *, vaddr_t, vaddr_t);
 int    rwindow_save(struct lwp *);
 
 /* cons.c */
diff -r 52987bf63802 -r 634f19e1572a sys/arch/sparc/include/types.h
--- a/sys/arch/sparc/include/types.h    Sat Jul 30 19:25:43 2011 +0000
+++ b/sys/arch/sparc/include/types.h    Sat Jul 30 19:29:12 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: types.h,v 1.60 2011/07/17 23:29:10 dyoung Exp $ */
+/*     $NetBSD: types.h,v 1.61 2011/07/30 19:29:12 martin Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -121,6 +121,7 @@
 #define        __HAVE_SYSCALL_INTERN
 #define        __GENERIC_SOFT_INTERRUPTS_ALL_LEVELS
 #define __HAVE_CPU_DATA_FIRST
+#define        __HAVE_CPU_VMSPACE_EXEC
 
 #ifdef SUN4U
 #define        __HAVE_DEVICE_REGISTER_POSTCONFIG
diff -r 52987bf63802 -r 634f19e1572a sys/arch/sparc/sparc/trap.c
--- a/sys/arch/sparc/sparc/trap.c       Sat Jul 30 19:25:43 2011 +0000
+++ b/sys/arch/sparc/sparc/trap.c       Sat Jul 30 19:29:12 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.187 2011/04/18 00:26:12 rmind Exp $ */
+/*     $NetBSD: trap.c,v 1.188 2011/07/30 19:29:12 martin Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.187 2011/04/18 00:26:12 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.188 2011/07/30 19:29:12 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_compat_svr4.h"
@@ -750,7 +750,7 @@
  * the registers into the new process after the exec.
  */
 void
-kill_user_windows(struct lwp *l)
+cpu_vmspace_exec(struct lwp *l, vaddr_t start, vaddr_t end)
 {
        struct pcb *pcb = lwp_getpcb(l);
 
diff -r 52987bf63802 -r 634f19e1572a sys/arch/sparc64/include/cpu.h
--- a/sys/arch/sparc64/include/cpu.h    Sat Jul 30 19:25:43 2011 +0000
+++ b/sys/arch/sparc64/include/cpu.h    Sat Jul 30 19:29:12 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.97 2011/07/20 12:06:00 macallan Exp $ */
+/*     $NetBSD: cpu.h,v 1.98 2011/07/30 19:29:12 martin Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -373,7 +373,7 @@
 void   switchtoctx_usiii(int);
 void   next_tick(long);
 /* trap.c */
-void   kill_user_windows(struct lwp *);
+void   cpu_vmspace_exec(struct lwp *, vaddr_t, vaddr_t);
 int    rwindow_save(struct lwp *);
 /* cons.c */
 int    cnrom(void);
diff -r 52987bf63802 -r 634f19e1572a sys/arch/sparc64/sparc64/trap.c
--- a/sys/arch/sparc64/sparc64/trap.c   Sat Jul 30 19:25:43 2011 +0000
+++ b/sys/arch/sparc64/sparc64/trap.c   Sat Jul 30 19:29:12 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: trap.c,v 1.167 2011/07/12 07:51:34 mrg Exp $ */
+/*     $NetBSD: trap.c,v 1.168 2011/07/30 19:29:12 martin Exp $ */
 
 /*
  * Copyright (c) 1996-2002 Eduardo Horvath.  All rights reserved.
@@ -50,7 +50,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.167 2011/07/12 07:51:34 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.168 2011/07/30 19:29:12 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -975,7 +975,7 @@
  * the registers into the new process after the exec.
  */
 void
-kill_user_windows(struct lwp *l)
+cpu_vmspace_exec(struct lwp *l, vaddr_t start, vaddr_t end)
 {
        struct pcb *pcb = lwp_getpcb(l);
 
diff -r 52987bf63802 -r 634f19e1572a sys/uvm/uvm_map.c
--- a/sys/uvm/uvm_map.c Sat Jul 30 19:25:43 2011 +0000
+++ b/sys/uvm/uvm_map.c Sat Jul 30 19:29:12 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_map.c,v 1.300 2011/07/05 14:03:07 yamt Exp $       */
+/*     $NetBSD: uvm_map.c,v 1.301 2011/07/30 19:29:12 martin Exp $     */
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.300 2011/07/05 14:03:07 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.301 2011/07/30 19:29:12 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_uvmhist.h"
@@ -4186,10 +4186,6 @@
        struct vmspace *nvm, *ovm = p->p_vmspace;
        struct vm_map *map = &ovm->vm_map;
 
-#ifdef __sparc__
-       /* XXX cgd 960926: the sparc #ifdef should be a MD hook */
-       kill_user_windows(l);   /* before stack addresses go away */
-#endif
 #ifdef __HAVE_CPU_VMSPACE_EXEC
        cpu_vmspace_exec(l, start, end);
 #endif