 @@ -1,1302 +1,1298 @@
-/*	$NetBSD: pmap.c,v 1.144 2008/12/31 11:37:20 tsutsui Exp $	*/
+/*	$NetBSD: pmap.c,v 1.145 2008/12/31 11:43:26 tsutsui Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Copyright (c) 1991 Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)pmap.c	7.5 (Berkeley) 5/10/91
  */
 /*
  *	AMIGA physical map management code.
  *	For 68020/68030 machines with 68851, or 68030 MMUs
  *	Don't even pay lip service to multiprocessor support.
+ *
  *	right now because of the assumed one-to-one relationship of PT
  *	pages to STEs.
  */
 /*
  *	Manages physical address maps.
+ *
  *	In addition to hardware address maps, this
  *	module is called upon to provide software-use-only
  *	maps which may or may not be stored in the same
  *	form as hardware maps.  These pseudo-maps are
  *	used to store intermediate results from copy
  *	operations to and from address spaces.
+ *
  *	Since the information managed by this module is
  *	also stored by the logical address mapping module,
  *	this module may throw away valid virtual-to-physical
  *	mappings at almost any time.  However, invalidations
  *	of virtual-to-physical mappings must be done as
  *	requested.
+ *
  *	In order to cope with hardware architectures which
  *	make virtual-to-physical map invalidates expensive,
  *	this module may delay invalidate or reduced protection
  *	operations until such time as they are actually
  *	necessary.  This module is given full information as
  *	to which processors are currently using which maps,
  *	and to when physical maps must be made correct.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.144 2008/12/31 11:37:20 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.145 2008/12/31 11:43:26 tsutsui Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/user.h>
 #include <uvm/uvm.h>
 #include <machine/pte.h>
 #include <machine/cpu.h>
 #include <machine/vmparam.h>
 #include <m68k/cacheops.h>
 #include <amiga/amiga/memlist.h>
 /*
  * Allocate various and sundry SYSMAPs used in the days of old VM
  * and not yet converted.  XXX.
  */
 #ifdef DEBUG
 struct kpt_stats {
 	int collectscans;
 	int collectpages;
 	int kpttotal;
 	int kptinuse;
 	int kptmaxuse;
 };
 struct enter_stats {
 	int kernel;	/* entering kernel mapping */
 	int user;	/* entering user mapping */
 	int ptpneeded;	/* needed to allocate a PT page */
 	int pwchange;	/* no mapping change, just wiring or protection */
 	int wchange;	/* no mapping change, just wiring */
 	int mchange;	/* was mapped but mapping to different page */
 	int managed;	/* a managed page */
 	int firstpv;	/* first mapping for this PA */
 	int secondpv;	/* second mapping for this PA */
 	int ci;		/* cache inhibited */
 	int unmanaged;	/* not a managed page */
 	int flushes;	/* cache flushes */
 };
 struct remove_stats {
 	int calls;
 	int removes;
 	int pvfirst;
 	int pvsearch;
 	int ptinvalid;
 	int uflushes;
 	int sflushes;
 };
 struct remove_stats remove_stats;
 struct enter_stats enter_stats;
 struct kpt_stats kpt_stats;
 #define PDB_FOLLOW	0x0001
 #define PDB_INIT	0x0002
 #define PDB_ENTER	0x0004
 #define PDB_REMOVE	0x0008
 #define PDB_CREATE	0x0010
 #define PDB_PTPAGE	0x0020
 #define PDB_CACHE	0x0040
 #define PDB_BITS	0x0080
 #define PDB_COLLECT	0x0100
 #define PDB_PROTECT	0x0200
 #define PDB_SEGTAB	0x0400
 #define PDB_PARANOIA	0x2000
 #define PDB_WIRING	0x4000
 #define PDB_PVDUMP	0x8000
 int debugmap = 0;
 int pmapdebug = PDB_PARANOIA;
 #define	PMAP_DPRINTF(l, x)	if (pmapdebug & (l)) printf x
 static void	pmap_check_wiring(const char *, vaddr_t);
 static void	pmap_pvdump(paddr_t);
 #else
 #define	PMAP_DPRINTF(l, x)
 #endif
 /*
  * Get STEs and PTEs for user/kernel address space
  */
 #if defined(M68040) || defined(M68060)
 #if defined(M68020) || defined(M68030)
 #define	pmap_ste(m, v)	(&((m)->pm_stab[(vaddr_t)(v) \
 	>> (mmutype == MMU_68040 ? SG4_SHIFT1 : SG_ISHIFT)]))
 #else
 #define	pmap_ste(m, v)	(&((m)->pm_stab[(vaddr_t)(v) >> SG4_SHIFT1]))
 #endif
 #define	pmap_ste1(m, v) (&((m)->pm_stab[(vaddr_t)(v) >> SG4_SHIFT1]))
 /* XXX assumes physically contiguous ST pages (if more than one) */
 #define	pmap_ste2(m, v) \
 	(&((m)->pm_stab[(st_entry_t *)(*(u_int *)pmap_ste1(m,v) & SG4_ADDR1) \
 			- (m)->pm_stpa + (((v) & SG4_MASK2) >> SG4_SHIFT2)]))
 #define	pmap_ste_v(m, v) \
 	(mmutype == MMU_68040		\
 	? ((*pmap_ste1(m, v) & SG_V) &&	\
 	   (*pmap_ste2(m, v) & SG_V))	\
 	: (*pmap_ste(m, v) & SG_V))
 #else	/* defined(M68040) || defined(M68060) */
 #define	pmap_ste(m, v)	(&((m)->pm_stab[(vaddr_t)(v) >> SG_ISHIFT]))
 #define pmap_ste_v(m, v)	(*pmap_ste(m, v) & SG_V)
 #endif	/* defined(M68040) || defined(M68060) */
 #define pmap_pte(m, v)	(&((m)->pm_ptab[(vaddr_t)(v) >> PG_SHIFT]))
 #define pmap_pte_pa(pte)	(*(u_int *)(pte) & PG_FRAME)
 #define pmap_pte_w(pte)		(*(u_int *)(pte) & PG_W)
 #define pmap_pte_ci(pte)	(*(u_int *)(pte) & PG_CI)
 #define pmap_pte_m(pte)		(*(u_int *)(pte) & PG_M)
 #define pmap_pte_u(pte)		(*(u_int *)(pte) & PG_U)
 #define pmap_pte_prot(pte)	(*(u_int *)(pte) & PG_PROT)
 #define pmap_pte_v(pte)		(*(u_int *)(pte) & PG_V)
 #define pmap_pte_set_w(pte, v) \
     do { if (v) *(u_int *)(pte) |= PG_W; else *(u_int *)(pte) &= ~PG_W; \
     } while (0)
 #define pmap_pte_set_prot(pte, v) \
     do { if (v) *(u_int *)(pte) |= PG_PROT; else *(u_int *)(pte) &= ~PG_PROT; \
     } while (0)
 #define pmap_pte_w_chg(pte, nw)		((nw) ^ pmap_pte_w(pte))
 #define pmap_pte_prot_chg(pte, np)	((np) ^ pmap_pte_prot(pte))
 #define active_pmap(pm)	\
     ((pm) == pmap_kernel() || (pm) == curproc->p_vmspace->vm_map.pmap)
 /*
  * Given a map and a machine independent protection code,
  * convert to a vax protection code.
  */
 #define pte_prot(m, p)	(protection_codes[p])
 int	protection_codes[8];
 /*
  * Kernel page table page management.
+ *
  * One additional page of KPT allows for 16 MB of virtual buffer cache.
  * A GENERIC kernel allocates this for 2 MB of real buffer cache,
  * which in turn is allocated for 38 MB of RAM.
  * We add one per 16 MB of RAM to allow for tuning the machine-independent
  * options.
  */
 #ifndef NKPTADDSHIFT
 #define NKPTADDSHIFT 24
 #endif
 struct kpt_page {
 	struct kpt_page *kpt_next;	/* link on either used or free list */
 	vaddr_t		kpt_va;		/* always valid kernel VA */
 	paddr_t		kpt_pa;		/* PA of this page (for speed) */
 };
 struct kpt_page *kpt_free_list, *kpt_used_list;
 struct kpt_page *kpt_pages;
 /*
  * Kernel segment/page table and page table map.
  * The page table map gives us a level of indirection we need to dynamically
  * expand the page table.  It is essentially a copy of the segment table
  * with PTEs instead of STEs.  All are initialized in locore at boot time.
  * Sysmap will initially contain VM_KERNEL_PT_PAGES pages of PTEs.
  * Segtabzero is an empty segment table which all processes share til they
  * reference something.
  */
 st_entry_t	*Sysseg;
 pt_entry_t	*Sysmap, *Sysptmap;
 st_entry_t	*Segtabzero, *Segtabzeropa;
 vsize_t		Sysptsize = VM_KERNEL_PT_PAGES;
 struct pv_entry	*pv_table;	/* array of entries, one per page */
 static struct pmap kernel_pmap_store;
 struct pmap	*const kernel_pmap_ptr = &kernel_pmap_store;
 struct vm_map	*pt_map;
 struct vm_map_kernel pt_map_store;
 paddr_t		avail_start;	/* PA of first available physical page */
 paddr_t		avail_end;	/* PA of last available physical page */
 vsize_t		mem_size;	/* memory size in bytes */
 vaddr_t		virtual_avail;  /* VA of first avail page (after kernel bss)*/
 vaddr_t		virtual_end;	/* VA of last avail page (end of kernel AS) */
 int		page_cnt;	/* number of pages managed by the VM system */
 bool		pmap_initialized = false;	/* Has pmap_init completed? */
 char		*pmap_attributes;	/* reference and modify bits */
 TAILQ_HEAD(pv_page_list, pv_page) pv_page_freelist;
 int		pv_nfree;
 #if defined(M68040) || defined(M68060)
 int		protostfree;	/* prototype (default) free ST map */
 #endif
 pt_entry_t	*caddr1_pte;	/* PTE for CADDR1 */
 pt_entry_t	*caddr2_pte;	/* PTE for CADDR2 */
 extern void *	msgbufaddr;
 extern paddr_t	msgbufpa;
 u_long	noncontig_enable;
 extern const vaddr_t amiga_uptbase;
 extern paddr_t z2mem_start;
 extern vaddr_t reserve_dumppages(vaddr_t);
 bool		pmap_testbit(paddr_t, int);
 int		pmap_enter_ptpage(pmap_t, vaddr_t, bool);
 static void	pmap_ptpage_addref(vaddr_t);
 static int	pmap_ptpage_delref(vaddr_t);
 static void	pmap_changebit(vaddr_t, int, bool);
 struct pv_entry * pmap_alloc_pv(void);
 void		pmap_free_pv(struct pv_entry *);
 void		pmap_pinit(pmap_t);
 void		pmap_release(pmap_t);
 static void	pmap_remove_mapping(pmap_t, vaddr_t, pt_entry_t *, int);
 void		pmap_collect1(pmap_t, paddr_t, paddr_t);
 /* pmap_remove_mapping flags */
 #define		PRM_TFLUSH	0x01
 #define		PRM_CFLUSH	0x02
 #define		PRM_KEEPPTPAGE	0x04
 /*
  * All those kernel PT submaps that BSD is so fond of
  */
 void 	*CADDR1, *CADDR2;
 char	*vmmap;
 #define	PAGE_IS_MANAGED(pa)	(pmap_initialized			\
 				 && vm_physseg_find(atop((pa)), NULL) != -1)
 static inline struct pv_entry *pa_to_pvh(paddr_t pa);
 static inline char *pa_to_attribute(paddr_t pa);
 static inline struct pv_entry *
 pa_to_pvh(paddr_t pa)
+{
 	int bank, pg = 0;	/* XXX gcc4 -Wuninitialized */
 	bank = vm_physseg_find(atop((pa)), &pg);
 	return &vm_physmem[bank].pmseg.pvent[pg];
+}
 static inline char *
 pa_to_attribute(paddr_t pa)
+{
 	int bank, pg = 0;	/* XXX gcc4 -Wuninitialized */
 	bank = vm_physseg_find(atop((pa)), &pg);
 	return &vm_physmem[bank].pmseg.attrs[pg];
+}
 /*
  *	Initialize the pmap module.
  *	Called by vm_init, to initialize any structures that the pmap
  *	system needs to map virtual memory.
  */
 void
 pmap_init()
+{
 	vaddr_t		addr, addr2;
 	vsize_t		s;
 	u_int		npg;
 	struct pv_entry *pv;
 	char            *attr;
 	int             rv, bank;
 #if defined(M68060)
 	struct kpt_page *kptp;
 	paddr_t		paddr;
 #endif
 #ifdef DEBUG
 	if (pmapdebug & PDB_FOLLOW)
 		printf("pmap_init()\n");
 #endif
 	/*
 	 * Before we do anything else, initialize the PTE pointers
 	 * used by pmap_zero_page() and pmap_copy_page().
 	 */
 	caddr1_pte = pmap_pte(pmap_kernel(), CADDR1);
 	caddr2_pte = pmap_pte(pmap_kernel(), CADDR2);
 #ifdef DEBUG
 	if (pmapdebug & PDB_INIT) {
 		printf("pmap_init: Sysseg %p, Sysmap %p, Sysptmap %p\n",
 		    Sysseg, Sysmap, Sysptmap);
 		printf("  pstart %lx, pend %lx, vstart %lx, vend %lx\n",
 		    avail_start, avail_end, virtual_avail, virtual_end);
+	}
 #endif
 	/*
 	 * Allocate memory for random pmap data structures.  Includes the
 	 * initial segment table, pv_head_table and pmap_attributes.
 	 */
 	for (page_cnt = 0, bank = 0; bank < vm_nphysseg; bank++) {
 		page_cnt += vm_physmem[bank].end - vm_physmem[bank].start;
 #ifdef DEBUG
 		printf("pmap_init: %2d: %08lx - %08lx (%10d)\n", bank,
 		    vm_physmem[bank].start << PGSHIFT,
 		    vm_physmem[bank].end << PGSHIFT, page_cnt << PGSHIFT);
 #endif
+	}
 	s = M68K_STSIZE;				/* Segtabzero */
 	s += page_cnt * sizeof(struct pv_entry);	/* pv table */
 	s += page_cnt * sizeof(char);			/* attribute table */
 	s = round_page(s);
 	addr = uvm_km_alloc(kernel_map, s, 0, UVM_KMF_WIRED | UVM_KMF_ZERO);
 	if (addr == 0)
 		panic("pmap_init: can't allocate data structures");
 	Segtabzero = (u_int *) addr;
 	(void) pmap_extract(pmap_kernel(), addr, (paddr_t *)(void *)&Segtabzeropa);
 	addr += M68K_STSIZE;
 	pv_table = (struct pv_entry *) addr;
 	addr += page_cnt * sizeof(struct pv_entry);
 	pmap_attributes = (char *) addr;
 #ifdef DEBUG
 	if (pmapdebug & PDB_INIT)
 		printf("pmap_init: %lx bytes: page_cnt %x s0 %p(%p) "
 			"tbl %p atr %p\n",
 			s, page_cnt, Segtabzero, Segtabzeropa,
 			pv_table, pmap_attributes);
 #endif
 	/*
 	 * Now that the pv and attribute tables have been allocated,
 	 * assign them to the memory segments.
 	 */
 	pv = pv_table;
 	attr = pmap_attributes;
 	for (bank = 0; bank < vm_nphysseg; bank++) {
 		npg = vm_physmem[bank].end - vm_physmem[bank].start;
 		vm_physmem[bank].pmseg.pvent = pv;
 		vm_physmem[bank].pmseg.attrs = attr;
 		pv += npg;
 		attr += npg;
+	}
 	/*
 	 * Allocate physical memory for kernel PT pages and their management.
 	 * we need enough pages to map the page tables for each process
 	 * plus some slop.
 	 */
 	npg = howmany(((maxproc + 16) * M68K_MAX_PTSIZE / NPTEPG), PAGE_SIZE);
 #ifdef NKPTADD
 	npg += NKPTADD;
 #else
 	npg += mem_size >> NKPTADDSHIFT;
 #endif
 #if 1/*def DEBUG*/
 	printf("Maxproc %d, mem_size %ld MB: allocating %d KPT pages\n",
 	    maxproc, mem_size>>20, npg);
 #endif
 	s = ptoa(npg) + round_page(npg * sizeof(struct kpt_page));
 	/*
 	 * Verify that space will be allocated in region for which
 	 * we already have kernel PT pages.
 	 */
 	addr = 0;
 	rv = uvm_map(kernel_map, &addr, s, NULL, UVM_UNKNOWN_OFFSET, 0,
 		     UVM_MAPFLAG(UVM_PROT_NONE, UVM_PROT_NONE, UVM_INH_NONE,
 				 UVM_ADV_RANDOM, UVM_FLAG_NOMERGE));
 	if (rv != 0 || (addr + s) >= (vaddr_t)Sysmap)
 		panic("pmap_init: kernel PT too small");
 	uvm_unmap(kernel_map, addr, addr + s);
 	/*
 	 * Now allocate the space and link the pages together to
 	 * form the KPT free list.
 	 */
 	addr = uvm_km_alloc(kernel_map, s, 0, UVM_KMF_WIRED | UVM_KMF_ZERO);
 	if (addr == 0)
 		panic("pmap_init: cannot allocate KPT free list");
 	s = ptoa(npg);
 	addr2 = addr + s;
 	kpt_pages = &((struct kpt_page *)addr2)[npg];
 	kpt_free_list = NULL;
 	do {
 		addr2 -= PAGE_SIZE;
 		(--kpt_pages)->kpt_next = kpt_free_list;
 		kpt_free_list = kpt_pages;
 		kpt_pages->kpt_va = addr2;
 		(void) pmap_extract(pmap_kernel(), addr2,
 		    (paddr_t *)&kpt_pages->kpt_pa);
 	} while (addr != addr2);
 #ifdef DEBUG
 	kpt_stats.kpttotal = atop(s);
 	if (pmapdebug & PDB_INIT)
 		printf("pmap_init: KPT: %ld pages from %lx to %lx\n",
 		    atop(s), addr, addr + s);
 #endif
 	/*
 	 * Allocate the segment table map and the page table map.
 	 */
 	addr = amiga_uptbase;
 	if (M68K_PTMAXSIZE / M68K_MAX_PTSIZE < maxproc) {
 		s = M68K_PTMAXSIZE;
 		/*
 		 * XXX We don't want to hang when we run out of page
 		 * tables, so we lower maxproc so that fork will fail
 		 * instead.  Note that root could still raise this
 		 * value through sysctl(3).
 		 */
 		maxproc = M68K_PTMAXSIZE / M68K_MAX_PTSIZE;
 	} else
 		s = maxproc * M68K_MAX_PTSIZE;
 	pt_map = uvm_km_suballoc(kernel_map, &addr, &addr2, s, 0,
 	    true, &pt_map_store);
 #if defined(M68040) || defined(M68060)
 	if (mmutype == MMU_68040)
 		protostfree = ~1 & ~(-1 << MAXUL2SIZE);
 #endif /* defined(M68040) || defined(M68060) */
 	/*
 	 * Now it is safe to enable pv_table recording.
 	 */
 	pmap_initialized = true;
 	/*
 	 * Now that this is done, mark the pages shared with the
 	 * hardware page table search as non-CCB (actually, as CI).
+	 *
 	 * XXX Hm. Given that this is in the kernel map, can't we just
 	 * use the va's?
 	 */
 #ifdef M68060
 	if (cputype == CPU_68060) {
 		kptp = kpt_free_list;
 		while (kptp) {
 			pmap_changebit(kptp->kpt_pa, PG_CCB, 0);
 			pmap_changebit(kptp->kpt_pa, PG_CI, 1);
 			kptp = kptp->kpt_next;
+		}
 		paddr = (paddr_t)Segtabzeropa;
 		while (paddr < (paddr_t)Segtabzeropa + M68K_STSIZE) {
 			pmap_changebit(paddr, PG_CCB, 0);
 			pmap_changebit(paddr, PG_CI, 1);
 			paddr += PAGE_SIZE;
+		}
 		DCIS();
+	}
 #endif
+}
 struct pv_entry *
 pmap_alloc_pv()
+{
 	struct pv_page *pvp;
 	struct pv_entry *pv;
 	int i;
 	if (pv_nfree == 0) {
 		pvp = (struct pv_page *)uvm_km_alloc(kernel_map, PAGE_SIZE, 0,
 		    UVM_KMF_WIRED | UVM_KMF_ZERO);
 		if (pvp == 0)
 			panic("pmap_alloc_pv: uvm_km_zalloc() failed");
 		pvp->pvp_pgi.pgi_freelist = pv = &pvp->pvp_pv[1];
 		for (i = NPVPPG - 2; i; i--, pv++)
 			pv->pv_next = pv + 1;
 		pv->pv_next = 0;
 		pv_nfree += pvp->pvp_pgi.pgi_nfree = NPVPPG - 1;
 		TAILQ_INSERT_HEAD(&pv_page_freelist, pvp, pvp_pgi.pgi_list);
 		pv = &pvp->pvp_pv[0];
 	} else {
 		--pv_nfree;
 		pvp = pv_page_freelist.tqh_first;
 		if (--pvp->pvp_pgi.pgi_nfree == 0) {
 			TAILQ_REMOVE(&pv_page_freelist, pvp, pvp_pgi.pgi_list);
+		}
 		pv = pvp->pvp_pgi.pgi_freelist;
 #ifdef DIAGNOSTIC
 		if (pv == 0)
 			panic("pmap_alloc_pv: pgi_nfree inconsistent");
 #endif
 		pvp->pvp_pgi.pgi_freelist = pv->pv_next;
+	}
 	return pv;
+}
 void
 pmap_free_pv(pv)
 	struct pv_entry *pv;
+{
 	struct pv_page *pvp;
 	pvp = (struct pv_page *) trunc_page((vaddr_t)pv);
 	switch (++pvp->pvp_pgi.pgi_nfree) {
 	case 1:
 		TAILQ_INSERT_TAIL(&pv_page_freelist, pvp, pvp_pgi.pgi_list);
 	default:
 		pv->pv_next = pvp->pvp_pgi.pgi_freelist;
 		pvp->pvp_pgi.pgi_freelist = pv;
 		++pv_nfree;
 		break;
 	case NPVPPG:
 		pv_nfree -= NPVPPG - 1;
 		TAILQ_REMOVE(&pv_page_freelist, pvp, pvp_pgi.pgi_list);
 		uvm_km_free(kernel_map, (vaddr_t)pvp, PAGE_SIZE, UVM_KMF_WIRED);
 		break;
+	}
+}
 /*
  *	Used to map a range of physical addresses into kernel
  *	virtual address space.
+ *
  *	For now, VM is already on, we only need to map the
  *	specified memory.
  */
 vaddr_t
 pmap_map(virt, start, end, prot)
 	vaddr_t	virt;
 	paddr_t	start;
 	paddr_t	end;
 	int		prot;
+{
 #ifdef DEBUG
 	if (pmapdebug & PDB_FOLLOW)
 		printf("pmap_map(%lx, %lx, %lx, %x)\n", virt, start, end, prot);
 #endif
 	while (start < end) {
 		pmap_enter(pmap_kernel(), virt, start, prot, 0);
 		virt += PAGE_SIZE;
 		start += PAGE_SIZE;
+	}
 	pmap_update(pmap_kernel());
 	return(virt);
+}
 /*
  *	Create and return a physical map.
+ *
  *	If the size specified for the map
  *	is zero, the map is an actual physical
  *	map, and may be referenced by the
  *	hardware.
+ *
  *	If the size specified is non-zero,
  *	the map will be used in software only, and
  *	is bounded by that size.
  */
 pmap_t
 pmap_create()
+{
 	pmap_t pmap;
 #ifdef DEBUG
 	if (pmapdebug & (PDB_FOLLOW|PDB_CREATE))
 		printf("pmap_create\n");
 #endif
 	pmap = malloc(sizeof(*pmap), M_VMPMAP, M_WAITOK|M_ZERO);
 	pmap_pinit(pmap);
 	return (pmap);
+}
 /*
  * Initialize a preallocated and zeroed pmap structure,
  * such as one in a vmspace structure.
  */
 void
 pmap_pinit(pmap)
 	pmap_t pmap;
+{
 #ifdef DEBUG
 	if (pmapdebug & (PDB_FOLLOW|PDB_CREATE))
 		printf("pmap_pinit(%p)\n", pmap);
 #endif
 	/*
 	 * No need to allocate page table space yet but we do need a
 	 * valid segment table.  Initially, we point everyone at the
 	 * "null" segment table.  On the first pmap_enter, a real
 	 * segment table will be allocated.
 	 */
 	pmap->pm_stab = Segtabzero;
 	pmap->pm_stpa = Segtabzeropa;
 #if defined(M68040) || defined(M68060)
 	if (mmutype == MMU_68040)
 		pmap->pm_stfree = protostfree;
 #endif
 	pmap->pm_count = 1;
+}
 /*
  *	Retire the given physical map from service.
  *	Should only be called if the map contains
  *	no valid mappings.
  */
 void
 pmap_destroy(pmap)
 	pmap_t pmap;
+{
 	int count;
 #ifdef DEBUG
 	if (pmapdebug & PDB_FOLLOW)
 		printf("pmap_destroy(%p)\n", pmap);
 #endif
 	count = --pmap->pm_count;
 	if (count == 0) {
 		pmap_release(pmap);
 		free((void *)pmap, M_VMPMAP);
+	}
+}
 /*
  * Release any resources held by the given physical map.
  * Called when a pmap initialized by pmap_pinit is being released.
  * Should only be called if the map contains no valid mappings.
  */
 void
 pmap_release(pmap)
 	pmap_t pmap;
+{
 #ifdef DEBUG
 	if (pmapdebug & PDB_FOLLOW)
 		printf("pmap_release(%p)\n", pmap);
 #endif
 #ifdef notdef /* DIAGNOSTIC */
 	/* count would be 0 from pmap_destroy... */
 	if (pmap->pm_count != 1)
 		panic("pmap_release count");
 #endif
 	if (pmap->pm_ptab) {
 		pmap_remove(pmap_kernel(), (vaddr_t)pmap->pm_ptab,
 		    (vaddr_t)pmap->pm_ptab + M68K_MAX_PTSIZE);
 		uvm_km_pgremove((vaddr_t)pmap->pm_ptab,
 		    (vaddr_t)pmap->pm_ptab + M68K_MAX_PTSIZE);
 		uvm_km_free(pt_map, (vaddr_t)pmap->pm_ptab,
 		    M68K_MAX_PTSIZE, UVM_KMF_VAONLY);
+	}
 	KASSERT(pmap->pm_stab == Segtabzero);
+}
 /*
  *	Add a reference to the specified pmap.
  */
 void
 pmap_reference(pmap)
 	pmap_t	pmap;
+{
 #ifdef DEBUG
 	if (pmapdebug & PDB_FOLLOW)
 		printf("pmap_reference(%p)\n", pmap);
 #endif
 	if (pmap != NULL) {
 		pmap->pm_count++;
+	}
+}
 /*
  *	Remove the given range of addresses from the specified map.
+ *
  *	It is assumed that the start and end are properly
  *	rounded to the page size.
  */
 void
 pmap_remove(pmap, sva, eva)
 	pmap_t pmap;
 	vaddr_t sva, eva;
+{
 	paddr_t pa;
 	vaddr_t va;
 	u_int *pte;
 	int flags;
 #ifdef DEBUG
 	if (pmapdebug & (PDB_FOLLOW|PDB_REMOVE|PDB_PROTECT))
 		printf("pmap_remove(%p, %lx, %lx)\n", pmap, sva, eva);
 	remove_stats.calls++;
 #endif
 	flags = active_pmap(pmap) ? PRM_TFLUSH : 0;
 	for (va = sva; va < eva; va += PAGE_SIZE) {
 		/*
 		 * Weed out invalid mappings.
 		 * Note: we assume that the segment table is always allocated.
 		 */
 		if (!pmap_ste_v(pmap, va)) {
 			/* XXX: avoid address wrap around */
 			if (va >= m68k_trunc_seg((vaddr_t)-1))
 				break;
 			va = m68k_round_seg(va + PAGE_SIZE) - PAGE_SIZE;
 			continue;
+		}
 		pte = pmap_pte(pmap, va);
 		pa = pmap_pte_pa(pte);
 		if (pa == 0)
 			continue;
 		pmap_remove_mapping(pmap, va, pte, flags);
+	}
+}
 /*
  *	pmap_page_protect:
+ *
  *	Lower the permission for all mappings to a given page.
  */
 void
 pmap_page_protect(pg, prot)
 	struct vm_page *pg;
 	vm_prot_t	prot;
+{
 	struct pv_entry *pv;
 	int s;
 	paddr_t	pa = VM_PAGE_TO_PHYS(pg);
 #ifdef DEBUG
 	if ((pmapdebug & (PDB_FOLLOW|PDB_PROTECT)) ||
 	    (prot == VM_PROT_NONE && (pmapdebug & PDB_REMOVE)))
 		printf("pmap_page_protect(%lx, %x)\n", pa, prot);
 #endif
 	switch (prot) {
 	case VM_PROT_ALL:
 		break;
 	/* copy_on_write */
 	case VM_PROT_READ:
 	case VM_PROT_READ|VM_PROT_EXECUTE:
 		pmap_changebit(pa, PG_RO, true);
 		break;
 	/* remove_all */
 	default:
 		pv = pa_to_pvh(pa);
 		s = splvm();
 		while (pv->pv_pmap != NULL) {
 			pt_entry_t  *pte;
 			pte = pmap_pte(pv->pv_pmap, pv->pv_va);
 #ifdef DEBUG
 			if (!pmap_ste_v(pv->pv_pmap,pv->pv_va) ||
 			    pmap_pte_pa(pte) != pa)
+{
     printf ("pmap_page_protect: va %lx, pmap_ste_v %d pmap_pte_pa %08x/%lx\n",
 	pv->pv_va, pmap_ste_v(pv->pv_pmap,pv->pv_va),
 	pmap_pte_pa(pmap_pte(pv->pv_pmap,pv->pv_va)),pa);
     printf (" pvh %p pv %p pv_next %p\n", pa_to_pvh(pa), pv, pv->pv_next);
 			panic("pmap_page_protect: bad mapping");
+}
 #endif
 			pmap_remove_mapping(pv->pv_pmap, pv->pv_va,
 			    pte, PRM_TFLUSH|PRM_CFLUSH);
+		}
 		splx(s);
 		break;
+	}
+}
 /*
  *	Set the physical protection on the
  *	specified range of this map as requested.
  */
 void
 pmap_protect(pmap, sva, eva, prot)
 	pmap_t pmap;
 	vaddr_t	sva, eva;
 	vm_prot_t prot;
+{
 	u_int *pte;
 	vaddr_t va;
 	bool needtflush;
 	int isro;
 #ifdef DEBUG
 	if (pmapdebug & (PDB_FOLLOW|PDB_PROTECT))
 		printf("pmap_protect(%p, %lx, %lx, %x)\n", pmap, sva, eva, prot);
 #endif
 	if ((prot & VM_PROT_READ) == VM_PROT_NONE) {
 		pmap_remove(pmap, sva, eva);
 		return;
+	}
 	pte = pmap_pte(pmap, sva);
 	isro = pte_prot(pmap, prot) == PG_RO ? 1 : 0;
 	needtflush = active_pmap(pmap);
 	for (va = sva; va < eva; va += PAGE_SIZE) {
 		/*
 		 * Page table page is not allocated.
 		 * Skip it, we don't want to force allocation
 		 * of unnecessary PTE pages just to set the protection.
 		 */
 		if (!pmap_ste_v(pmap, va)) {
 			/* XXX: avoid address wrap around */
 			if (va >= m68k_trunc_seg((vaddr_t)-1))
 				break;
 			va = m68k_round_seg(va + PAGE_SIZE) - PAGE_SIZE;
 			pte = pmap_pte(pmap, va);
 			pte++;
 			continue;
+		}
 		/*
 		 * skip if page not valid or protection is same
 		 */
 		if (!pmap_pte_v(pte) || !pmap_pte_prot_chg(pte, isro)) {
 			pte++;
 			continue;
+		}
 #if defined(M68040) || defined(M68060)
 		/*
 		 * Clear caches if making RO (see section
 		 * "7.3 Cache Coherency" in the manual).
 		 */
 		if (isro && mmutype == MMU_68040) {
 			paddr_t pa = pmap_pte_pa(pte);
 			DCFP(pa);
 			ICPP(pa);
+		}
 #endif
 		pmap_pte_set_prot(pte, isro);
 		if (needtflush)
 			TBIS(va);
 		pte++;
+	}
+}
 /*
  *	Insert the given physical page (p) at
  *	the specified virtual address (v) in the
  *	target physical map with the protection requested.
+ *
  *	If specified, the page will be wired down, meaning
  *	that the related pte can not be reclaimed.
+ *
  *	NB:  This is the only routine which MAY NOT lazy-evaluate
  *	or lose information.  That is, this routine must actually
  *	insert this page into the given map NOW.
  */
 extern int kernel_copyback;
 int
 pmap_enter(pmap, va, pa, prot, flags)
 	pmap_t pmap;
 	vaddr_t va;
 	paddr_t pa;
 	vm_prot_t prot;
 	int flags;
+{
 	u_int *pte;
 	int npte;
 	paddr_t opa;
 	bool cacheable = true;
 	bool checkpv = true;
 	bool wired = (flags & PMAP_WIRED) != 0;
 	bool can_fail = (flags & PMAP_CANFAIL) != 0;
 #ifdef DEBUG
 	if (pmapdebug & (PDB_FOLLOW|PDB_ENTER))
 		printf("pmap_enter(%p, %lx, %lx, %x, %x)\n",
 		    pmap, va, pa, prot, wired);
 	if (pmap == pmap_kernel())
 		enter_stats.kernel++;
 	else
 		enter_stats.user++;
 #endif
 	/*
 	 * For user mapping, allocate kernel VM resources if necessary.
 	 */
 	if (pmap->pm_ptab == NULL)
 		pmap->pm_ptab = (pt_entry_t *)
 		    uvm_km_alloc(pt_map, M68K_MAX_PTSIZE, 0,
 		    UVM_KMF_VAONLY |
 		    (can_fail ? UVM_KMF_NOWAIT : UVM_KMF_WAITVA));
 		if (pmap->pm_ptab == NULL)
 			return ENOMEM;
 	/*
 	 * Segment table entry not valid, we need a new PT page
 	 */
 	if (!pmap_ste_v(pmap, va)) {
 		int err = pmap_enter_ptpage(pmap, va, can_fail);
 		if (err)
 			return err;
+	}
 	pte = pmap_pte(pmap, va);
 	opa = pmap_pte_pa(pte);
 #ifdef DEBUG
 	if (pmapdebug & PDB_ENTER)
 		printf("enter: pte %p, *pte %x\n", pte, *(int *)pte);
 #endif
 	/*
 	 * Mapping has not changed, must be protection or wiring change.
 	 */
 	if (opa == pa) {
 #ifdef DEBUG
 		enter_stats.pwchange++;
 #endif
 		/*
 		 * Wiring change, just update stats.
 		 * We don't worry about wiring PT pages as they remain
 		 * resident as long as there are valid mappings in them.
 		 * Hence, if a user page is wired, the PT page will be also.
 		 */
 		if ((wired && !pmap_pte_w(pte)) || (!wired && pmap_pte_w(pte))){
 #ifdef DEBUG
 			if (pmapdebug & PDB_ENTER)
 				printf("enter: wiring change -> %x\n", wired);
 #endif
 			if (wired)
 				pmap->pm_stats.wired_count++;
 			else
 				pmap->pm_stats.wired_count--;
 #ifdef DEBUG
 			enter_stats.wchange++;
 #endif
+		}
 		/*
 		 * Retain cache inhibition status
 		 */
 		checkpv = false;
 		if (pmap_pte_ci(pte))
 			cacheable = false;
 		goto validate;
+	}
 	/*
 	 * Mapping has changed, invalidate old range and fall through to
 	 * handle validating new mapping.
 	 */
 	if (opa) {
 #ifdef DEBUG
 		if (pmapdebug & PDB_ENTER)
 			printf("enter: removing old mapping %lx\n", va);
 #endif
 		pmap_remove_mapping(pmap, va, pte,
 			PRM_TFLUSH|PRM_CFLUSH|PRM_KEEPPTPAGE);
 #ifdef DEBUG
 		enter_stats.mchange++;
 #endif
+	}
 	/*
 	 * If this is a new user mapping, increment the wiring count
 	 * on this PT page.  PT pages are wired down as long as there
 	 * is a valid mapping in the page.
 	 */
 	if (pmap != pmap_kernel())
 		pmap_ptpage_addref(trunc_page((vaddr_t)pte));
 	/*
 	 * Enter on the PV list if part of our managed memory
 	 * Note that we raise IPL while manipulating pv_table
 	 * since pmap_enter can be called at interrupt time.
 	 */
 	if (PAGE_IS_MANAGED(pa)) {
 		struct pv_entry *pv, *npv;
 		int s;
 #ifdef DEBUG
 		enter_stats.managed++;
 #endif
 		pv = pa_to_pvh(pa);
 		s = splvm();
 #ifdef DEBUG
 		if (pmapdebug & PDB_ENTER)
 			printf("enter: pv at %p: %lx/%p/%p\n",
 			       pv, pv->pv_va, pv->pv_pmap, pv->pv_next);
 #endif
 		/*
 		 * No entries yet, use header as the first entry
 		 */
 		if (pv->pv_pmap == NULL) {
 #ifdef DEBUG
 			enter_stats.firstpv++;
 #endif
 			pv->pv_va = va;
 			pv->pv_pmap = pmap;
 			pv->pv_next = NULL;
 			pv->pv_ptste = NULL;
 			pv->pv_ptpmap = NULL;
 			pv->pv_flags = 0;
+		}
 		/*
 		 * There is at least one other VA mapping this page.
 		 * Place this entry after the header.
 		 */
 		else {
 #ifdef DEBUG
 			for (npv = pv; npv; npv = npv->pv_next)
 				if (pmap == npv->pv_pmap && va == npv->pv_va)
 					panic("pmap_enter: already in pv_tab");
 #endif
 			npv = pmap_alloc_pv();
 			npv->pv_va = va;
 			npv->pv_pmap = pmap;
 			npv->pv_next = pv->pv_next;
 			npv->pv_ptste = NULL;
 			npv->pv_ptpmap = NULL;
 			pv->pv_next = npv;
 #ifdef DEBUG
 			if (!npv->pv_next)
 				enter_stats.secondpv++;
 #endif
+		}
 		splx(s);
+	}
 	/*
 	 * Assumption: if it is not part of our managed memory
 	 * then it must be device memory which may be volitile.
 	 */
 	else if (pmap_initialized) {
 		checkpv = cacheable = false;
 #ifdef DEBUG
 		enter_stats.unmanaged++;
 #endif
+	}
 	/*
 	 * Increment counters
 	 */
 	pmap->pm_stats.resident_count++;
 	if (wired)
 		pmap->pm_stats.wired_count++;
 validate:
 	/*
 	 * Now validate mapping with desired protection/wiring.
 	 * Assume uniform modified and referenced status for all
 	 * AMIGA pages in a MACH page.
 	 */
 #if defined(M68040) || defined(M68060)
 #if DEBUG
 	if (pmapdebug & 0x10000 && mmutype == MMU_68040 &&
 	    pmap == pmap_kernel()) {
 		const char *s;
 		struct proc *cp = curproc;
 		if (va >= amiga_uptbase &&
 		    va < (amiga_uptbase + M68K_PTMAXSIZE))
 			s = "UPT";
 		else if (va >= (u_int)Sysmap &&
 		    va < ((u_int)Sysmap + M68K_MAX_KPTSIZE))
 			s = "KPT";
 		else if (va >= (u_int)pmap->pm_stab &&
 		    va < ((u_int)pmap->pm_stab + M68K_STSIZE))
 			s = "KST";
 		else if (cp &&
 		    va >= (u_int)cp->p_vmspace->vm_map.pmap->pm_stab &&
 		    va < ((u_int)cp->p_vmspace->vm_map.pmap->pm_stab +
 		    M68K_STSIZE))
 			s = "UST";
 		else
 			s = "other";
 		printf("pmap_init: validating %s kernel page at %lx -> %lx\n",
 		    s, va, pa);
+	}
 #endif
 	if (mmutype == MMU_68040 && pmap == pmap_kernel() && (
 	    (va >= amiga_uptbase && va < (amiga_uptbase + M68K_PTMAXSIZE)) ||
 	    (va >= (u_int)Sysmap && va < ((u_int)Sysmap + M68K_MAX_KPTSIZE))))
 		cacheable = false;	/* don't cache user page tables */
 #endif
 	npte = (pa & PG_FRAME) | pte_prot(pmap, prot) | PG_V;
 	npte |= (*(int *)pte & (PG_M|PG_U));
 	if (wired)
 		npte |= PG_W;
 	if (!checkpv && !cacheable)
 #if defined(M68060) && defined(NO_SLOW_CIRRUS)
 #if defined(M68040) || defined(M68030) || defined(M68020)
 		npte |= (cputype == CPU_68060 ? PG_CIN : PG_CI);
 #else
 		npte |= PG_CIN;
 #endif
 #else
 		npte |= PG_CI;
 #endif
 #if defined(M68040) || defined(M68060)
 	else if (mmutype == MMU_68040 && (npte & PG_PROT) == PG_RW &&
 	    (kernel_copyback || pmap != pmap_kernel()))
 		npte |= PG_CCB;		/* cache copyback */
 #endif
 	if (flags & VM_PROT_ALL) {
 		npte |= PG_U;
 		if (flags & VM_PROT_WRITE)
 			npte |= PG_M;
+	}
 	/*
 	 * Remember if this was a wiring-only change.
 	 * If so, we need not flush the TLB and caches.
 	 */
 	wired = ((*(int *)pte ^ npte) == PG_W);
 #if defined(M68040) || defined(M68060)
 	if (mmutype == MMU_68040 && !wired) {
 		DCFP(pa);
 		ICPP(pa);
+	}
 #endif
 #ifdef DEBUG
 	if (pmapdebug & PDB_ENTER)
 		printf("enter: new pte value %x\n", npte);
 #endif
 	*(int *)pte++ = npte;
 	if (!wired && active_pmap(pmap))
 		TBIS(va);
 #ifdef DEBUG
 	if ((pmapdebug & PDB_WIRING) && pmap != pmap_kernel()) {
 		va -= PAGE_SIZE;
 		pmap_check_wiring("enter",
 		    trunc_page((vaddr_t) pmap_pte(pmap, va)));
+	}
 #endif
 	return 0;
+}
 void
 pmap_kenter_pa(va, pa, prot)
 	vaddr_t va;
 	paddr_t pa;
 	vm_prot_t prot;
+{
 	struct pmap *pmap = pmap_kernel();
 	pt_entry_t *pte;
 	int s, npte;
 	PMAP_DPRINTF(PDB_FOLLOW|PDB_ENTER,
 	    ("pmap_kenter_pa(%lx, %lx, %x)\n", va, pa, prot));
 	/*
 	 * Segment table entry not valid, we need a new PT page
 	 */
 	if (!pmap_ste_v(pmap, va)) {
 		s = splvm();
 		pmap_enter_ptpage(pmap, va, false);
 		splx(s);
+	}
 	pa = m68k_trunc_page(pa);
 	pte = pmap_pte(pmap, va);
 	PMAP_DPRINTF(PDB_ENTER, ("enter: pte %p, *pte %x\n", pte, *pte));
 	KASSERT(!pmap_pte_v(pte));
 	/*
 	 * Increment counters
 	 */
 	pmap->pm_stats.resident_count++;
 	pmap->pm_stats.wired_count++;
 	/*
 	 * Build the new PTE.
 	 */
 	npte = pa | pte_prot(pmap, prot) | PG_V | PG_W;
 #if defined(M68040)
 	if (mmutype == MMU_68040 && (npte & (PG_PROT)) == PG_RW)
 		npte |= PG_CCB;
 #endif
 	PMAP_DPRINTF(PDB_ENTER, ("enter: new pte value %x\n", npte));
 #if defined(M68040)
 	if (mmutype == MMU_68040) {
 		DCFP(pa);
 		ICPP(pa);
+	}
 #endif
 	*pte = npte;
+}
 void
 pmap_kremove(va, len)
 	vaddr_t va;
 	vsize_t len;
+{
 	struct pmap *pmap = pmap_kernel();
 	vaddr_t sva, eva, nssva;
 	pt_entry_t *pte;
 	PMAP_DPRINTF(PDB_FOLLOW|PDB_REMOVE|PDB_PROTECT,
 	    ("pmap_kremove(%lx, %lx)\n", va, len));
 	sva = va;
 	eva = va + len;
 	while (sva < eva) {
 		nssva = m68k_trunc_seg(sva) + NBSEG;
 		if (nssva == 0 || nssva > eva)
 			nssva = eva;
 		/*
 		 * If VA belongs to an unallocated segment,
 		 * skip to the next segment boundary.