Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/chs-ubc2]: src/sys/arch Update from trunk.
details: https://anonhg.NetBSD.org/src/rev/2f0fa69c9ae0
branches: chs-ubc2
changeset: 471421:2f0fa69c9ae0
user: thorpej <thorpej%NetBSD.org@localhost>
date: Mon Aug 02 19:57:20 1999 +0000
description:
Update from trunk.
diffstat:
sys/arch/mvme68k/conf/GENERIC | 4 +-
sys/arch/mvme68k/conf/GENERIC.v6 | 13 +-
sys/arch/mvme68k/conf/Makefile.mvme68k | 9 +-
sys/arch/mvme68k/conf/VME147 | 4 +-
sys/arch/mvme68k/conf/VME167 | 4 +-
sys/arch/mvme68k/conf/files.mvme68k | 4 +-
sys/arch/mvme68k/dev/if_ie.c | 6 +-
sys/arch/mvme68k/mvme68k/locore.s | 12 +-
sys/arch/mvme68k/mvme68k/pmap.c | 47 +-
sys/arch/mvme68k/mvme68k/sys_machdep.c | 7 +-
sys/arch/mvme68k/mvme68k/trap.c | 9 +-
sys/arch/mvme68k/mvme68k/vm_machdep.c | 19 +-
sys/arch/newsmips/Makefile | 4 +-
sys/arch/newsmips/conf/GENERIC | 13 +-
sys/arch/newsmips/conf/GENERIC.v6 | 13 +-
sys/arch/newsmips/conf/Makefile.newsmips | 15 +-
sys/arch/newsmips/conf/WAPIKO | 3 +-
sys/arch/newsmips/dev/hb.c | 32 +-
sys/arch/newsmips/include/Makefile | 6 +-
sys/arch/newsmips/include/loadfile_machdep.h | 57 +
sys/arch/newsmips/include/romcall.h | 58 +
sys/arch/newsmips/newsmips/autoconf.c | 21 +-
sys/arch/newsmips/newsmips/clock.c | 4 +-
sys/arch/next68k/Makefile | 9 +-
sys/arch/next68k/conf/GENERIC | 12 +-
sys/arch/next68k/conf/GENERIC.v6 | 13 +-
sys/arch/next68k/conf/Makefile.next68k | 9 +-
sys/arch/next68k/dev/bus_dma.c | 10 +-
sys/arch/next68k/include/intr.h | 49 +-
sys/arch/next68k/include/z8530var.h | 4 +-
sys/arch/next68k/next68k/conf.c | 10 +-
sys/arch/next68k/next68k/locore.s | 12 +-
sys/arch/next68k/next68k/pmap.c | 45 +-
sys/arch/next68k/next68k/sys_machdep.c | 10 +-
sys/arch/next68k/next68k/trap.c | 9 +-
sys/arch/next68k/next68k/vm_machdep.c | 19 +-
sys/arch/ofppc/conf/GENERIC | 3 +-
sys/arch/ofppc/conf/GENERIC.v6 | 13 +-
sys/arch/ofppc/conf/Makefile.ofppc | 9 +-
sys/arch/pc532/conf/BULLBOX | 3 +-
sys/arch/pc532/conf/DUMMY | 5 +-
sys/arch/pc532/conf/GENERIC | 3 +-
sys/arch/pc532/conf/GENERIC.v6 | 13 +-
sys/arch/pc532/conf/KLONDIKE | 3 +-
sys/arch/pc532/conf/Makefile.pc532 | 9 +-
sys/arch/pc532/conf/STEELHEAD | 3 +-
sys/arch/pc532/conf/files.pc532 | 4 +-
sys/arch/pc532/include/pmap.h | 227 +-
sys/arch/pc532/pc532/pmap.c | 4854 ++++++++++++-------------
sys/arch/pc532/pc532/vm_machdep.c | 13 +-
sys/arch/pica/conf/GENERIC | 3 +-
sys/arch/pica/conf/GENERIC.v6 | 13 +-
sys/arch/pica/conf/Makefile.pica | 9 +-
sys/arch/pica/conf/files.pica | 4 +-
sys/arch/pmax/conf/GENERIC | 11 +-
sys/arch/pmax/conf/GENERIC.v6 | 13 +-
sys/arch/pmax/conf/INSTALL | 3 +-
sys/arch/pmax/conf/Makefile.pmax | 11 +-
sys/arch/pmax/conf/R4000 | 3 +-
sys/arch/pmax/conf/files.pmax | 6 +-
sys/arch/pmax/dev/cfb.c | 84 +-
sys/arch/pmax/dev/fb.c | 136 +-
sys/arch/pmax/dev/fb_usrreq.c | 67 +-
sys/arch/pmax/dev/findcons.c | 30 +-
sys/arch/pmax/dev/mfb.c | 63 +-
sys/arch/pmax/dev/pm.c | 23 +-
sys/arch/pmax/dev/pm_ds.c | 53 +-
sys/arch/pmax/dev/pmvar.h | 4 +-
sys/arch/pmax/dev/px.c | 12 +-
sys/arch/pmax/dev/qvss_compat.c | 4 +-
sys/arch/pmax/dev/sfb.c | 44 +-
sys/arch/pmax/dev/xcfb.c | 41 +-
sys/arch/pmax/include/Makefile | 10 +-
sys/arch/pmax/include/fbvar.h | 17 +-
sys/arch/pmax/pmax/bus_dma.c | 6 +-
sys/arch/pmax/stand/Makefile.booters | 6 +-
sys/arch/pmax/tc/tc_subr.c | 15 +-
sys/arch/powerpc/include/ieeefp.h | 6 +-
sys/arch/powerpc/include/pmap.h | 6 +-
sys/arch/powerpc/powerpc/pmap.c | 20 +-
sys/arch/powerpc/powerpc/vm_machdep.c | 15 +-
sys/arch/sparc/conf/BILL-THE-CAT | 34 +-
sys/arch/sparc/conf/GENERIC | 44 +-
sys/arch/sparc/conf/GENERIC.v6 | 13 +-
sys/arch/sparc/conf/INSTALL | 34 +-
sys/arch/sparc/conf/Makefile.sparc | 11 +-
sys/arch/sparc/conf/TADPOLE3GX | 336 +
sys/arch/sparc/conf/files.sparc | 9 +-
sys/arch/sparc/dev/cgsix.c | 6 +-
sys/arch/sparc/dev/com_obio.c | 178 +
sys/arch/sparc/dev/if_ie_obio.c | 5 +-
sys/arch/sparc/dev/p9100.c | 509 ++
sys/arch/sparc/dev/vme_machdep.c | 4 +-
sys/arch/sparc/include/conf.h | 5 +-
sys/arch/sparc/include/fbio.h | 5 +-
sys/arch/sparc/include/lock.h | 42 +-
sys/arch/sparc/include/pmap.h | 8 +-
sys/arch/sparc/sparc/conf.c | 7 +-
sys/arch/sparc/sparc/iommu.c | 10 +-
sys/arch/sparc/sparc/machdep.c | 5 +-
sys/arch/sparc/sparc/pmap.c | 45 +-
sys/arch/sparc/sparc/vm_machdep.c | 8 +-
102 files changed, 4477 insertions(+), 3316 deletions(-)
diffs (truncated from 11203 to 300 lines):
diff -r afd5b4aa530c -r 2f0fa69c9ae0 sys/arch/mvme68k/conf/GENERIC
--- a/sys/arch/mvme68k/conf/GENERIC Mon Aug 02 19:46:09 1999 +0000
+++ b/sys/arch/mvme68k/conf/GENERIC Mon Aug 02 19:57:20 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1 1999/02/20 00:18:49 scw Exp $
+# $NetBSD: GENERIC,v 1.1.4.1 1999/08/02 19:57:20 thorpej Exp $
include "arch/mvme68k/conf/std.mvme68k"
@@ -36,7 +36,7 @@
#options TPIP
#options EON
-options COMPAT_09, COMPAT_10, COMPAT_11, COMPAT_12, COMPAT_13
+options COMPAT_09, COMPAT_10, COMPAT_11, COMPAT_12, COMPAT_13, COMPAT_14
options COMPAT_SUNOS
#options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries
#options COMPAT_LINUX # compatibility with Linux/m68k binaries
diff -r afd5b4aa530c -r 2f0fa69c9ae0 sys/arch/mvme68k/conf/GENERIC.v6
--- a/sys/arch/mvme68k/conf/GENERIC.v6 Mon Aug 02 19:46:09 1999 +0000
+++ b/sys/arch/mvme68k/conf/GENERIC.v6 Mon Aug 02 19:57:20 1999 +0000
@@ -1,10 +1,21 @@
-# $NetBSD: GENERIC.v6,v 1.1.2.2 1999/07/01 23:13:52 thorpej Exp $
+# $NetBSD: GENERIC.v6,v 1.1.2.3 1999/08/02 19:57:20 thorpej Exp $
#
# GENERIC.v6 -- IPv6 variant of GENERIC. should be in GENERIC.
#
include "arch/mvme68k/conf/GENERIC"
+# Pull in config fragments for kernel crypto. Use only one of these,
+# and adjust the prefixes as necessary.
+
+#prefix ../crypto-us/sys
+#cinclude "conf/files.crypto-us"
+#prefix
+
+#prefix ../crypto-intl/sys
+#cinclude "conf/files.crypto-intl"
+#prefix
+
# IPv6 options
options INET6 # IPV6
options IPSEC # IP security
diff -r afd5b4aa530c -r 2f0fa69c9ae0 sys/arch/mvme68k/conf/Makefile.mvme68k
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k Mon Aug 02 19:46:09 1999 +0000
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k Mon Aug 02 19:57:20 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mvme68k,v 1.39 1999/01/15 23:37:06 thorpej Exp $
+# $NetBSD: Makefile.mvme68k,v 1.39.6.1 1999/08/02 19:57:20 thorpej Exp $
# Makefile for NetBSD
#
@@ -56,6 +56,8 @@
LINKFLAGS= -n -Ttext 8000 -e start
STRIPFLAGS= -d
+%INCLUDES
+
HOSTED_CC= ${CC}
HOSTED_CPPFLAGS=${CPPFLAGS:S/^-nostdinc$//}
HOSTED_CFLAGS= ${CFLAGS}
@@ -112,8 +114,9 @@
.if ${DEBUG} == "-g"
LINKFLAGS+= -X
SYSTEM_LD_TAIL+=; \
- echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
- echo ${STRIP} ${STRIPFLAGS} $@; ${STRIP} ${STRIPFLAGS} $@
+ echo mv -f $@ $@.gdb; mv -f $@ $@.gdb; \
+ echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
+ ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
LINKFLAGS+= -S
.endif
diff -r afd5b4aa530c -r 2f0fa69c9ae0 sys/arch/mvme68k/conf/VME147
--- a/sys/arch/mvme68k/conf/VME147 Mon Aug 02 19:46:09 1999 +0000
+++ b/sys/arch/mvme68k/conf/VME147 Mon Aug 02 19:57:20 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: VME147,v 1.27 1999/02/20 00:13:43 scw Exp $
+# $NetBSD: VME147,v 1.27.4.1 1999/08/02 19:57:20 thorpej Exp $
include "arch/mvme68k/conf/std.mvme68k"
@@ -33,7 +33,7 @@
#options TPIP
#options EON
-options COMPAT_09, COMPAT_10, COMPAT_11, COMPAT_12, COMPAT_13
+options COMPAT_09, COMPAT_10, COMPAT_11, COMPAT_12, COMPAT_13, COMPAT_14
options COMPAT_SUNOS
#options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries
#options COMPAT_LINUX # compatibility with Linux/m68k binaries
diff -r afd5b4aa530c -r 2f0fa69c9ae0 sys/arch/mvme68k/conf/VME167
--- a/sys/arch/mvme68k/conf/VME167 Mon Aug 02 19:46:09 1999 +0000
+++ b/sys/arch/mvme68k/conf/VME167 Mon Aug 02 19:57:20 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: VME167,v 1.3 1999/02/20 00:16:38 scw Exp $
+# $NetBSD: VME167,v 1.3.4.1 1999/08/02 19:57:20 thorpej Exp $
include "arch/mvme68k/conf/std.mvme68k"
@@ -35,7 +35,7 @@
#options TPIP
#options EON
-options COMPAT_13, COMPAT_12
+options COMPAT_14, COMPAT_13, COMPAT_12
#options COMPAT_SUNOS
#options COMPAT_M68K4K # compatibility with NetBSD/m68k4k binaries
diff -r afd5b4aa530c -r 2f0fa69c9ae0 sys/arch/mvme68k/conf/files.mvme68k
--- a/sys/arch/mvme68k/conf/files.mvme68k Mon Aug 02 19:46:09 1999 +0000
+++ b/sys/arch/mvme68k/conf/files.mvme68k Mon Aug 02 19:57:20 1999 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.mvme68k,v 1.24.4.1 1999/06/21 00:52:29 thorpej Exp $
+# $NetBSD: files.mvme68k,v 1.24.4.2 1999/08/02 19:57:21 thorpej Exp $
# config file for mvme68k
@@ -77,7 +77,7 @@
attach vmechip at mainbus with vmetwo
file arch/mvme68k/dev/vme_two.c vmetwo
-include "../../../dev/scsipi/files.scsipi"
+include "dev/scsipi/files.scsipi"
major { sd = 7 }
major { md = 9 }
diff -r afd5b4aa530c -r 2f0fa69c9ae0 sys/arch/mvme68k/dev/if_ie.c
--- a/sys/arch/mvme68k/dev/if_ie.c Mon Aug 02 19:46:09 1999 +0000
+++ b/sys/arch/mvme68k/dev/if_ie.c Mon Aug 02 19:57:20 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ie.c,v 1.2 1999/02/14 17:54:28 scw Exp $ */
+/* $NetBSD: if_ie.c,v 1.2.4.1 1999/08/02 19:57:21 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -236,8 +236,8 @@
sc->sc_reg = PCCTWO_VADDR(pa->pa_offset);
memset(ether_data_buff, 0, ether_data_buff_size);
- sc->sc_iobase = (void *)pmap_extract(pmap_kernel(),
- (vaddr_t)sc->sc_maddr);
+ (void) pmap_extract(pmap_kernel(), (vaddr_t)sc->sc_maddr,
+ (paddr_t *)&sc->sc_iobase);
sc->hwreset = ie_reset;
sc->hwinit = ie_hwinit;
diff -r afd5b4aa530c -r 2f0fa69c9ae0 sys/arch/mvme68k/mvme68k/locore.s
--- a/sys/arch/mvme68k/mvme68k/locore.s Mon Aug 02 19:46:09 1999 +0000
+++ b/sys/arch/mvme68k/mvme68k/locore.s Mon Aug 02 19:57:20 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.s,v 1.48.2.3.2.1 1999/06/21 00:52:32 thorpej Exp $ */
+/* $NetBSD: locore.s,v 1.48.2.3.2.2 1999/08/02 19:57:21 thorpej Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -1530,6 +1530,16 @@
movl sp@(4),d0
| d1 = delay_divisor
movl _C_LABEL(delay_divisor),d1
+ jra L_delay /* Jump into the loop! */
+
+ /*
+ * Align the branch target of the loop to a half-line (8-byte)
+ * boundary to minimize cache effects. This guarantees both
+ * that there will be no prefetch stalls due to cache line burst
+ * operations and that the loop will run from a single cache
+ * half-line.
+ */
+ .align 8
L_delay:
subl d1,d0
jgt L_delay
diff -r afd5b4aa530c -r 2f0fa69c9ae0 sys/arch/mvme68k/mvme68k/pmap.c
--- a/sys/arch/mvme68k/mvme68k/pmap.c Mon Aug 02 19:46:09 1999 +0000
+++ b/sys/arch/mvme68k/mvme68k/pmap.c Mon Aug 02 19:57:20 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.30.2.2.2.1 1999/06/21 00:52:33 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.30.2.2.2.2 1999/08/02 19:57:21 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -425,7 +425,7 @@
panic("pmap_init: can't allocate data structures");
Segtabzero = (st_entry_t *) addr;
- Segtabzeropa = (st_entry_t *) pmap_extract(pmap_kernel(), addr);
+ (void) pmap_extract(pmap_kernel(), addr, (paddr_t *)&Segtabzeropa);
addr += HP_STSIZE;
pv_table = (struct pv_entry *) addr;
@@ -489,7 +489,8 @@
(--kpt_pages)->kpt_next = kpt_free_list;
kpt_free_list = kpt_pages;
kpt_pages->kpt_va = addr2;
- kpt_pages->kpt_pa = pmap_extract(pmap_kernel(), addr2);
+ (void) pmap_extract(pmap_kernel(), addr2,
+ (paddr_t *)&kpt_pages->kpt_pa);
} while (addr != addr2);
PMAP_DPRINTF(PDB_INIT, ("pmap_init: KPT: %ld pages from %lx to %lx\n",
@@ -1352,25 +1353,37 @@
* Extract the physical address associated with the given
* pmap/virtual address pair.
*/
-paddr_t
-pmap_extract(pmap, va)
+boolean_t
+pmap_extract(pmap, va, pap)
pmap_t pmap;
vaddr_t va;
+ paddr_t *pap;
{
+ boolean_t rv = FALSE;
paddr_t pa;
+ u_int pte;
PMAP_DPRINTF(PDB_FOLLOW,
("pmap_extract(%p, %lx) -> ", pmap, va));
- pa = 0;
- if (pmap && pmap_ste_v(pmap, va))
- pa = *pmap_pte(pmap, va);
- if (pa)
- pa = (pa & PG_FRAME) | (va & ~PG_FRAME);
-
- PMAP_DPRINTF(PDB_FOLLOW, ("%lx\n", pa));
-
- return (pa);
+ if (pmap && pmap_ste_v(pmap, va)) {
+ pte = *(u_int *)pmap_pte(pmap, va);
+ if (pte) {
+ pa = (pte & PG_FRAME) | (va & ~PG_FRAME);
+ if (pap != NULL)
+ *pap = pa;
+ rv = TRUE;
+ }
+ }
+#ifdef DEBUG
+ if (pmapdebug & PDB_FOLLOW) {
+ if (rv)
+ printf("%lx\n", pa);
+ else
+ printf("failed\n");
+ }
+#endif
+ return (rv);
}
/*
@@ -1530,7 +1543,7 @@
* We call pmap_remove_entry to take care of invalidating
* ST and Sysptmap entries.
*/
- kpa = pmap_extract(pmap, pv->pv_va);
+ (void) pmap_extract(pmap, pv->pv_va, (paddr_t *)&kpa);
pmap_remove_mapping(pmap, pv->pv_va, PT_ENTRY_NULL,
PRM_TFLUSH|PRM_CFLUSH);
/*
@@ -2192,8 +2205,8 @@
if (pmap->pm_stab == Segtabzero) {
pmap->pm_stab = (st_entry_t *)
uvm_km_zalloc(st_map, HP_STSIZE);
- pmap->pm_stpa = (st_entry_t *)
- pmap_extract(pmap_kernel(), (vaddr_t)pmap->pm_stab);
+ (void) pmap_extract(pmap_kernel(), (vaddr_t)pmap->pm_stab,
+ (paddr_t *)&pmap->pm_stpa);
#if defined(M68040)
if (mmutype == MMU_68040) {
#ifdef DEBUG
diff -r afd5b4aa530c -r 2f0fa69c9ae0 sys/arch/mvme68k/mvme68k/sys_machdep.c
--- a/sys/arch/mvme68k/mvme68k/sys_machdep.c Mon Aug 02 19:46:09 1999 +0000
+++ b/sys/arch/mvme68k/mvme68k/sys_machdep.c Mon Aug 02 19:57:20 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_machdep.c,v 1.17 1999/02/26 22:37:58 is Exp $ */
+/* $NetBSD: sys_machdep.c,v 1.17.4.1 1999/08/02 19:57:22 thorpej Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -177,9 +177,8 @@
*/
if (!doall &&
(pa == 0 || ((int)addr & PGOFSET) == 0)) {
- pa = pmap_extract(p->p_vmspace->vm_map.pmap,
- addr);
- if (pa == 0)
+ if (pmap_extract(p->p_vmspace->vm_map.pmap,
+ addr, &pa) == FALSE)
doall = 1;
}
switch (req) {
diff -r afd5b4aa530c -r 2f0fa69c9ae0 sys/arch/mvme68k/mvme68k/trap.c
--- a/sys/arch/mvme68k/mvme68k/trap.c Mon Aug 02 19:46:09 1999 +0000
+++ b/sys/arch/mvme68k/mvme68k/trap.c Mon Aug 02 19:57:20 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.30 1999/03/26 23:41:32 mycroft Exp $ */
+/* $NetBSD: trap.c,v 1.30.4.1 1999/08/02 19:57:22 thorpej Exp $ */
/*
Home |
Main Index |
Thread Index |
Old Index