 @@ -1,1246 +1,1251 @@
-/*	$NetBSD: machdep.c,v 1.191 2014/03/26 16:21:39 isaki Exp $	*/
+/*	$NetBSD: machdep.c,v 1.191.4.1 2015/11/05 20:40:22 riz Exp $	*/
 /*
  * Copyright (c) 1988 University of Utah.
  * Copyright (c) 1982, 1986, 1990, 1993
  *	The 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.
+ *
  * from: Utah $Hdr: machdep.c 1.74 92/12/20$
+ *
  *	@(#)machdep.c	8.10 (Berkeley) 4/20/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.191 2014/03/26 16:21:39 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.191.4.1 2015/11/05 20:40:22 riz Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_compat_netbsd.h"
 #include "opt_fpu_emulate.h"
 #include "opt_m060sp.h"
 #include "opt_modular.h"
 #include "opt_panicbutton.h"
 #include "opt_extmem.h"
 #include "opt_m68k_arch.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/signalvar.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/msgbuf.h>
 #include <sys/ioctl.h>
 #include <sys/tty.h>
 #include <sys/mount.h>
 #include <sys/exec.h>
 #include <sys/exec_aout.h>		/* for MID_* */
 #include <sys/vnode.h>
 #include <sys/syscallargs.h>
 #include <sys/core.h>
 #include <sys/kcore.h>
 #include <sys/ksyms.h>
 #include <sys/module.h>
 #include <sys/cpu.h>
 #include <sys/sysctl.h>
 #include <sys/device.h>
 #include "ksyms.h"
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 #include <sys/exec_elf.h>
 #endif
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
 #include <m68k/cacheops.h>
 #include <machine/reg.h>
 #include <machine/pcb.h>
 #include <machine/psl.h>
 #include <machine/pte.h>
 #include <machine/kcore.h>
 #include <dev/cons.h>
 #include <dev/mm.h>
 #define	MAXMEM	64*1024	/* XXX - from cmap.h */
 #include <uvm/uvm.h>
 #include <machine/bus.h>
 #include <machine/autoconf.h>
 #include <arch/x68k/dev/intiovar.h>
 #include <arch/x68k/x68k/iodevice.h>
 extern void doboot(void) __attribute__((__noreturn__));
 /* the following is used externally (sysctl_hw) */
 char	machine[] = MACHINE;	/* from <machine/param.h> */
 /* Our exported CPU info; we can have only one. */
 struct cpu_info cpu_info_store;
 struct vm_map *phys_map = NULL;
 extern paddr_t avail_start, avail_end;
 extern u_int lowram;
 extern int end, *esym;
 int	maxmem;			/* max memory per process */
 /* prototypes for local functions */
 void	identifycpu(void);
 static int check_emulator(char *, int);
 void	initcpu(void);
 int	cpu_dumpsize(void);
 int	cpu_dump(int (*)(dev_t, daddr_t, void *, size_t), daddr_t *);
 void	cpu_init_kcore_hdr(void);
 /* functions called from locore.s */
 void	x68k_init(void);
 void	dumpsys(void);
 void	straytrap(int, u_short);
 void	nmihand(struct frame);
 void	intrhand(int);
 /* memory probe function called from locore.s */
 void	setmemrange(void);
 #ifdef EXTENDED_MEMORY
 static bool mem_exists(paddr_t, paddr_t);
 #endif
 typedef struct {
 	paddr_t start;
 	paddr_t end;
 } phys_seg_t;
 static int basemem;
 static phys_seg_t phys_basemem_seg;
 #ifdef EXTENDED_MEMORY
 #define EXTMEM_SEGS	(VM_PHYSSEG_MAX - 1)
 static phys_seg_t phys_extmem_seg[EXTMEM_SEGS];
 #endif
 /*
  * On the 68020/68030, the value of delay_divisor is roughly
  * 2048 / cpuspeed (where cpuspeed is in MHz).
+ *
  * On the 68040, the value of delay_divisor is roughly
  * 759 / cpuspeed (where cpuspeed is in MHz).
+ *
  * On the 68060, the value of delay_divisor is reported to be
  * 128 / cpuspeed (where cpuspeed is in MHz).
  */
 int	delay_divisor = 140;	/* assume some reasonable value to start */
 static int cpuspeed;		/* MPU clock (in MHz) */
 /*
  * Machine-dependent crash dump header info.
  */
 cpu_kcore_hdr_t cpu_kcore_hdr;
 static callout_t candbtimer_ch;
 void
 x68k_init(void)
+{
 	u_int i;
 	paddr_t msgbuf_pa;
 	paddr_t s, e;
 	/*
 	 * Most m68k ports allocate msgbuf at the end of available memory
 	 * (i.e. just after avail_end), but on x68k we allocate msgbuf
 	 * at the end of main memory for compatibility.
 	 */
 	msgbuf_pa = phys_basemem_seg.end - m68k_round_page(MSGBUFSIZE);
 	/*
 	 * Tell the VM system about available physical memory.
 	 */
 	/* load the main memory region */
 	s = avail_start;
 	e = msgbuf_pa;
 	uvm_page_physload(atop(s), atop(e), atop(s), atop(e),
 	    VM_FREELIST_MAINMEM);
 #ifdef EXTENDED_MEMORY
 	/* load extended memory regions */
 	for (i = 0; i < EXTMEM_SEGS; i++) {
 		if (phys_extmem_seg[i].start == phys_extmem_seg[i].end)
 			continue;
 		uvm_page_physload(atop(phys_extmem_seg[i].start),
 		    atop(phys_extmem_seg[i].end),
 		    atop(phys_extmem_seg[i].start),
 		    atop(phys_extmem_seg[i].end),
 		    VM_FREELIST_HIGHMEM);
+	}
 #endif
 	/*
 	 * Initialize error message buffer (at end of core).
 	 */
 	for (i = 0; i < btoc(MSGBUFSIZE); i++)
 		pmap_kenter_pa((vaddr_t)msgbufaddr + i * PAGE_SIZE,
 		    msgbuf_pa + i * PAGE_SIZE, VM_PROT_READ|VM_PROT_WRITE, 0);
 	pmap_update(pmap_kernel());
 	initmsgbuf(msgbufaddr, m68k_round_page(MSGBUFSIZE));
+}
 /*
  * Console initialization: called early on from main,
  * before vm init or startup.  Do enough configuration
  * to choose and initialize a console.
  */
 void
 consinit(void)
+{
 	/*
 	 * bring graphics layer up.
 	 */
 	config_console();
 	/*
 	 * Initialize the console before we print anything out.
 	 */
 	cninit();
 #ifdef KGDB
 	zs_kgdb_init();			/* XXX */
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	ksyms_addsyms_elf((int)esym - (int)&end - sizeof(Elf32_Ehdr),
 	    (void *)&end, esym);
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
+}
 /*
  * cpu_startup: allocate memory for variable-sized tables,
  * initialize cpu, and do autoconfiguration.
  */
 void
 cpu_startup(void)
+{
 	vaddr_t minaddr, maxaddr;
 	char pbuf[9];
 #ifdef DEBUG
 	extern int pmapdebug;
 	int opmapdebug = pmapdebug;
 	pmapdebug = 0;
 #endif
 	if (fputype != FPU_NONE)
 		m68k_make_fpu_idle_frame();
 	/*
 	 * Initialize the kernel crash dump header.
 	 */
 	cpu_init_kcore_hdr();
 	/*
 	 * Good {morning,afternoon,evening,night}.
 	 */
 	printf("%s%s", copyright, version);
 	identifycpu();
 	format_bytes(pbuf, sizeof(pbuf), ctob(physmem));
 	printf("total memory = %s\n", pbuf);
 	minaddr = 0;
 	/*
 	 * Allocate a submap for physio
 	 */
 	phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
 	    VM_PHYS_SIZE, 0, false, NULL);
 #ifdef DEBUG
 	pmapdebug = opmapdebug;
 #endif
 	format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free));
 	printf("avail memory = %s\n", pbuf);
 	/*
 	 * Set up CPU-specific registers, cache, etc.
 	 */
 	initcpu();
 	callout_init(&candbtimer_ch, 0);
+}
 static const char *fpu_descr[] = {
 #ifdef	FPU_EMULATE
 	", emulator FPU",	/* 0 */
 #else
 	", no math support",	/* 0 */
 #endif
 	", m68881 FPU",		/* 1 */
 	", m68882 FPU",		/* 2 */
 	"/FPU",			/* 3 */
 	"/FPU",			/* 4 */
 	};
 void
 identifycpu(void)
+{
 	/* there's alot of XXX in here... */
 	const char *cpu_type, *mach, *mmu, *fpu;
 	char clock[16];
 	char emubuf[20];
 	/*
 	 * check machine type constant
 	 */
 	switch (intio_get_sysport_mpustat()) {
 	case 0xdc:
 		/*
 		 * CPU Type == 68030, Clock == 25MHz
 		 */
 		mach = "030";
 		break;
 	case 0xfe:
 		/*
 		 * CPU Type == 68000, Clock == 16MHz
 		 */
 		mach = "000XVI";
 		break;
 	case 0xff:
 		/*
 		 * CPU Type == 68000, Clock == 10MHz
 		 */
 		mach = "000/ACE/PRO/EXPERT/SUPER";
 		break;
 	default:
 		/*
 		 * unknown type
 		 */
 		mach = "000?(unknown model)";
 		break;
+	}
 	emubuf[0] = '\0';
 	check_emulator(emubuf, sizeof(emubuf));
 	cpuspeed = 2048 / delay_divisor;
 	snprintf(clock, sizeof(clock), "%dMHz", cpuspeed);
 	switch (cputype) {
 	case CPU_68060:
 		cpu_type = "m68060";
 		mmu = "/MMU";
 		cpuspeed = 128 / delay_divisor;
 		snprintf(clock, sizeof(clock), "%d/%dMHz", cpuspeed*2, cpuspeed);
 		break;
 	case CPU_68040:
 		cpu_type = "m68040";
 		mmu = "/MMU";
 		cpuspeed = 759 / delay_divisor;
 		snprintf(clock, sizeof(clock), "%d/%dMHz", cpuspeed*2, cpuspeed);
 		break;
 	case CPU_68030:
 		cpu_type = "m68030";
 		mmu = "/MMU";
 		break;
 	case CPU_68020:
 		cpu_type = "m68020";
 		mmu = ", m68851 MMU";
 		break;
 	default:
 		cpu_type = "unknown";
 		mmu = ", unknown MMU";
 		break;
+	}
 	if (fputype >= 0 && fputype < sizeof(fpu_descr)/sizeof(fpu_descr[0]))
 		fpu = fpu_descr[fputype];
 	else
 		fpu = ", unknown FPU";
 	cpu_setmodel("X68%s (%s CPU%s%s, %s clock)%s%s",
 	    mach, cpu_type, mmu, fpu, clock,
 		emubuf[0] ? " on " : "", emubuf);
 	printf("%s\n", cpu_getmodel());
+}
 /*
  * If it is an emulator, store the name in buf and return 1.
  * Otherwise return 0.
  */
 static int
 check_emulator(char *buf, int bufsize)
+{
 	int xm6major;
 	int xm6minor;
 	int xm6imark;
 	int xm6imajor;
 	int xm6iminor;
 	/* XM6 and its family */
 	intio_set_sysport_sramwp('X');
 	if (intio_get_sysport_sramwp() == '6') {
 		xm6major = intio_get_sysport_sramwp();
 		xm6minor = intio_get_sysport_sramwp();
 		xm6imark = intio_get_sysport_sramwp();
 		switch (xm6imark) {
 		case 0xff:	/* Original XM6 or unknown compatibles */
 			snprintf(buf, bufsize, "XM6 v%d.%02d",
 				xm6major, xm6minor);
 			break;
 		case 'i':	/* XM6i */
 			xm6imajor = intio_get_sysport_sramwp();
 			xm6iminor = intio_get_sysport_sramwp();
 			snprintf(buf, bufsize, "XM6i v%d.%02d",
 				xm6imajor, xm6iminor);
 			break;
 		case 'g':	/* XM6 TypeG */
 			snprintf(buf, bufsize, "XM6 TypeG v%d.%02d",
 				xm6major, xm6minor);
 			break;
 		default:	/* Other XM6 compatibles? */
 			/* XXX what should I do? */
 			return 0;
+		}
 		return 1;
+	}
 	return 0;
+}
 /*
  * machine dependent system variables.
  */
 SYSCTL_SETUP(sysctl_machdep_setup, "sysctl machdep subtree setup")
+{
 	sysctl_createv(clog, 0, NULL, NULL,
 	    CTLFLAG_PERMANENT,
 	    CTLTYPE_NODE, "machdep", NULL,
 	    NULL, 0, NULL, 0,
 	    CTL_MACHDEP, CTL_EOL);
 	sysctl_createv(clog, 0, NULL, NULL,
 	    CTLFLAG_PERMANENT,
 	    CTLTYPE_STRUCT, "console_device", NULL,
 	    sysctl_consdev, 0, NULL, sizeof(dev_t),
 	    CTL_MACHDEP, CPU_CONSDEV, CTL_EOL);
+}
 int	waittime = -1;
 int	power_switch_is_off = 0;
 void
 cpu_reboot(int howto, char *bootstr)
+{
 	struct pcb *pcb = lwp_getpcb(curlwp);
 	/* take a snap shot before clobbering any registers */
 	if (pcb != NULL)
 		savectx(pcb);
 	boothowto = howto;
 	if ((howto & RB_NOSYNC) == 0 && waittime < 0) {
 		waittime = 0;
 		vfs_shutdown();
 		/*
 		 * If we've been adjusting the clock, the todr
 		 * will be out of synch; adjust it now.
 		 */
 		/*resettodr();*/
+	}
 	/* Disable interrputs. */
 	splhigh();
 	if (howto & RB_DUMP)
 		dumpsys();
 	/* Run any shutdown hooks. */
 	doshutdownhooks();
 	pmf_system_shutdown(boothowto);
 #if defined(PANICWAIT) && !defined(DDB)
 	if ((howto & RB_HALT) == 0 && panicstr) {
 		printf("hit any key to reboot...\n");
 		(void)cngetc();
 		printf("\n");
+	}
 #endif
 	/* Finally, halt/reboot the system. */
 	/* a) RB_POWERDOWN
 	 *  a1: the power switch is still on
 	 *	Power cannot be removed; simply halt the system (b)
 	 *	Power switch state is checked in shutdown hook
 	 *  a2: the power switch is off
 	 *	Remove the power
 	 * b) RB_HALT
 	 *	call cngetc
 	 * c) otherwise
 	 *	Reboot
 	 */
 	if (((howto & RB_POWERDOWN) == RB_POWERDOWN) && power_switch_is_off) {
 		printf("powering off...\n");
 		delay(1000000);
 		/* Turn off the alarm signal of RTC */
 		IODEVbase->io_rtc.bank0.reset = 0x0c;
 		intio_set_sysport_powoff(0x00);
 		intio_set_sysport_powoff(0x0f);
 		intio_set_sysport_powoff(0x0f);
 		delay(1000000);
 		printf("WARNING: powerdown failed\n");
 		delay(1000000);
 		/* PASSTHROUGH even if came back */
 	} else if ((howto & RB_HALT) == RB_HALT) {
 		printf("System halted.  Hit any key to reboot.\n\n");
 		(void)cngetc();
+	}
 	printf("rebooting...\n");
 	DELAY(1000000);
 	doboot();
 	/* NOTREACHED */
+}
 /*
  * Initialize the kernel crash dump header.
  */
 void
 cpu_init_kcore_hdr(void)
+{
 	cpu_kcore_hdr_t *h = &cpu_kcore_hdr;
 	struct m68k_kcore_hdr *m = &h->un._m68k;
 	int i;
 	memset(&cpu_kcore_hdr, 0, sizeof(cpu_kcore_hdr));
 	/*
 	 * Initialize the `dispatcher' portion of the header.
 	 */
 	strcpy(h->name, machine);
 	h->page_size = PAGE_SIZE;
 	h->kernbase = KERNBASE;
 	/*
 	 * Fill in information about our MMU configuration.
 	 */
 	m->mmutype	= mmutype;
 	m->sg_v		= SG_V;
 	m->sg_frame	= SG_FRAME;
 	m->sg_ishift	= SG_ISHIFT;
 	m->sg_pmask	= SG_PMASK;
 	m->sg40_shift1	= SG4_SHIFT1;
 	m->sg40_mask2	= SG4_MASK2;
 	m->sg40_shift2	= SG4_SHIFT2;
 	m->sg40_mask3	= SG4_MASK3;
 	m->sg40_shift3	= SG4_SHIFT3;
 	m->sg40_addr1	= SG4_ADDR1;
 	m->sg40_addr2	= SG4_ADDR2;
 	m->pg_v		= PG_V;
 	m->pg_frame	= PG_FRAME;
 	/*
 	 * Initialize pointer to kernel segment table.
 	 */
 	m->sysseg_pa = (uint32_t)(pmap_kernel()->pm_stpa);
 	/*
 	 * Initialize relocation value such that:
+	 *
 	 *	pa = (va - KERNBASE) + reloc
 	 */
 	m->reloc = lowram;
 	/*
 	 * Define the end of the relocatable range.
 	 */
 	m->relocend = (uint32_t)&end;
 	/*
 	 * X68k has multiple RAM segments on some models.
 	 */
 	m->ram_segs[0].start = lowram;
 	m->ram_segs[0].size = mem_size - lowram;
 	for (i = 1; i < vm_nphysseg; i++) {
 		m->ram_segs[i].start =
 		    ctob(VM_PHYSMEM_PTR(i)->start);
 		m->ram_segs[i].size  =
 		    ctob(VM_PHYSMEM_PTR(i)->end - VM_PHYSMEM_PTR(i)->start);
+	}
+}
 /*
  * Compute the size of the machine-dependent crash dump header.
  * Returns size in disk blocks.
  */
 #define CHDRSIZE (ALIGN(sizeof(kcore_seg_t)) + ALIGN(sizeof(cpu_kcore_hdr_t)))
 #define MDHDRSIZE roundup(CHDRSIZE, dbtob(1))
 int
 cpu_dumpsize(void)
+{
 	return btodb(MDHDRSIZE);
+}
 /*
  * Called by dumpsys() to dump the machine-dependent header.
  */
 int
 cpu_dump(int (*dump)(dev_t, daddr_t, void *, size_t), daddr_t *blknop)
+{
 	int buf[MDHDRSIZE / sizeof(int)];
 	cpu_kcore_hdr_t *chdr;
 	kcore_seg_t *kseg;
 	int error;
 	kseg = (kcore_seg_t *)buf;
 	chdr = (cpu_kcore_hdr_t *)&buf[ALIGN(sizeof(kcore_seg_t)) /
 	    sizeof(int)];
 	/* Create the segment header. */
 	CORE_SETMAGIC(*kseg, KCORE_MAGIC, MID_MACHINE, CORE_CPU);
 	kseg->c_size = MDHDRSIZE - ALIGN(sizeof(kcore_seg_t));
 	memcpy(chdr, &cpu_kcore_hdr, sizeof(cpu_kcore_hdr_t));
 	error = (*dump)(dumpdev, *blknop, (void *)buf, sizeof(buf));
 	*blknop += btodb(sizeof(buf));
 	return (error);
+}
 /*
  * These variables are needed by /sbin/savecore
  */
 uint32_t dumpmag = 0x8fca0101;	/* magic number */
 int	dumpsize = 0;		/* pages */
 long	dumplo = 0;		/* blocks */
 /*
  * This is called by main to set dumplo and dumpsize.
  * Dumps always skip the first PAGE_SIZE of disk space in
  * case there might be a disk label stored there.  If there
  * is extra space, put dump at the end to reduce the chance
  * that swapping trashes it.
  */
 void
 cpu_dumpconf(void)
+{
 	cpu_kcore_hdr_t *h = &cpu_kcore_hdr;
 	struct m68k_kcore_hdr *m = &h->un._m68k;
 	int chdrsize;	/* size of dump header */
 	int nblks;	/* size of dump area */
 	int i;
 	if (dumpdev == NODEV)
 		return;
 	nblks = bdev_size(dumpdev);
 	chdrsize = cpu_dumpsize();
 	dumpsize = 0;
 	for (i = 0; m->ram_segs[i].size && i < M68K_NPHYS_RAM_SEGS; i++)
 		dumpsize += btoc(m->ram_segs[i].size);
 	/*
 	 * Check to see if we will fit.  Note we always skip the
 	 * first PAGE_SIZE in case there is a disk label there.
 	 */
 	if (nblks < (ctod(dumpsize) + chdrsize + ctod(1))) {
 		dumpsize = 0;
 		dumplo = -1;
 		return;
+	}
 	/*
 	 * Put dump at the end of the partition.
 	 */
 	dumplo = (nblks - 1) - ctod(dumpsize) - chdrsize;
+}
 void
 dumpsys(void)
+{
 	cpu_kcore_hdr_t *h = &cpu_kcore_hdr;
 	struct m68k_kcore_hdr *m = &h->un._m68k;
 	const struct bdevsw *bdev;
 	daddr_t blkno;		/* current block to write */
 				/* dump routine */
 	int (*dump)(dev_t, daddr_t, void *, size_t);
 	int pg;			/* page being dumped */
 	paddr_t maddr;		/* PA being dumped */
 	int seg;		/* RAM segment being dumped */
 	int error;		/* error code from (*dump)() */
 	/* XXX initialized here because of gcc lossage */
 	seg = 0;
 	maddr = m->ram_segs[seg].start;
 	pg = 0;
 	/* Make sure dump device is valid. */
 	if (dumpdev == NODEV)
 		return;
 	bdev = bdevsw_lookup(dumpdev);
 	if (bdev == NULL)
 		return;
 	if (dumpsize == 0) {
 		cpu_dumpconf();
 		if (dumpsize == 0)
 			return;
+	}
 	if (dumplo <= 0) {
 		printf("\ndump to dev %u,%u not possible\n",
 		    major(dumpdev), minor(dumpdev));
 		return;
+	}
 	dump = bdev->d_dump;
 	blkno = dumplo;
 	printf("\ndumping to dev %u,%u offset %ld\n",
 	    major(dumpdev), minor(dumpdev), dumplo);
 	printf("dump ");
 	/* Write the dump header. */
 	error = cpu_dump(dump, &blkno);
 	if (error)
 		goto bad;
 	for (pg = 0; pg < dumpsize; pg++) {
 #define NPGMB	(1024*1024/PAGE_SIZE)
 		/* print out how many MBs we have dumped */
 		if (pg && (pg % NPGMB) == 0)
 			printf_nolog("%d ", pg / NPGMB);
 #undef NPGMB
 		if (maddr == 0) {
 			/* Skip first page */
 			maddr += PAGE_SIZE;
 			blkno += btodb(PAGE_SIZE);
 			continue;
+		}
 		while (maddr >=
 		    (m->ram_segs[seg].start + m->ram_segs[seg].size)) {
 			if (++seg >= M68K_NPHYS_RAM_SEGS ||
 			    m->ram_segs[seg].size == 0) {
 				error = EINVAL;		/* XXX ?? */
 				goto bad;
+			}
 			maddr = m->ram_segs[seg].start;
+		}
 		pmap_enter(pmap_kernel(), (vaddr_t)vmmap, maddr,
 		    VM_PROT_READ, VM_PROT_READ|PMAP_WIRED);
 		pmap_update(pmap_kernel());
 		error = (*dump)(dumpdev, blkno, vmmap, PAGE_SIZE);
  bad:
 		switch (error) {
 		case 0:
 			maddr += PAGE_SIZE;
 			blkno += btodb(PAGE_SIZE);
 			break;
 		case ENXIO:
 			printf("device bad\n");
 			return;
 		case EFAULT:
 			printf("device not ready\n");
 			return;
 		case EINVAL:
 			printf("area improper\n");
 			return;
 		case EIO:
 			printf("i/o error\n");
 			return;
 		case EINTR:
 			printf("aborted from console\n");
 			return;
 		default:
 			printf("error %d\n", error);
 			return;
+		}
+	}
 	printf("succeeded\n");
+}
 void
 initcpu(void)
+{
 	/* XXX should init '40 vecs here, too */
 #if defined(M68060)
 	extern void *vectab[256];
 #if defined(M060SP)
 	extern uint8_t I_CALL_TOP[];
 	extern uint8_t FP_CALL_TOP[];
 #else
 	extern uint8_t illinst;
 #endif
 	extern uint8_t fpfault;
 #endif
 #ifdef MAPPEDCOPY
 	/*
 	 * Initialize lower bound for doing copyin/copyout using
 	 * page mapping (if not already set).  We don't do this on
 	 * VAC machines as it loses big time.
 	 */
 	if ((int)mappedcopysize == -1) {
 		mappedcopysize = PAGE_SIZE;
+	}
 #endif
 #if defined(M68060)
 	if (cputype == CPU_68060) {
 #if defined(M060SP)
 		/* integer support */
 		vectab[61] = &I_CALL_TOP[128 + 0x00];
 		/* floating point support */
 		vectab[11] = &FP_CALL_TOP[128 + 0x30];
 		vectab[55] = &FP_CALL_TOP[128 + 0x38];
 		vectab[60] = &FP_CALL_TOP[128 + 0x40];
 		vectab[54] = &FP_CALL_TOP[128 + 0x00];
 		vectab[52] = &FP_CALL_TOP[128 + 0x08];
 		vectab[53] = &FP_CALL_TOP[128 + 0x10];
 		vectab[51] = &FP_CALL_TOP[128 + 0x18];
 		vectab[50] = &FP_CALL_TOP[128 + 0x20];
 		vectab[49] = &FP_CALL_TOP[128 + 0x28];
 #else
 		vectab[61] = &illinst;
 #endif
 		vectab[48] = &fpfault;
+	}
 	DCIS();
 #endif
+}
 void
 straytrap(int pc, u_short evec)
+{
 	printf("unexpected trap (vector offset %x) from %x\n",
 	    evec & 0xFFF, pc);
 #if defined(DDB)
 	Debugger();
 #endif
+}
 int	*nofault;
 int
 badaddr(volatile void* addr)
+{
 	int i;
 	label_t	faultbuf;
 	nofault = (int *)&faultbuf;
 	if (setjmp((label_t *)nofault)) {
 		nofault = NULL;
 		return 1;
+	}
 	i = *(volatile short *)addr;
 	__USE(i);
 	nofault = NULL;
 	return 0;
+}
 int
 badbaddr(volatile void *addr)
+{
 	int i;
 	label_t	faultbuf;
 	nofault = (int *)&faultbuf;
 	if (setjmp((label_t *)nofault)) {
 		nofault = NULL;
 		return 1;
+	}
 	i = *(volatile char *)addr;
 	__USE(i);
 	nofault = NULL;
 	return 0;
+}
 void
 intrhand(int sr)
+{
 	printf("intrhand: unexpected sr 0x%x\n", sr);
+}
 const uint16_t ipl2psl_table[NIPL] = {
 	[IPL_NONE]       = PSL_S | PSL_IPL0,
 	[IPL_SOFTCLOCK]  = PSL_S | PSL_IPL1,
 	[IPL_SOFTBIO]    = PSL_S | PSL_IPL1,
 	[IPL_SOFTNET]    = PSL_S | PSL_IPL1,
 	[IPL_SOFTSERIAL] = PSL_S | PSL_IPL1,
 	[IPL_VM]         = PSL_S | PSL_IPL5,
 	[IPL_SCHED]      = PSL_S | PSL_IPL7,
 	[IPL_HIGH]       = PSL_S | PSL_IPL7,
 };
 #if (defined(DDB) || defined(DEBUG)) && !defined(PANICBUTTON)
 #define PANICBUTTON
 #endif
 #ifdef PANICBUTTON
 int panicbutton = 1;	/* non-zero if panic buttons are enabled */
 int crashandburn = 0;
 int candbdelay = 50;	/* give em half a second */
 void candbtimer(void *);
 void
 candbtimer(void *arg)
+{
 	crashandburn = 0;
+}
 #endif
 /*
  * Level 7 interrupts can be caused by the keyboard or parity errors.
  */
 void
 nmihand(struct frame frame)
+{
 	intio_set_sysport_keyctrl(intio_get_sysport_keyctrl() | 0x04);
 	if (1) {
 #ifdef PANICBUTTON
 		static int innmihand = 0;
 		/*
 		 * Attempt to reduce the window of vulnerability for recursive
 		 * NMIs (e.g. someone holding down the keyboard reset button).
 		 */
 		if (innmihand == 0) {
 			innmihand = 1;
 			printf("Got a keyboard NMI\n");
 			innmihand = 0;
+		}
 #ifdef DDB
 		Debugger();
 #else
 		if (panicbutton) {
 			if (crashandburn) {
 				crashandburn = 0;
 				panic(panicstr ?
 				    "forced crash, nosync" : "forced crash");
+			}
 			crashandburn++;
 			callout_reset(&candbtimer_ch, candbdelay,
 			    candbtimer, NULL);
+		}
 #endif /* DDB */
 #endif /* PANICBUTTON */
 		return;
+	}
 	/* panic?? */
 	printf("unexpected level 7 interrupt ignored\n");
+}
 /*
  * cpu_exec_aout_makecmds():
  *	cpu-dependent a.out format hook for execve().
+ *
  * Determine of the given exec package refers to something which we
  * understand and, if so, set up the vmcmds for it.
+ *
  * XXX what are the special cases for the hp300?
  * XXX why is this COMPAT_NOMID?  was something generating
  *	hp300 binaries with an a_mid of 0?  i thought that was only
  *	done on little-endian machines...  -- cgd
  */
 int
 cpu_exec_aout_makecmds(struct lwp *l, struct exec_package *epp)
+{
 #if defined(COMPAT_NOMID) || defined(COMPAT_44)
 	u_long midmag, magic;
 	u_short mid;
 	int error;
 	struct exec *execp = epp->ep_hdr;
 	midmag = ntohl(execp->a_midmag);
 	mid = (midmag >> 16) & 0xffff;
 	magic = midmag & 0xffff;
 	midmag = mid << 16 | magic;
 	switch (midmag) {
 #ifdef COMPAT_NOMID
 	case (MID_ZERO << 16) | ZMAGIC:
 		error = exec_aout_prep_oldzmagic(l->l_proc, epp);
 		break;
 #endif
 #ifdef COMPAT_44
 	case (MID_HP300 << 16) | ZMAGIC:
 		error = exec_aout_prep_oldzmagic(l->l_proc, epp);
 		break;
 #endif
 	default:
 		error = ENOEXEC;
+	}
 	return error;
 #else /* !(defined(COMPAT_NOMID) || defined(COMPAT_44)) */
 	return ENOEXEC;
 #endif
+}
 #ifdef MODULAR
 /*
  * Push any modules loaded by the bootloader etc.
  */
 void
 module_init_md(void)
+{
+}
 #endif
 #ifdef EXTENDED_MEMORY
 static const struct memlist {
 	paddr_t exstart;
 	psize_t minsize;
 	psize_t maxsize;
 } memlist[] = {
 	/* We define two extended memory regions for all possible settings. */
 	/*
 	 * The first region is at 0x01000000:
+	 *
 	 *  TS-6BE16:	16MB at 0x01000000 (to 0x01FFFFFF)
 	 *  XM6i:	4MB - 240MB at 0x01000000 (upto 0x0FFFFFFF)
 	 */
 	{ 0x01000000, 0x00400000, 0x0f000000 },
 	/*
 	 * The second region is at 0x10000000:
+	 *
 	 * 060turbo:	4MB - 128MB at 0x10000000 (upto 0x17FFFFFF)
 	 * XM6i:	4MB - 768MB at 0x10000000 (upto 0x3FFFFFFF)
 	 */
 	{ 0x10000000, 0x00400000, 0x30000000 },
 };
 /* check each 4MB region */
 #define EXTMEM_RANGE	(4 * 1024 * 1024)
 /*
  * check memory existency
  */
 static bool
 mem_exists(paddr_t mem, paddr_t basemax)
+{
 	/* most variables must be register! */
 	volatile unsigned char *m, *b;
 	unsigned char save_m, save_b=0;	/* XXX: shutup gcc */
 	bool baseismem;
 	bool exists = false;
 	void *base;
 	void *begin_check, *end_check;
 	label_t	faultbuf;
 	/*
 	 * In this function we assume:
 	 *  - MMU is not enabled yet but PA == VA
 	 *    (i.e. no RELOC() macro to convert PA to VA)
 	 *  - bus error can be caught by setjmp()
 	 *    (i.e. %vbr register is initialized properly)
 	 *  - all memory cache is not enabled
 	 */
 	/* only 24bits are significant on normal X680x0 systems */
 	base = (void *)(mem & 0x00FFFFFF);
 	m = (void *)mem;
 	b = (void *)base;
 	/* This is somewhat paranoid -- avoid overwriting myself */
 	__asm("lea %%pc@(begin_check_mem),%0" : "=a"(begin_check));
 	__asm("lea %%pc@(end_check_mem),%0" : "=a"(end_check));
 	if (base >= begin_check && base < end_check) {
 		size_t off = (char *)end_check - (char *)begin_check;
 		m -= off;
 		b -= off;
+	}
 	nofault = (int *)&faultbuf;
 	if (setjmp((label_t *)nofault)) {
 		nofault = (int *)0;
 		return false;
+	}
 	(void)*m;
 	/*
 	 * Can't check by writing if the corresponding
 	 * base address isn't memory.
+	 *
 	 * I hope this would be no harm....
 	 */
 	baseismem = base < (void *)basemax;
 __asm("begin_check_mem:");
 	/* save original value (base must be saved first) */
 	if (baseismem)
 		save_b = *b;
 	save_m = *m;
 	/*
 	 * stack and other data segment variables are unusable
 	 * til end_check_mem, because they may be clobbered.
 	 */
 	/*
 	 * check memory by writing/reading
 	 */
 	if (baseismem)
 		*b = 0x55;
 	*m = 0xAA;
 	if ((baseismem && *b != 0x55) || *m != 0xAA)
 		goto out;
 	*m = 0x55;
 	if (baseismem)
 		*b = 0xAA;
 	if (*m != 0x55 || (baseismem && *b != 0xAA))
 		goto out;
 	exists = true;
 out:
 	*m = save_m;
 	if (baseismem)
 		*b = save_b;
 __asm("end_check_mem:");
 	nofault = (int *)0;
 	return exists;
+}
 #endif
 void
 setmemrange(void)
+{
 #ifdef EXTENDED_MEMORY
 	int i;
 	paddr_t exstart, exend;
 	psize_t size, minsize, maxsize;
 	const struct memlist *mlist = memlist;
 	paddr_t basemax = m68k_ptob(physmem);
 #endif
 	/*
 	 * VM system is not started yet, and even MMU is not enabled here.
 	 * We assume VA == PA and don't bother to use RELOC() macro
 	 * as pmap_bootstrap() does.
 	 */
 	/* save the original base memory range */
 	basemem = physmem;
 	/*
 	 * XXX
 	 * Probably we should also probe the main memory region
 	 * for machines which might have a wrong value in a dead SRAM.
 	 */
 	phys_basemem_seg.start = lowram;
 	phys_basemem_seg.end   = m68k_ptob(basemem) + lowram;
 #ifdef EXTENDED_MEMORY
 	/* discover extended memory */
 	for (i = 0; i < __arraycount(memlist); i++) {
 		exstart = mlist[i].exstart;
 		minsize = mlist[i].minsize;
 		maxsize = mlist[i].maxsize;
 		/*
 		 * Normally, x68k hardware is NOT 32bit-clean.
 		 * But some type of extended memory is in 32bit address space.
 		 * Check whether.
 		 */
 		if (!mem_exists(exstart, basemax))
 			continue;
 		exend = 0;
 		/* range check */
 		for (size = minsize; size <= maxsize; size += EXTMEM_RANGE) {
 			if (!mem_exists(exstart + size - 4, basemax))
 				break;
 			exend = exstart + size;
+		}
 		if (exstart < exend) {
 			phys_extmem_seg[i].start = exstart;
 			phys_extmem_seg[i].end   = exend;
 			physmem += m68k_btop(exend - exstart);
 			if (maxmem < m68k_btop(exend))
 				maxmem = m68k_btop(exend);
+		}
+	}
 #endif
+}
 int idepth;
 bool
 cpu_intr_p(void)
+{
 	return idepth != 0;
+}
 int
 mm_md_physacc(paddr_t pa, vm_prot_t prot)
+{
 	int i;
 	for (i = 0; i < vm_nphysseg; i++) {
 		if (ctob(vm_physmem[i].start) <= pa &&
 		    pa < ctob(vm_physmem[i].end))
 			return 0;
+	}
 	return EFAULT;
+}