[src/trunk]: src/sys Use __LDPGSZ (which must be == USRTEXT) as the text addr...

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

details:   https://anonhg.NetBSD.org/src/rev/8c3663b647c5
branches:  trunk
changeset: 540333:8c3663b647c5
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Dec 10 05:14:24 2002 +0000

description:
Use __LDPGSZ (which must be == USRTEXT) as the text address for a.out
executables, and eliminate the USRTEXT constant, which was only used
by the a.out exec code.

diffstat:

 sys/arch/acorn26/include/vmparam.h        |   3 +--
 sys/arch/alpha/include/vmparam.h          |   6 ++----
 sys/arch/amiga/include/vmparam.h          |  10 ++--------
 sys/arch/amigappc/include/vmparam.h       |   3 +--
 sys/arch/arc/include/vmparam.h            |   6 +-----
 sys/arch/arm/include/arm32/vmparam.h      |   3 +--
 sys/arch/atari/include/vmparam.h          |  10 ++--------
 sys/arch/cesfic/include/vmparam.h         |  10 ++--------
 sys/arch/evbppc/include/vmparam.h         |   3 +--
 sys/arch/hp300/include/vmparam.h          |  16 +++++-----------
 sys/arch/hppa/include/vmparam.h           |  11 ++---------
 sys/arch/i386/include/vmparam.h           |  10 ++++------
 sys/arch/luna68k/include/vmparam.h        |   6 ++----
 sys/arch/mac68k/include/vmparam.h         |  10 ++--------
 sys/arch/macppc/include/vmparam.h         |   3 +--
 sys/arch/mips/include/vmparam.h           |   6 ++----
 sys/arch/mvme68k/include/vmparam.h        |  10 ++--------
 sys/arch/news68k/include/vmparam.h        |  10 ++--------
 sys/arch/next68k/include/vmparam.h        |  10 ++--------
 sys/arch/ofppc/include/vmparam.h          |   3 +--
 sys/arch/pc532/include/vmparam.h          |  10 ++++------
 sys/arch/pmppc/include/vmparam.h          |   3 +--
 sys/arch/powerpc/include/mpc6xx/vmparam.h |   4 ----
 sys/arch/prep/include/vmparam.h           |   3 +--
 sys/arch/sandpoint/include/vmparam.h      |   3 +--
 sys/arch/sh3/include/vmparam.h            |   5 ++---
 sys/arch/sh5/include/vmparam.h            |   5 +----
 sys/arch/sparc/include/vmparam.h          |   6 ++----
 sys/arch/sparc64/include/vmparam.h        |   6 ++----
 sys/arch/sun2/include/vmparam.h           |   4 +---
 sys/arch/sun3/include/vmparam3.h          |   4 +---
 sys/arch/sun3/include/vmparam3x.h         |   4 +---
 sys/arch/vax/include/vmparam.h            |   9 +++------
 sys/arch/x68k/include/vmparam.h           |   6 ++----
 sys/arch/x86_64/include/vmparam.h         |  10 ++++------
 sys/compat/netbsd32/netbsd32_exec_aout.c  |  11 ++++++-----
 sys/kern/exec_aout.c                      |  11 ++++++-----
 37 files changed, 76 insertions(+), 177 deletions(-)

diffs (truncated from 941 to 300 lines):

diff -r 044c6227e6a4 -r 8c3663b647c5 sys/arch/acorn26/include/vmparam.h
--- a/sys/arch/acorn26/include/vmparam.h        Tue Dec 10 05:05:11 2002 +0000
+++ b/sys/arch/acorn26/include/vmparam.h        Tue Dec 10 05:14:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.1 2002/03/24 15:47:12 bjh21 Exp $        */
+/*     $NetBSD: vmparam.h,v 1.2 2002/12/10 05:14:24 thorpej Exp $      */
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -36,7 +36,6 @@
 #ifndef        _ARM26_VMPARAM_H_
 #define        _ARM26_VMPARAM_H_
 
-#define        USRTEXT         VM_MIN_ADDRESS
 #define        USRSTACK        VM_MAXUSER_ADDRESS
 
 #define        MAXTSIZ         (0x007f8000)            /* max text size */
diff -r 044c6227e6a4 -r 8c3663b647c5 sys/arch/alpha/include/vmparam.h
--- a/sys/arch/alpha/include/vmparam.h  Tue Dec 10 05:05:11 2002 +0000
+++ b/sys/arch/alpha/include/vmparam.h  Tue Dec 10 05:14:24 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.24 2001/11/15 18:06:12 soren Exp $ */
+/* $NetBSD: vmparam.h,v 1.25 2002/12/10 05:14:25 thorpej Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -50,15 +50,13 @@
  */
 
 /*
- * USRTEXT is the start of the user text/data space, while USRSTACK
- * is the top (end) of the user stack.
+ * USRSTACK is the top (end) of the user stack.
  *
  * Digital UNIX (formerly DEC OSF/1) places the stack below the
  * text segment (i.e. growing downward from 4G).  We may want to
  * consider doing that at some point, but it might require changes
  * to the exec code.
  */
-#define        USRTEXT         NBPG
 #define        USRSTACK        ((vaddr_t)0x0000000200000000)           /* 8G */
 
 /*
diff -r 044c6227e6a4 -r 8c3663b647c5 sys/arch/amiga/include/vmparam.h
--- a/sys/arch/amiga/include/vmparam.h  Tue Dec 10 05:05:11 2002 +0000
+++ b/sys/arch/amiga/include/vmparam.h  Tue Dec 10 05:14:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.30 2001/11/15 18:06:12 soren Exp $       */
+/*     $NetBSD: vmparam.h,v 1.31 2002/12/10 05:14:25 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -59,21 +59,15 @@
 #define        PAGE_MASK       (PAGE_SIZE - 1)
 
 /*
- * USRTEXT is the start of the user text/data space, while USRSTACK
- * is the top (end) of the user stack.  LOWPAGES and HIGHPAGES are
- * the number of pages from the beginning of the P0 region to the
- * beginning of the text and from the beginning of the P1 region to the
- * beginning of the stack respectively.
+ * USRSTACK is the top (end) of the user stack.
  *
  * These are a mixture of i386, sun3 and hp settings.. 
  */
 
 /* Sun settings. Still hope, that I might get sun3 binaries to work... */
-#define        USRTEXT         0x2000
 #ifndef USRSTACK
 #define        USRSTACK        0x0E000000
 #endif
-#define        LOWPAGES        btoc(USRTEXT)
 #define KUSER_AREA     (-UPAGES*NBPG)
 /*
  * Virtual memory related constants, all in bytes
diff -r 044c6227e6a4 -r 8c3663b647c5 sys/arch/amigappc/include/vmparam.h
--- a/sys/arch/amigappc/include/vmparam.h       Tue Dec 10 05:05:11 2002 +0000
+++ b/sys/arch/amigappc/include/vmparam.h       Tue Dec 10 05:14:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.4 2001/11/15 18:06:12 soren Exp $        */
+/*     $NetBSD: vmparam.h,v 1.5 2002/12/10 05:14:25 thorpej Exp $      */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -34,7 +34,6 @@
 #ifndef _MACHINE_VMPARAM_H_
 #define _MACHINE_VMPARAM_H_
 
-#define        USRTEXT         NBPG
 #define        USRSTACK        VM_MAXUSER_ADDRESS
 
 #ifndef        MAXTSIZ
diff -r 044c6227e6a4 -r 8c3663b647c5 sys/arch/arc/include/vmparam.h
--- a/sys/arch/arc/include/vmparam.h    Tue Dec 10 05:05:11 2002 +0000
+++ b/sys/arch/arc/include/vmparam.h    Tue Dec 10 05:14:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.6 2000/06/09 05:33:04 soda Exp $ */
+/*     $NetBSD: vmparam.h,v 1.7 2002/12/10 05:14:26 thorpej Exp $      */
 /*     $OpenBSD: vmparam.h,v 1.3 1997/04/19 17:19:59 pefo Exp $        */
 /*     NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp     */
 
@@ -12,10 +12,6 @@
 #define        VM_NFREELIST            1
 #define        VM_FREELIST_DEFAULT     0
 
-#if 0 /* changed in OpenBSD */
-#define        USRTEXT         0x00400000
-#endif
-
 #ifndef KSEG2IOBUFSIZE
 #define KSEG2IOBUFSIZE kseg2iobufsize  /* reserve PTEs for KSEG2 I/O space */
 
diff -r 044c6227e6a4 -r 8c3663b647c5 sys/arch/arm/include/arm32/vmparam.h
--- a/sys/arch/arm/include/arm32/vmparam.h      Tue Dec 10 05:05:11 2002 +0000
+++ b/sys/arch/arm/include/arm32/vmparam.h      Tue Dec 10 05:14:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.10 2002/08/09 18:23:00 thorpej Exp $     */
+/*     $NetBSD: vmparam.h,v 1.11 2002/12/10 05:14:26 thorpej Exp $     */
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -47,7 +47,6 @@
 #include <sys/lock.h>          /* struct simplelock */ 
 #include <arm/arm32/pte.h>     /* pt_entry_t */
 
-#define        USRTEXT         VM_MIN_ADDRESS
 #define        USRSTACK        VM_MAXUSER_ADDRESS
 
 /*
diff -r 044c6227e6a4 -r 8c3663b647c5 sys/arch/atari/include/vmparam.h
--- a/sys/arch/atari/include/vmparam.h  Tue Dec 10 05:05:11 2002 +0000
+++ b/sys/arch/atari/include/vmparam.h  Tue Dec 10 05:14:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.17 2001/11/15 18:06:13 soren Exp $       */
+/*     $NetBSD: vmparam.h,v 1.18 2002/12/10 05:14:26 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -60,19 +60,13 @@
 #define        PAGE_MASK       (PAGE_SIZE - 1)
 
 /*
- * USRTEXT is the start of the user text/data space, while USRSTACK
- * is the top (end) of the user stack.  LOWPAGES and HIGHPAGES are
- * the number of pages from the beginning of the P0 region to the
- * beginning of the text and from the beginning of the P1 region to the
- * beginning of the stack respectively.
+ * USRSTACK is the top (end) of the user stack.
  *
  * These are a mixture of i386, sun3 and hp settings.. 
  */
 
 /* Sun settings. Still hope, that I might get sun3 binaries to work... */
-#define        USRTEXT         0x2000
 #define        USRSTACK        0x0E000000
-#define        LOWPAGES        btoc(USRTEXT)
 #define KUSER_AREA     (-UPAGES*NBPG)
 /*
  * Virtual memory related constants, all in bytes
diff -r 044c6227e6a4 -r 8c3663b647c5 sys/arch/cesfic/include/vmparam.h
--- a/sys/arch/cesfic/include/vmparam.h Tue Dec 10 05:05:11 2002 +0000
+++ b/sys/arch/cesfic/include/vmparam.h Tue Dec 10 05:14:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.4 2002/02/26 15:13:21 simonb Exp $       */
+/*     $NetBSD: vmparam.h,v 1.5 2002/12/10 05:14:27 thorpej Exp $      */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -58,22 +58,16 @@
 #define        PAGE_MASK       (PAGE_SIZE - 1)
 
 /*
- * USRTEXT is the start of the user text/data space, while USRSTACK
- * is the top (end) of the user stack.  LOWPAGES and HIGHPAGES are
- * the number of pages from the beginning of the P0 region to the
- * beginning of the text and from the beginning of the P1 region to the
- * beginning of the stack respectively.
+ * USRSTACK is the top (end) of the user stack.
  *
  * NOTE: the ONLY reason that HIGHPAGES is 0x100 instead of UPAGES (3)
  * is for HPUX compatibility.  Why??  Because HPUX's debuggers
  * have the user's stack hard-wired at FFF00000 for post-mortems,
  * and we must be compatible...
  */
-#define        USRTEXT         8192                    /* Must equal __LDPGSZ */
 #define        USRSTACK        (-HIGHPAGES*NBPG)       /* Start of user stack */
 #define        BTOPUSRSTACK    (0x100000-HIGHPAGES)    /* btop(USRSTACK) */
 #define P1PAGES                0x100000
-#define        LOWPAGES        0
 #define HIGHPAGES      (0x100000/NBPG)
 
 /*
diff -r 044c6227e6a4 -r 8c3663b647c5 sys/arch/evbppc/include/vmparam.h
--- a/sys/arch/evbppc/include/vmparam.h Tue Dec 10 05:05:11 2002 +0000
+++ b/sys/arch/evbppc/include/vmparam.h Tue Dec 10 05:14:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.1 2002/12/09 12:16:19 scw Exp $  */
+/*     $NetBSD: vmparam.h,v 1.2 2002/12/10 05:14:27 thorpej Exp $      */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -34,7 +34,6 @@
 #ifndef _MACHINE_VMPARAM_H_
 #define _MACHINE_VMPARAM_H_
 
-#define        USRTEXT         NBPG
 #define        USRSTACK        VM_MAXUSER_ADDRESS
 
 #ifndef        MAXTSIZ
diff -r 044c6227e6a4 -r 8c3663b647c5 sys/arch/hp300/include/vmparam.h
--- a/sys/arch/hp300/include/vmparam.h  Tue Dec 10 05:05:11 2002 +0000
+++ b/sys/arch/hp300/include/vmparam.h  Tue Dec 10 05:14:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.27 2001/11/15 18:06:14 soren Exp $       */
+/*     $NetBSD: vmparam.h,v 1.28 2002/12/10 05:14:27 thorpej Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -58,38 +58,32 @@
 #define        PAGE_MASK       (PAGE_SIZE - 1)
 
 /*
- * USRTEXT is the start of the user text/data space, while USRSTACK
- * is the top (end) of the user stack.  LOWPAGES and HIGHPAGES are
- * the number of pages from the beginning of the P0 region to the
- * beginning of the text and from the beginning of the P1 region to the
- * beginning of the stack respectively.
+ * USRSTACK is the top (end) of the user stack.
  *
  * NOTE: the ONLY reason that HIGHPAGES is 0x100 instead of UPAGES (3)
  * is for HPUX compatibility.  Why??  Because HPUX's debuggers
  * have the user's stack hard-wired at FFF00000 for post-mortems,
  * and we must be compatible...
  */
-#define        USRTEXT         8192                    /* Must equal __LDPGSZ */
 #define        USRSTACK        (-HIGHPAGES*NBPG)       /* Start of user stack */
 #define        BTOPUSRSTACK    (0x100000-HIGHPAGES)    /* btop(USRSTACK) */
 #define P1PAGES                0x100000
-#define        LOWPAGES        0
 #define HIGHPAGES      (0x100000/NBPG)
 
 /*
  * Virtual memory related constants, all in bytes
  */
 #ifndef MAXTSIZ
-#define        MAXTSIZ         (8*1024*1024)           /* max text size */
+#define        MAXTSIZ         (16*1024*1024)          /* max text size */
 #endif
 #ifndef DFLDSIZ
 #define        DFLDSIZ         (32*1024*1024)          /* initial data size limit */
 #endif
 #ifndef MAXDSIZ
-#define        MAXDSIZ         (64*1024*1024)          /* max data size */
+#define        MAXDSIZ         (256*1024*1024)         /* max data size */
 #endif
 #ifndef        DFLSSIZ
-#define        DFLSSIZ         (512*1024)              /* initial stack size limit */
+#define        DFLSSIZ         (2*1024*1024)           /* initial stack size limit */
 #endif
 #ifndef        MAXSSIZ
 #define        MAXSSIZ         MAXDSIZ                 /* max stack size */
diff -r 044c6227e6a4 -r 8c3663b647c5 sys/arch/hppa/include/vmparam.h
--- a/sys/arch/hppa/include/vmparam.h   Tue Dec 10 05:05:11 2002 +0000
+++ b/sys/arch/hppa/include/vmparam.h   Tue Dec 10 05:14:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.2 2002/08/05 20:58:35 fredette Exp $     */
+/*     $NetBSD: vmparam.h,v 1.3 2002/12/10 05:14:28 thorpej Exp $      */
 
 /*     $OpenBSD: vmparam.h,v 1.17 2001/09/22 18:00:09 miod Exp $       */
 
@@ -32,16 +32,9 @@
  * Machine dependent constants for HP PA
  */
 /*
- * USRTEXT is the start of the user text/data space, while USRSTACK
- * is the top (end) of the user stack.  LOWPAGES and HIGHPAGES are
- * the number of pages from the beginning of the P0 region to the
- * beginning of the text and from the beginning of the P1 region to the
- * beginning of the stack respectively.
+ * USRSTACK is the top (end) of the user stack.
  */
-#define        USRTEXT         0x00002000              /* Start of user .text */
 #define        USRSTACK        0x68FF3000              /* Start of user stack */
-#define        LOWPAGES        0
-#define        HIGHPAGES       UPAGES
 #define        SYSCALLGATE     0xC0000000              /* syscall gateway page */
 
 /* Alignment requirement for a uspace. */
diff -r 044c6227e6a4 -r 8c3663b647c5 sys/arch/i386/include/vmparam.h
--- a/sys/arch/i386/include/vmparam.h   Tue Dec 10 05:05:11 2002 +0000
+++ b/sys/arch/i386/include/vmparam.h   Tue Dec 10 05:14:24 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vmparam.h,v 1.45 2001/11/15 18:06:14 soren Exp $       */
+/*     $NetBSD: vmparam.h,v 1.46 2002/12/10 05:14:28 thorpej Exp $     */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -56,15 +56,13 @@
 /*
  * Virtual address space arrangement. On 386, both user and kernel