 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.38 2011/01/14 16:48:15 skrll Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.39 2011/01/23 09:44:58 skrll Exp $	*/
 /*	$OpenBSD: autoconf.c,v 1.15 2001/06/25 00:43:10 mickey Exp $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
 @@ -76,27 +76,27 @@
  * 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.
+ *
  *	@(#)autoconf.c	8.4 (Berkeley) 10/1/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.38 2011/01/14 16:48:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.39 2011/01/23 09:44:58 skrll Exp $");
 #include "opt_kgdb.h"
 #include "opt_useleds.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <sys/device.h>
 #include <sys/callout.h>
 @@ -112,32 +112,26 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
 #include <dev/pci/pcivar.h>
 #include <dev/scsipi/scsi_all.h>
 #include <dev/scsipi/scsipi_all.h>
 #include <dev/scsipi/scsiconf.h>
 #include <dev/cons.h>
 #include <hp700/hp700/machdep.h>
 #include <hp700/dev/cpudevs.h>
 #include <hp700/gsc/gscbusvar.h>
 register_t	kpsw =
 	PSW_Q |		/* Interrupt State Collection Enable */
 	PSW_P |		/* Protection Identifier Validation Enable */
 	PSW_C |		/* Instruction Address Translation Enable */
 	PSW_D;		/* Data Address Translation Enable */
 static TAILQ_HEAD(hppa_pdcmodule_head, hppa_pdcmodule) hppa_pdcmodule_list =
     TAILQ_HEAD_INITIALIZER(hppa_pdcmodule_list);
 struct hppa_pdcmodule {
 	TAILQ_ENTRY(hppa_pdcmodule) hm_link;
 	bool			hm_registered;
 	struct pdc_iodc_read	hm_pir;
 	struct iodc_data	hm_type;
 	struct device_path	hm_dp;
 	hppa_hpa_t		hm_hpa;
 	u_int			hm_hpasz;
 	u_int			hm_naddrs;	/* only PDC_SYSTEM_MAP */
 	u_int			hm_modindex;	/* only PDC_SYSTEM_MAP */
 @@ -182,27 +176,27 @@ cpu_configure(void)
 			kgdb_connect(1);
 #elif defined(DDB)
 		Debugger();
 #endif	/* DDB */
+	}
 	splhigh();
 	if (config_rootfound("mainbus", NULL) == NULL)
 		panic("no mainbus found");
 	/* in spl*() we trust */
 	hp700_intr_init();
 	__asm volatile("ssm %0, %%r0" :: "i" (PSW_I));
-	kpsw |= PSW_I;
+	curcpu()->ci_psw |= PSW_I;
 	spl0();
 	if (cold_hook)
 		(*cold_hook)(HPPA_COLD_HOT);
 #ifdef USELEDS
 	memset(_hp700_led_on_cycles, 0, sizeof(_hp700_led_on_cycles));
 	callout_init(&hp700_led_callout, 0);
 	hp700_led_blinker((void *) 0);
 #endif
+}
 #ifdef USELEDS

 @@ -1,14 +1,14 @@
-#	$NetBSD: genassym.cf,v 1.29 2011/01/23 09:18:29 skrll Exp $
+#	$NetBSD: genassym.cf,v 1.30 2011/01/23 09:44:58 skrll Exp $
 #	$OpenBSD: genassym.cf,v 1.18 2001/09/20 18:31:14 mickey Exp $
+#
 # Copyright (c) 1982, 1990, 1993
 #	The Regents of the University of California.  All rights reserved.
+#
 # 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
 @@ -87,26 +87,28 @@ export	HPPA_BREAK_SET_PSW
 # hp700_int_reg fields
 struct	hp700_int_reg
 member	INT_REG_REQ		int_reg_req
 member	INT_REG_BITS_MAP	int_reg_bits_map
 export	INT_REG_BIT_REG
 # struct cpu_info fields
 define	CI_CPL			offsetof(struct cpu_info, ci_cpl)
 define	CI_IPENDING		offsetof(struct cpu_info, ci_ipending)
 #define	CI_INTR_DEPTH		offsetof(struct cpu_info, ci_intr_depth)
 #define	CI_SOFTLWPS		offsetof(struct cpu_info, ci_softlwps)
 define	CI_MTX_COUNT		offsetof(struct cpu_info, ci_mtx_count)
 define	CI_TRAPSAVE		offsetof(struct cpu_info, ci_trapsave)
 define	CI_PSW			offsetof(struct cpu_info, ci_psw)
 define	CI_FPU_STATE		offsetof(struct cpu_info, ci_fpu_state)
 ifdef MULTIPROCESSOR
 define	CI_CURLWP		offsetof(struct cpu_info, ci_curlwp)
 endif
 define	MTX_IPL			offsetof(struct kmutex, mtx_ipl)
 define	MTX_LOCK		offsetof(struct kmutex, mtx_lock)
 define	MTX_OWNER		offsetof(struct kmutex, mtx_owner)
 define	MTX_WAITERS		offsetof(struct kmutex, mtx_waiters)
 define	RW_OWNER		offsetof(struct krwlock, rw_owner)
 define	RW_WRITE_LOCKED		RW_WRITE_LOCKED
 define	RW_WRITE_WANTED		RW_WRITE_WANTED

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.S,v 1.51 2011/01/23 08:52:02 skrll Exp $	*/
+/*	$NetBSD: locore.S,v 1.52 2011/01/23 09:44:58 skrll Exp $	*/
 /*	$OpenBSD: locore.S,v 1.158 2008/07/28 19:08:46 miod Exp $	*/
 /*
  * Copyright (c) 1998-2004 Michael Shalayeff
  * All rights reserved.
+ *
  * 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
 @@ -140,30 +140,28 @@
 #define	MTCPU_C(x,t)	.word	0x14000240 | ((t) << 21) | ((x) << 16)
 #define	MFCPU_C(r,x)	.word	0x14000600 | ((r) << 21) | ((x) << 16)
 #define	MFCPU_U(r,x)	.word	0x140008a0 | ((r) << 21) | ((x))
 #define	MTCPU_U(x,r)	.word	0x14001840 | ((r) << 21) | ((x) << 16)
 #endif
 	.import	$global$, data
 	.import pdc, data
 	.import	boothowto, data
 	.import	bootdev, data
 	.import	esym, data
 	.import virtual_avail, data
 	.import	lwp0, data
 	.import	kpsw, data
 	.import	panic, code
 	.import fpu_csw, data
 	.import fpu_cur_uspace, data
 	.import hp700_int_regs, data
 	BSS(pdc_stack, 4)	/* temp stack for PDC call */
 	BSS(kernelmapped, 4)	/* set when kernel is mapped */
 	BSS(hppa_vtop, 4)	/* a vtop translation table addr (pa=va) */
 	.text
 	.import kernel_setup, entry
 /*
  * This is the starting location for the kernel
  */
 ENTRY_NOPROFILE(start,0)
 @@ -286,28 +284,28 @@ qisnowon:
 	rsm	RESET_PSW, %r0
 	nop ! nop ! nop ! nop ! nop ! nop ! nop
 	/*
 	 * We need to do an rfi to get the C bit set
 	 */
 	mtctl	%r0, %pcsq
 	mtctl	%r0, %pcsq
 	ldil	L%virtual_mode, %t1
 	ldo	R%virtual_mode(%t1), %t1
 	mtctl	%t1, %pcoq
 	ldo	4(%t1), %t1
 	mtctl	%t1, %pcoq
-	ldil	L%kpsw, %t1
+	GET_CURCPU(%t1)
-	ldw	R%kpsw(%t1), %t2
+	ldw	CI_PSW(%t1), %t2
 	mtctl	%t2, %ipsw
 	rfi
 	nop
 	nop
 	nop
 	nop
 	nop
 	nop
 	nop
 virtual_mode:
 	ldil	L%kernelmapped, %t1
 @@ -922,30 +920,30 @@ noras:
 	 * nop if there is a hardware FPU.
 	 */
 ALTENTRY(hppa_fpu_nop1)
 	b,n	switch_return
 	/*
 	 * We do have a hardware FPU.  If the LWP
 	 * that we just switched to has its state in the
 	 * FPU, enable the FPU, else disable it, so if
 	 * the LWP does try to use the coprocessor
 	 * we'll get an assist emulation trap to swap
 	 * states.
 	 */
-	ldil	L%fpu_cur_uspace, %t1
+	GET_CURCPU(%t1)
 	mfctl	%ccr, %r1
 	mfctl	CR_FPPADDR, %t2
-	ldw	R%fpu_cur_uspace(%t1), %t1
+	ldw	CI_FPU_STATE(%t1), %t1
 	depi	0, 25, 2, %r1		; disables the FPU
 	comb,<>,n %t1, %t2, 0		; nullify if LWPs different
 	depi	3, 25, 2, %r1		; enables the FPU
 	mtctl	%r1, %ccr
 switch_return:
 	copy	%arg0, %ret0
 	ldw	HPPA_FRAME_CRP(%r3), %rp
 	bv	0(%rp)
 	ldwm	-(HPPA_FRAME_SIZE+16*4)(%sp), %r3
 EXIT(cpu_switchto)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.96 2011/01/13 21:15:15 skrll Exp $	*/
+/*	$NetBSD: machdep.c,v 1.97 2011/01/23 09:44:58 skrll Exp $	*/
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthew Fredette.
+ *
  * 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.
 @@ -48,27 +48,27 @@
  * 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 AUTHOR OR HIS RELATIVES 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 MIND, 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.96 2011/01/13 21:15:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.97 2011/01/23 09:44:58 skrll Exp $");
 #include "opt_cputype.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_modular.h"
 #include "opt_useleds.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 @@ -415,38 +415,48 @@ const struct hppa_cpu_info cpu_types[] =
 extern kmutex_t vmmap_lock;
 void
 hppa_init(paddr_t start, void *bi)
+{
 	vaddr_t vstart;
 	vaddr_t v;
 	int error;
 	u_int *p, *q;
 	struct btlb_slot *btlb_slot;
 	int btlb_slot_i;
 	struct btinfo_symtab *bi_sym;
 	struct pcb *pcb0;
 	struct cpu_info *ci;
 #ifdef KGDB
 	boothowto |= RB_KDB;	/* go to kgdb early if compiled in. */
 #endif
 	/* Setup curlwp/curcpu early for LOCKDEBUG and spl* */
 #ifdef MULTIPROCESSOR
 	mtctl(&cpus[0], CR_CURCPU);
 #else
 	mtctl(&lwp0, CR_CURLWP);
 #endif
 	lwp0.l_cpu = &cpus[0];
 	/* curcpu() is now valid */
 	ci = curcpu();
 	ci->ci_psw =
 		PSW_Q |         /* Interrupt State Collection Enable */
 		PSW_P |         /* Protection Identifier Validation Enable */
 		PSW_C |         /* Instruction Address Translation Enable */
 		PSW_D;          /* Data Address Translation Enable */
 	/* Copy bootinfo */
 	if (bi != NULL)
 		memcpy(&bootinfo, bi, sizeof(struct bootinfo));
 	pdc_init();	/* init PDC iface, so we can call em easy */
 	cpu_hzticks = (PAGE0->mem_10msec * 100) / hz;
 	delay_init();	/* calculate CPU clock ratio */
 	/* cache parameters */
 	error = pdcproc_cache(&pdc_cache);
 	if (error < 0) {
 #ifdef DEBUG
 @@ -622,27 +632,26 @@ cpuid(void)
 	 * from locore.S
 	 */
 	extern u_int trap_ep_T_TLB_DIRTY[];
 	extern u_int trap_ep_T_DTLBMISS[];
 	extern u_int trap_ep_T_DTLBMISSNA[];
 	extern u_int trap_ep_T_ITLBMISS[];
 	extern u_int trap_ep_T_ITLBMISSNA[];
 	struct pdc_cpuid pdc_cpuid;
 	const struct hppa_cpu_info *p = NULL;
 	const char *model;
 	u_int cpu_version, cpu_features;
 	int error;
 	extern int kpsw;
 	/* may the scientific guessing begin */
 	cpu_type = hpc_unknown;
 	cpu_features = 0;
 	cpu_version = 0;
 	/* identify system type */
 	error = pdcproc_model_info(&pdc_model);
 	if (error < 0) {
 #ifdef DEBUG
 		printf("WARNING: PDC_MODEL_INFO error %d\n", error);
 #endif
 		pdc_model.hwmodel = 0;
 @@ -799,27 +808,27 @@ cpuid(void)
 	if (pmap_hptsize && p->hci_cputype != hpcxl && p->hci_cputype != hpcxl2)
 		pmap_hptsize = 0;
 	cpu_type = hppa_cpu_info->hci_cputype;
 	cpu_ibtlb_ins = hppa_cpu_info->ibtlbins;
 	cpu_dbtlb_ins = hppa_cpu_info->dbtlbins;
 	cpu_hpt_init = hppa_cpu_info->hptinit;
 	cpu_desidhash = hppa_cpu_info->desidhash;
 	cpu_revision = (*cpu_desidhash)();
 	/* force strong ordering for now */
 	if (hppa_cpu_ispa20_p())
-		kpsw |= PSW_O;
+		curcpu()->ci_psw |= PSW_O;
 	snprintf(cpu_model, sizeof(cpu_model), "HP9000/%s", model);
 #define	LDILDO(t,f) ((t)[0] = (f)[0], (t)[1] = (f)[1]);
 	LDILDO(trap_ep_T_TLB_DIRTY , hppa_cpu_info->tlbdh);
 	LDILDO(trap_ep_T_DTLBMISS  , hppa_cpu_info->dtlbh);
 	LDILDO(trap_ep_T_DTLBMISSNA, hppa_cpu_info->dtlbnah);
 	LDILDO(trap_ep_T_ITLBMISS  , hppa_cpu_info->itlbh);
 	LDILDO(trap_ep_T_ITLBMISSNA, hppa_cpu_info->itlbnah);
 #undef LDILDO
 	/* Bootstrap any FPU. */
 	hppa_fpu_bootstrap(pdc_coproc.ccr_enable);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.h,v 1.58 2011/01/22 10:57:07 skrll Exp $	*/
+/*	$NetBSD: cpu.h,v 1.59 2011/01/23 09:44:58 skrll Exp $	*/
 /*	$OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $	*/
 /*
  * Copyright (c) 2000-2004 Michael Shalayeff
  * All rights reserved.
+ *
  * 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
 @@ -104,27 +104,26 @@ struct hppa_cpu_info {
 	int (*desidhash)(void);
 	const u_int *itlbh, *dtlbh, *itlbnah, *dtlbnah, *tlbdh;
 	int (*dbtlbins)(int, pa_space_t, vaddr_t, paddr_t, vsize_t, u_int);
 	int (*ibtlbins)(int, pa_space_t, vaddr_t, paddr_t, vsize_t, u_int);
 	int (*btlbprg)(int);
 	int (*hptinit)(vaddr_t, vsize_t);
 };
 #ifdef _KERNEL
 extern const struct hppa_cpu_info *hppa_cpu_info;
 extern int cpu_modelno;
 extern int cpu_revision;
 extern register_t kpsw;
 #endif
 #endif
 /*
  * COPR/SFUs
  */
 #define	HPPA_FPUS	0xc0
 #define	HPPA_PMSFUS	0x20	/* ??? */
 /*
  * Exported definitions unique to hp700/PA-RISC cpu support.
  */
 @@ -255,26 +254,30 @@ struct cpu_info {
 #ifndef _KMEMUSER
 #ifdef MULTIPROCESSOR
 	struct	lwp	*ci_curlwp;	/* CPU owner */
 #endif
 	int		ci_cpuid;	/* CPU index (see cpus[] array) */
 	int		ci_mtx_count;
 	int		ci_mtx_oldspl;
 	int		ci_want_resched;
 	volatile int	ci_cpl;
 	volatile int	ci_ipending;	/* The pending interrupts. */
 	u_int		ci_intr_depth;	/* Nonzero iff running an interrupt. */
 	register_t	ci_psw;		/* Processor Status Word. */
 	paddr_t		ci_fpu_state;	/* LWP FPU state address, or zero. */
 	u_long		ci_itmr;
 #endif /* !_KMEMUSER */
 } __aligned(64);
 #endif /* _KERNEL || _KMEMUSER */
 #if defined(_KERNEL)
 /*
  * definitions of cpu-dependent requirements
  * referenced in generic code
  */
 #define	cpu_proc_fork(p1, p2)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fpu.c,v 1.22 2011/01/14 02:06:26 rmind Exp $	*/
+/*	$NetBSD: fpu.c,v 1.23 2011/01/23 09:44:59 skrll Exp $	*/
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthew Fredette.
+ *
  * 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.
 @@ -24,27 +24,27 @@
  * 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.
  */
 /*
  * FPU handling for NetBSD/hppa.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.22 2011/01/14 02:06:26 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.23 2011/01/23 09:44:59 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpufunc.h>
 #include <machine/frame.h>
 #include <machine/reg.h>
 #include <machine/pcb.h>
 #include <machine/pmap.h>
 @@ -68,29 +68,26 @@ __KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.22
 #define	OPCODE_DOUBLE	0x08000000
 #define	OPCODE_STORE	0x00000200
 #define OPCODE_INDEXED	0x00001000
 /* This is nonzero iff we're using a hardware FPU. */
 int fpu_present;
 /* If we have any FPU, this is its version. */
 u_int fpu_version;
 /* The number of times we have had to switch the FPU context. */
 u_int fpu_csw;
 /* The U-space physical address of the proc in the FPU, or zero. */
 paddr_t fpu_cur_uspace;
 /* In locore.S, this swaps states in and out of the FPU. */
 void hppa_fpu_swapout(struct pcb *);
 void hppa_fpu_swap(struct fpreg *, struct fpreg *);
 #ifdef FPEMUL
 /*
  * Given a trapframe and a general register number, the
  * FRAME_REG macro returns a pointer to that general
  * register.  The _frame_reg_positions array is a lookup
  * table, since the general registers aren't in order
  * in a trapframe.
+ *
  * NB: this more or less assumes that all members of
 @@ -183,65 +180,69 @@ hppa_fpu_bootstrap(u_int ccr_enable)
 			"	fstds	%%fr0, 0(%%r22)	\n"
 			"	ldo	%1, %%r22	\n"
 			"	copr,0,0		\n"
 			"	fstds	%%fr0, 0(%%r22)	\n"
 			: "=m" (junk), "=m" (vers) : : "r22");
 		/*
 		 * Now mark that no process has the FPU,
 		 * and disable it, so the first time it
 		 * gets used the process' state gets
 		 * swapped in.
 		 */
 		fpu_csw = 0;
-		fpu_cur_uspace = 0;
+		curcpu()->ci_fpu_state = 0;
 		mtctl(ccr_enable & (CCR_MASK ^ HPPA_FPUS), CR_CCR);
+	}
 #ifdef FPEMUL
 	else
 		/*
 		 * XXX This is a hack - to avoid
 		 * having to set up the emulator so
 		 * it can work for one instruction for
 		 * proc0, we dispatch the copr,0,0 opcode
 		 * into the emulator directly.
 		 */
 		decode_0c(OPCODE_COPR_0_0, 0, 0, vers);
 #endif /* FPEMUL */
 	fpu_version = vers[0];
+}
 /*
  * If the given LWP has its state in the FPU,
  * flush that state out into the LWP's PCB.
  */
 void
 hppa_fpu_flush(struct lwp *l)
+{
 	struct trapframe *tf = l->l_md.md_regs;
 	struct pcb *pcb = lwp_getpcb(l);
 	struct cpu_info *ci = curcpu();
 	if (!fpu_present)
 		return;
 	/*
 	 * If we have a hardware FPU, and this process'
 	 * state is currently in it, swap it out.
 	 */
-	if (!fpu_present || fpu_cur_uspace == 0 ||
+	if (ci->ci_fpu_state == 0 ||
-	    fpu_cur_uspace != tf->tf_cr30) {
+	    ci->ci_fpu_state != tf->tf_cr30) {
 		return;
+	}
 	hppa_fpu_swapout(pcb);
-	fpu_cur_uspace = 0;
+	ci->ci_fpu_state = 0;
+}
 #ifdef FPEMUL
 /*
  * This emulates a coprocessor load/store instruction.
  */
 static int hppa_fpu_ls(struct trapframe *, struct lwp *);
 static int
 hppa_fpu_ls(struct trapframe *frame, struct lwp *l)
+{
 	struct pcb *pcb = lwp_getpcb(l);
 	u_int inst, inst_b, inst_x, inst_s, inst_t;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.h,v 1.13 2010/03/31 12:56:14 skrll Exp $	*/
+/*	$NetBSD: machdep.h,v 1.14 2011/01/23 09:44:59 skrll Exp $	*/
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthew Fredette.
+ *
  * 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.
 @@ -60,27 +60,26 @@ extern vaddr_t virtual_start, virtual_en
 /* Total physical pages, and low reserved physical pages. */
 extern int totalphysmem;
 extern int availphysmem;
 extern int resvmem;
 /* BTLB minimum and maximum sizes, in pages. */
 extern u_int hppa_btlb_size_min;
 extern u_int hppa_btlb_size_max;
 /* FPU variables and functions. */
 extern int fpu_present;
 extern u_int fpu_version;
 extern u_int fpu_csw;
 extern paddr_t fpu_cur_uspace;
 void hppa_fpu_bootstrap(u_int);
 void hppa_fpu_flush(struct lwp *);
 void hppa_fpu_emulate(struct trapframe *, struct lwp *, u_int);
 /* Interrupt dispatching. */
 void hppa_intr(struct trapframe *);
 /* Special pmap functions. */
 void pmap_redzone(vaddr_t, vaddr_t, int);
 /* Functions to write low memory and the kernel text. */
 void hppa_ktext_stw(vaddr_t, int);
 void hppa_ktext_stb(vaddr_t, char);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: trap.S,v 1.52 2011/01/22 19:35:48 skrll Exp $	*/
+/*	$NetBSD: trap.S,v 1.53 2011/01/23 09:44:59 skrll Exp $	*/
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthew Fredette.
+ *
  * 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.
 @@ -232,28 +232,28 @@ syscall_entry:
 	 * Make space for the syscall arguments.
+	 *
 	 * Match the offset from %sp to the trapframe with the offset in
 	 * TLABEL(all) for the benefit of ddb.
 	 */
 	stwm	%r0, HPPA_FRAME_SIZE+HPPA_FRAME_MAXARGS(%sr1, %sp)
 	/* Align correctly */
 	ldo	HPPA_FRAME_SIZE-1(%sp),%sp
 	depi	0, 31, 6, %sp
 	stw	%r0, HPPA_FRAME_CRP(%sr1, %sp)
-	ldil	L%kpsw, %t1
+	GET_CURCPU_SPACE(%sr1, %t1)
-	ldw	R%kpsw(%sr1, %t1), %t1
+	ldw	CI_PSW(%sr1, %t1), %t1
 	stw	%r1, TF_CR15-TRAPFRAME_SIZEOF(%sr1, %t3)	/* eiem ,bc */
 	stw	%t1, TF_CR22-TRAPFRAME_SIZEOF(%sr1, %t3)	/* ipsw */
 	mfsp	%sr3, %t1
 	stw	%t1, TF_SR3-TRAPFRAME_SIZEOF(%sr1, %t3)
 	stw	%ret0, TF_CR8-TRAPFRAME_SIZEOF(%sr1, %t3)	/* pidr1 */
 	/* now we can allow interrupts to happen */
 	mtctl	%r1, %eiem
 	/*
 	 * Normally, we only have to save the caller-saved registers, because
 	 * the callee-saved registers will be naturally saved and restored by
 @@ -783,30 +783,30 @@ ALTENTRY(os_hpmc_cont)
 	mtsp	%r1, %sr7
 	/* Reload the Interruption Vector Address. */
 	ldil	L%ivaaddr, %r1
 	ldo	R%ivaaddr(%r1), %r1
 	mtctl	%r1, %iva
 	/* Reload the HPT base and mask. */
 	ldil	L%hppa_vtop, %r1
 	ldw	R%hppa_vtop(%r1), %r1
 	mtctl	%r1, CR_VTOP
 	/* Disable interrupts for the long haul. */
-	ldil	L%kpsw, %t1
+	GET_CURCPU(%t1)
-	ldw	R%kpsw(%t1), %r1
+	ldw	CI_PSW(%t1), %r1
 	depi	0, PSW_I_POS, 1, %r1
-	stw	%r1, R%kpsw(%t1)
+	stw	%r1, CI_PSW(%t1)
 	/* Reload the global data pointer. */
 	ldil	L%$global$, %dp
 	ldo	R%$global$(%dp), %dp
 	/* Move onto the emergency stack. */
 	ldil	L%emergency_stack_start, %sp
 	ldo	R%emergency_stack_start(%sp), %sp
 	stwm	%r0, HPPA_FRAME_SIZE(%sp)
 	copy	%sp, %r3
 	/* Start stack calling convention. */
 	stw	%r0, HPPA_FRAME_CRP(%sp)
 @@ -832,28 +832,28 @@ ALTENTRY(os_hpmc_cont)
 	/* Set kernelmapped. */
 	ldil	L%kernelmapped, %r1
 	stw	%r1, R%kernelmapped(%r1)
 	/* Reload %arg0 (it may have been destroyed). */
 	ldi	T_INTERRUPT, %arg0
 	/* Disable the interrupt queues. */
 	rsm	RESET_PSW, %r0
 L$check_do_rfi:
 	/* Load IPSW. */
-	ldil	L%kpsw, %r1
+	GET_CURCPU(%r1)
-	ldw	R%kpsw(%r1), %r1
+	ldw	CI_PSW(%r1), %r1
 	mtctl	%r1, %ipsw
 	/* Get the address of hppa_machine_check. */
 	ldil	L%hppa_machine_check, %r1
 	ldo	R%hppa_machine_check(%r1), %r1
 	/* Load the instruction address queues. */
 	mtctl	%r1, %pcoq
 	ldo	4(%r1), %r1
 	mtctl	%r1, %pcoq
 	ldi	HPPA_SID_KERNEL, %r1
 	mtctl	%r1, %pcsq
 	mtctl	%r1, %pcsq
 @@ -932,43 +932,43 @@ LEAF_ENTRY_NOPROFILE(TLABEL(emu))
 ALTENTRY(hppa_fpu_nop0)
 	b,n	L$emulate_fpu
 	/*
 	 * We have a hardware FPU.  If it is enabled,  branch to emulate the
 	 * instruction.
 	 */
 	mfctl	%ccr, %arg0
 	extru,= %arg0, 25, 2, %r1
 	b,n	L$emulate_fpu
 	/*
 	 * The hardware FPU is disabled, so we need to swap in the FPU state of
-	 * the process whose uspace physical address in CR_UPADDR.  We may also
+	 * the LWP whose uspace physical address in CR_UPADDR.  We may also
-	 * need to swap out the FPU state of any process whose uspace physical
+	 * need to swap out the FPU state of any LWP whose uspace physical
-	 * address is in the fpu_cur_uspace variable.
+	 * address is in curcpu()->ci_fpu_state.
 	 */
 	/*
 	 * So far, the CTRAP() macro has saved %r1 in %tr7, and the dispatching
 	 * above has saved %arg0 in tr2.  Save the other registers that we want
 	 * to use.  hppa_fpu_swap deliberately uses only these registers and %r1
 	 * and %arg0.
 	 */
 	mtctl	%arg1, %tr3
 	mtctl	%rp, %tr5
 	/* Call hppa_fpu_swap. */
-	ldil	L%fpu_cur_uspace, %arg0
+	GET_CURCPU(%arg0)
-	ldw	R%fpu_cur_uspace(%arg0), %arg0
+	ldw	CI_FPU_STATE(%arg0), %arg0
 	mfctl	CR_FPPADDR, %arg1
 	blr	0, %rp
 	b	hppa_fpu_swap
 	nop
 	/* Restore registers and rfi. */
 	mfctl	%tr5, %rp
 	mfctl	%tr3, %arg1
 	mfctl	%tr2, %arg0
 	mfctl	%tr7, %r1
 	rfi
 	nop
 @@ -1099,38 +1099,38 @@ ALTENTRY(hppa_fpu_swap)
 	fdc,m	%r1(%arg0)
 	fdc,m	%r1(%arg0)
 	fdc,m	%r1(%arg0)
 	fdc,m	%r1(%arg0)
 	fdc,m	%r1(%arg0)
 	fdc,m	%r1(%arg0)
 	fdc,m	%r1(%arg0)
 	fdc,m	%r1(%arg0)
 	sync
 L$fpu_swap_in:
 	/*
-	 * Stash the incoming user structure in fpu_cur_uspace.  Because this
+	 * Stash the incoming user structure in curcpu->ci_fpu_state.  Because
-	 * variable holds a physical address, this means that hppa_fpu_swap can
+	 * this variable holds a physical address, this means that hppa_fpu_swap
-	 * only be called with a non-zero user_in from physical mode (i.e., from
+	 * can only be called with a non-zero user_in from physical mode (i.e.,
-	 * the emulation assist trap handler).  And that's exactly what happens
+	 * from the emulation assist trap handler).  And that's exactly what
-	 * now.
+	 * happens now.
+	 *
-	 * So stash fpu_cur_uspace, branching past the swap-in code if it is
+	 * So stash ci->ci_fpu_state, branching past the swap-in code if it is
 	 * zero.
 	 */
-	ldil	L%fpu_cur_uspace, %r1
+	GET_CURCPU(%r1)
 	comb,=	%r0, %arg1, L$fpu_no_swap_in
-	stw	%arg1, R%fpu_cur_uspace(%r1)
+	stw	%arg1, CI_FPU_STATE(%r1)
 	/*
 	 * Swap in the new FPU state.
 	 */
 	ldo	31*8(%arg1), %arg1
 	fldds,ma -8(%arg1), %fr31
 	fldds,ma -8(%arg1), %fr30
 	fldds,ma -8(%arg1), %fr29
 	fldds,ma -8(%arg1), %fr28
 	fldds,ma -8(%arg1), %fr27
 	fldds,ma -8(%arg1), %fr26
 	fldds,ma -8(%arg1), %fr25
 	fldds,ma -8(%arg1), %fr24
 @@ -1936,28 +1936,28 @@ ENTRY_NOPROFILE(TLABEL(all),0)
 	stw	%t2, CI_TRAPSAVE + TF_CR22(%t3)
 	mfsp	%sr3, %t1
 	mfctl	%pidr1, %t2
 	stw	%t1, CI_TRAPSAVE + TF_SR3(%t3)
 	stw	%t2, CI_TRAPSAVE + TF_CR8(%t3)
 	/* Setup kernel context */
 	ldi	HPPA_PID_KERNEL,%t1
 	mtctl	%t1, %pidr1
 	mtsp	%r0, %sr3
 	/* this will enable interrupts after `cold' */
-	ldil	L%kpsw, %t1
+	GET_CURCPU(%t1)
-	ldw	R%kpsw(%t1), %t2
+	ldw	CI_PSW(%t1), %t2
 	mtctl	%r0, %eiem
 	mtctl	%t2, %ipsw
 	/* save interruption instruction address space queue */
 	mfctl	%pcsq, %t1
 	mtctl	%r0, %pcsq
 	mfctl	%pcsq, %t2
 	stw	%t1, CI_TRAPSAVE + TF_IISQH(%t3)	/* use ,bc */
 	stw	%t2, CI_TRAPSAVE + TF_IISQT(%t3)
 	mtctl	%r0, %pcsq
 	/*
 	 * Set up the kernel stack pointer.  If the trap happened while we were

 @@ -1,14 +1,14 @@
-/*	$NetBSD: trap.c,v 1.95 2010/12/20 00:25:34 matt Exp $	*/
+/*	$NetBSD: trap.c,v 1.96 2011/01/23 09:44:59 skrll Exp $	*/
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthew Fredette.
+ *
  * 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.
 @@ -48,27 +48,27 @@
  * 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 AUTHOR OR HIS RELATIVES 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 MIND, 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.95 2010/12/20 00:25:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.96 2011/01/23 09:44:59 skrll Exp $");
 /* #define INTRDEBUG */
 /* #define TRAPDEBUG */
 /* #define USERTRACE */
 #include "opt_kgdb.h"
 #include "opt_ptrace.h"
 #include "opt_sa.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/syscall.h>
 @@ -401,40 +401,40 @@ user_backtrace(struct trapframe *tf, str
 #ifdef DEBUG
 /*
  * This sanity-checks a trapframe.  It is full of various assumptions about
  * what a healthy CPU state should be, with some documented elsewhere, some not.
  */
 void
 frame_sanity_check(const char *func, int line, int type, struct trapframe *tf,
     struct lwp *l)
+{
 #if 0
 	extern int kernel_text;
 	extern int etext;
 #endif
-	extern register_t kpsw;
+	struct cpu_info *ci = curcpu();
 #define SANITY(e)					\
 do {							\
 	if (sanity_frame == NULL && !(e)) {		\
 		sanity_frame = tf;			\
 		sanity_lwp = l;				\
 		sanity_string = #e;			\
 	}						\
 } while (/* CONSTCOND */ 0)
 	KASSERT(l != NULL);
-	SANITY((tf->tf_ipsw & kpsw) == kpsw);
+	SANITY((tf->tf_ipsw & ci->ci_psw) == ci->ci_psw);
-	SANITY((kpsw & PSW_I) == 0 || tf->tf_eiem != 0);
+	SANITY((ci->ci_psw & PSW_I) == 0 || tf->tf_eiem != 0);
 	if (tf->tf_iisq_head == HPPA_SID_KERNEL) {
 		vaddr_t minsp, maxsp, uv;
 		uv = uvm_lwp_getuarea(l);
 		/*
 		 * If the trap happened in the gateway page, we take the easy
 		 * way out and assume that the trapframe is okay.
 		 */
 		if ((tf->tf_iioq_head & ~PAGE_MASK) == SYSCALLGATE)
 			goto out;
 		SANITY(!USERMODE(tf->tf_iioq_head));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: vm_machdep.c,v 1.45 2010/06/06 09:12:39 skrll Exp $	*/
+/*	$NetBSD: vm_machdep.c,v 1.46 2011/01/23 09:44:59 skrll Exp $	*/
 /*	$OpenBSD: vm_machdep.c,v 1.64 2008/09/30 18:54:26 miod Exp $	*/
 /*
  * Copyright (c) 1999-2004 Michael Shalayeff
  * All rights reserved.
+ *
  * 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
 @@ -19,27 +19,27 @@
  * 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 AUTHOR OR HIS RELATIVES 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 MIND, 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.45 2010/06/06 09:12:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.46 2011/01/23 09:44:59 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/signalvar.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/ptrace.h>
 #include <sys/exec.h>
 #include <sys/core.h>
 #include <sys/pool.h>
 @@ -132,27 +132,27 @@ cpu_lwp_fork(struct lwp *l1, struct lwp
 	tf->tf_sr4 = tf->tf_sr5 = tf->tf_sr6 = space;
 	tf->tf_iisq_head = tf->tf_iisq_tail = space;
 	/* Load the protection registers */
 	tf->tf_pidr1 = tf->tf_pidr2 = pmap->pm_pid;
 	/*
 	 * theoretically these could be inherited from the father,
 	 * but just in case.
 	 */
 	tf->tf_sr7 = HPPA_SID_KERNEL;
 	mfctl(CR_EIEM, tf->tf_eiem);
 	tf->tf_ipsw = PSW_C | PSW_Q | PSW_P | PSW_D | PSW_I /* | PSW_L */ |
-	    (kpsw & PSW_O);
+	    (curcpu()->ci_psw & PSW_O);
 	/*
 	 * Set up return value registers as libc:fork() expects
 	 */
 	tf->tf_ret0 = l1->l_proc->p_pid;
 	tf->tf_ret1 = 1;	/* ischild */
 	tf->tf_t1 = 0;		/* errno */
 	/*
 	 * If specified, give the child a different stack.
 	 */
 	if (stack != NULL)
 		tf->tf_sp = (register_t)stack;