[src/trunk]: src/sys/arch/mmeye Sync with -current.

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

details:   https://anonhg.NetBSD.org/src/rev/5577327e332a
branches:  trunk
changeset: 476354:5577327e332a
user:      tsubai <tsubai%NetBSD.org@localhost>
date:      Tue Sep 14 11:20:52 1999 +0000

description:
Sync with -current.
XXX root on nfs don't work, though root on wd0 works well.

diffstat:

 sys/arch/mmeye/conf/GENERIC        |    3 +-
 sys/arch/mmeye/conf/MMEYE          |    7 +-
 sys/arch/mmeye/conf/Makefile.mmeye |    5 +-
 sys/arch/mmeye/conf/std.mmeye      |    3 +-
 sys/arch/mmeye/mmeye/conf.c        |    6 +-
 sys/arch/mmeye/mmeye/genassym.cf   |   13 +--
 sys/arch/mmeye/mmeye/locore.s      |   18 +---
 sys/arch/mmeye/mmeye/machdep.c     |  161 ++----------------------------------
 8 files changed, 25 insertions(+), 191 deletions(-)

diffs (truncated from 467 to 300 lines):

diff -r a108dcc33849 -r 5577327e332a sys/arch/mmeye/conf/GENERIC
--- a/sys/arch/mmeye/conf/GENERIC       Tue Sep 14 10:22:34 1999 +0000
+++ b/sys/arch/mmeye/conf/GENERIC       Tue Sep 14 11:20:52 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC,v 1.2 1999/09/13 16:26:18 msaitoh Exp $
+#      $NetBSD: GENERIC,v 1.3 1999/09/14 11:20:52 tsubai Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
@@ -42,6 +42,7 @@
 
 # Compatibility options
 options        COMPAT_13       # NetBSD 1.3
+options        COMPAT_14       # NetBSD 1.4,
 options        COMPAT_43       # and 4.3BSD
 
 # Executable format options
diff -r a108dcc33849 -r 5577327e332a sys/arch/mmeye/conf/MMEYE
--- a/sys/arch/mmeye/conf/MMEYE Tue Sep 14 10:22:34 1999 +0000
+++ b/sys/arch/mmeye/conf/MMEYE Tue Sep 14 11:20:52 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: MMEYE,v 1.2 1999/09/13 16:26:18 msaitoh Exp $
+#      $NetBSD: MMEYE,v 1.3 1999/09/14 11:20:52 tsubai Exp $
 #
 #      GENERIC -- everything that's currently supported
 #
@@ -34,6 +34,7 @@
 
 # Compatibility options
 options        COMPAT_13       # NetBSD 1.3
+options        COMPAT_14       # NetBSD 1.4,
 options        COMPAT_43       # and 4.3BSD
 
 # Executable format options
@@ -54,8 +55,8 @@
 options        PCMCIAVERBOSE   # verbose PCMCIA configuration messages
 
 # Kernel root file system and dump configuration.
-config         netbsd  root on ? type nfs
-#config                netbsd  root on wd0a type ffs
+#config                netbsd  root on ? type nfs
+config         netbsd  root on wd0a type ffs
 
 #
 # Device configuration
diff -r a108dcc33849 -r 5577327e332a sys/arch/mmeye/conf/Makefile.mmeye
--- a/sys/arch/mmeye/conf/Makefile.mmeye        Tue Sep 14 10:22:34 1999 +0000
+++ b/sys/arch/mmeye/conf/Makefile.mmeye        Tue Sep 14 11:20:52 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.mmeye,v 1.1 1999/09/13 10:30:50 itojun Exp $
+#      $NetBSD: Makefile.mmeye,v 1.2 1999/09/14 11:20:52 tsubai Exp $
 
 # Makefile for NetBSD
 #
@@ -48,7 +48,6 @@
 HAVE_GCC28!=   ${CC} --version | egrep "^(2\.8|2\.9|egcs)" ; echo
 INCLUDES=      -I. -I$S/arch -I$S -nostdinc
 CPPFLAGS=      ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -Dmmeye -Dsh3
-CPPFLAGS+=     -D__NetBSD__
 CWARNFLAGS=    -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes
 CWARNFLAGS+=   -Wpointer-arith -Wno-parentheses
 .if (${HAVE_GCC28} != "")
@@ -62,8 +61,6 @@
 LINKFLAGS=     -N -Ttext 8c010000 -e start
 .endif
 STRIPFLAGS=    --strip-debug
-MACHINE=mmeye
-MACHINE_ARCH=sh3
 
 ### find out what to use for libkern
 .include "$S/lib/libkern/Makefile.inc"
diff -r a108dcc33849 -r 5577327e332a sys/arch/mmeye/conf/std.mmeye
--- a/sys/arch/mmeye/conf/std.mmeye     Tue Sep 14 10:22:34 1999 +0000
+++ b/sys/arch/mmeye/conf/std.mmeye     Tue Sep 14 11:20:52 1999 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: std.mmeye,v 1.1 1999/09/13 10:30:51 itojun Exp $
+# $NetBSD: std.mmeye,v 1.2 1999/09/14 11:20:52 tsubai Exp $
 #
 # standard, required NetBSD/mmeye 'options'
 
 machine mmeye sh3
 
-#options PMAP_NEW      # UVM's new pmap interface
 options EXEC_SCRIPT    # exec #! scripts
diff -r a108dcc33849 -r 5577327e332a sys/arch/mmeye/mmeye/conf.c
--- a/sys/arch/mmeye/mmeye/conf.c       Tue Sep 14 10:22:34 1999 +0000
+++ b/sys/arch/mmeye/mmeye/conf.c       Tue Sep 14 11:20:52 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: conf.c,v 1.2 1999/09/13 16:26:19 msaitoh Exp $ */
+/*     $NetBSD: conf.c,v 1.3 1999/09/14 11:20:53 tsubai Exp $  */
 
 /*
  * Copyright (c) 1994, 1995 Charles M. Hannum.  All rights reserved.
@@ -96,8 +96,6 @@
 cdev_decl(log);
 #include "com.h"
 cdev_decl(com);
-#include "sci.h"
-cdev_decl(sci);
 cdev_decl(fd);
 cdev_decl(sd);
 cdev_decl(st);
@@ -146,7 +144,7 @@
        cdev_tty_init(NCOM,com),        /* 8: serial port */
        cdev_notdef(),                  /* 9 (was floppy disk) */
        cdev_notdef(),                  /* 10 (was QIC-02/QIC-36 tape) */
-       cdev_tty_init(NSCI,sci),        /* 11: */
+       cdev_notdef(),                  /* 11: */
        cdev_notdef(),                  /* 12: (was PC console) */
        cdev_disk_init(NSD,sd),         /* 13: SCSI disk */
        cdev_tape_init(NST,st),         /* 14: SCSI tape */
diff -r a108dcc33849 -r 5577327e332a sys/arch/mmeye/mmeye/genassym.cf
--- a/sys/arch/mmeye/mmeye/genassym.cf  Tue Sep 14 10:22:34 1999 +0000
+++ b/sys/arch/mmeye/mmeye/genassym.cf  Tue Sep 14 11:20:52 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.1 1999/09/13 10:31:02 itojun Exp $
+#      $NetBSD: genassym.cf,v 1.2 1999/09/14 11:20:53 tsubai Exp $
 
 #
 # Copyright (c) 1995, 1997 Charles M. Hannum.  All rights reserved.
@@ -39,8 +39,6 @@
 #      @(#)genassym.c  5.11 (Berkeley) 5/10/91
 #
 
-include "opt_pmap_new.h"
-
 include <sys/param.h>
 include <sys/proc.h>
 include <sys/resourcevar.h>
@@ -59,20 +57,11 @@
 
 define SRUN                    SRUN
 
-ifdef PMAP_NEW
 define PDSLOT_PTE              PDSLOT_PTE
 define PDSLOT_APTE             PDSLOT_APTE
 define PDSLOT_KERN             PDSLOT_KERN
 define NKPTP_MIN               NKPTP_MIN
 define NKPTP_MAX               NKPTP_MAX
-else
-define PTDPTDI                 PTDPTDI
-define KPTDI                   KPTDI
-define NKPDE_BASE              NKPDE_BASE
-define NKPDE_MAX               NKPDE_MAX
-define NKPDE_SCALE             NKPDE_SCALE
-define APTDPTDI                APTDPTDI
-endif
 
 define VM_MAXUSER_ADDRESS      (int)VM_MAXUSER_ADDRESS
 
diff -r a108dcc33849 -r 5577327e332a sys/arch/mmeye/mmeye/locore.s
--- a/sys/arch/mmeye/mmeye/locore.s     Tue Sep 14 10:22:34 1999 +0000
+++ b/sys/arch/mmeye/mmeye/locore.s     Tue Sep 14 11:20:52 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.1 1999/09/13 10:31:02 itojun Exp $        */
+/*     $NetBSD: locore.s,v 1.2 1999/09/14 11:20:54 tsubai Exp $        */
 
 /*-
  * Copyright (c) 1993, 1994, 1995, 1997
@@ -41,7 +41,6 @@
  */
 
 #include "opt_ddb.h"
-#include "opt_pmap_new.h"
 
 #include "assym.h"
 
@@ -232,17 +231,9 @@
  *
  * XXX 4 == sizeof pde
  */
-
-#ifdef PMAP_NEW
        .set    _C_LABEL(PTmap), (PDSLOT_PTE << PDSHIFT)
        .set    _C_LABEL(PTD), (_C_LABEL(PTmap) + PDSLOT_PTE * NBPG)
        .set    _C_LABEL(PTDpde), (_C_LABEL(PTD) + PDSLOT_PTE * 4)
-#else
-       .globl  _PTmap, _PTD, _PTDpde
-       .set    _PTmap,(PTDPTDI << PDSHIFT)
-       .set    _PTD,(_PTmap + PTDPTDI * NBPG)
-       .set    _PTDpde,(_PTD + PTDPTDI * 4)
-#endif
 
 /*
  * APTmap, APTD is the alternate recursive pagemap.
@@ -250,16 +241,9 @@
  *
  * XXX 4 == sizeof pde
  */
-#ifdef PMAP_NEW
        .set    _C_LABEL(APTmap),(PDSLOT_APTE << PDSHIFT)
        .set    _C_LABEL(APTD),(_C_LABEL(APTmap) + PDSLOT_APTE * NBPG)
        .set    _C_LABEL(APTDpde),(_C_LABEL(PTD) + PDSLOT_APTE * 4)
-#else
-       .globl  _APTmap,_APTD,_APTDpde
-       .set    _APTmap,(APTDPTDI << PDSHIFT)
-       .set    _APTD,(_APTmap + APTDPTDI * NBPG)
-       .set    _APTDpde,(_PTD + APTDPTDI * 4)
-#endif
 
 /*
  * Initialization
diff -r a108dcc33849 -r 5577327e332a sys/arch/mmeye/mmeye/machdep.c
--- a/sys/arch/mmeye/mmeye/machdep.c    Tue Sep 14 10:22:34 1999 +0000
+++ b/sys/arch/mmeye/mmeye/machdep.c    Tue Sep 14 11:20:52 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.1 1999/09/13 10:31:03 itojun Exp $       */
+/*     $NetBSD: machdep.c,v 1.2 1999/09/14 11:20:54 tsubai Exp $       */
 
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -75,10 +75,8 @@
  *     @(#)machdep.c   7.4 (Berkeley) 6/3/91
  */
 
-#include "opt_bufcache.h"
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
-#include "opt_pmap_new.h"
 #include "opt_sysv.h"
 
 #include <sys/param.h>
@@ -102,15 +100,6 @@
 #include <sys/device.h>
 #include <sys/extent.h>
 #include <sys/syscallargs.h>
-#ifdef SYSVMSG
-#include <sys/msg.h>
-#endif
-#ifdef SYSVSEM
-#include <sys/sem.h>
-#endif
-#ifdef SYSVSHM
-#include <sys/shm.h>
-#endif
 
 #ifdef KGDB
 #include <sys/kgdb.h>
@@ -155,26 +144,6 @@
 
 char bootinfo[BOOTINFO_MAXSIZE];
 
-/*
- * Declare these as initialized data so we can patch them.
- */
-int    nswbuf = 0;
-#ifdef NBUF
-int    nbuf = NBUF;
-#else
-int    nbuf = 0;
-#endif
-#ifdef BUFPAGES
-int    bufpages = BUFPAGES;
-#else
-int    bufpages = 0;
-#endif
-#ifdef BUFCACHE
-int    bufcache = BUFCACHE;    /* % of RAM to use for buffer cache */
-#else
-int    bufcache = 0;           /* fallback to old algorithm */
-#endif
-
 int physmem;
 int dumpmem_low;
 int dumpmem_high;
@@ -212,7 +181,6 @@
 static int ioport_malloc_safe;
 
 void setup_bootinfo __P((void));
-caddr_t        allocsys __P((caddr_t));
 void dumpsys __P((void));
 void identifycpu __P((void));
 void initSH3 __P((void *));
@@ -246,21 +214,23 @@
        vaddr_t minaddr, maxaddr;
        vsize_t size;
        struct pcb *pcb;
+       char pbuf[9];
 
        printf(version);
 
        sprintf(cpu_model, "Hitachi SH3");
 
-       printf("real mem  = %d\n", ctob(physmem));
+       format_bytes(pbuf, sizeof(pbuf), ctob(physmem));
+       printf("total memory = %s\n", pbuf);
 
        /*
         * Find out how much space we need, allocate it,
         * and then give everything true virtual addresses.
         */
-       sz = (int)allocsys((caddr_t)0);
+       sz = (int)allocsys(NULL, NULL);
        if ((v = (caddr_t)uvm_km_zalloc(kernel_map, round_page(sz))) == 0)
                panic("startup: no room for tables");
-       if (allocsys(v) - v != sz)
+       if (allocsys(v, NULL) - v != sz)
                panic("startup: table size inconsistency");
 
        /*