CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Sat May 8 13:10:29 UTC 2021 Modified Files: src/sys/arch/hppa/include: param.h Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/hppa/include/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/param.h diff -u src/sys/arch/hppa/include/param.h:1.27 src/sys/arch/hppa/include/param.h:1.28 --- src/sys/arch/hppa/include/param.h:1.27 Fri May 1 08:21:27 2020 +++ src/sys/arch/hppa/include/param.h Sat May 8 13:10:29 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.27 2020/05/01 08:21:27 isaki Exp $ */ +/* $NetBSD: param.h,v 1.28 2021/05/08 13:10:29 skrll Exp $ */ /* $OpenBSD: param.h,v 1.12 2001/07/06 02:07:41 provos Exp $ */ @@ -41,11 +41,11 @@ #define PGSHIFT 12 /* LOG2(NBPG) */ #define NBPG (1 << PGSHIFT) /* bytes/page */ -#define PGOFSET (NBPG-1) /* byte offset into page */ +#define PGOFSET (NBPG - 1) /* byte offset into page */ #define SEGSHIFT (PGSHIFT + (PGSHIFT-PTESHIFT)) /* LOG2(NBSEG) */ #define NBSEG (1 << SEGSHIFT) /* bytes/segment (quadrant) */ -#define SEGOFSET (NBSEG-1) /* byte offset into segment */ +#define SEGOFSET (NBSEG - 1) /* byte offset into segment */ #define KERNBASE 0x /* start of kernel virtual */ #define BTOPKERNBASE ((u_long)KERNBASE >> PGSHIFT) @@ -61,7 +61,7 @@ #define USPACE (UPAGES * NBPG) /* pages for user struct and kstack */ #ifndef MSGBUFSIZE -#define MSGBUFSIZE (2*NBPG) /* default message buffer size */ +#define MSGBUFSIZE (2 * NBPG) /* default message buffer size */ #endif /*
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: simonb Date: Fri Feb 26 01:48:20 UTC 2021 Modified Files: src/sys/arch/hppa/include: vmparam.h Log Message: Use a valuely human readable number for MAXTSIZ. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hppa/include/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/vmparam.h diff -u src/sys/arch/hppa/include/vmparam.h:1.21 src/sys/arch/hppa/include/vmparam.h:1.22 --- src/sys/arch/hppa/include/vmparam.h:1.21 Tue Apr 16 12:25:17 2019 +++ src/sys/arch/hppa/include/vmparam.h Fri Feb 26 01:48:20 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.21 2019/04/16 12:25:17 skrll Exp $ */ +/* $NetBSD: vmparam.h,v 1.22 2021/02/26 01:48:20 simonb Exp $ */ /* $OpenBSD: vmparam.h,v 1.33 2006/06/04 17:21:24 miod Exp $ */ @@ -52,7 +52,7 @@ * Virtual memory related constants, all in bytes */ #ifndef MAXTSIZ -#define MAXTSIZ (0x4000) /* max text size */ +#define MAXTSIZ (1024*1024*1024) /* max text size */ #endif #ifndef DFLDSIZ #define DFLDSIZ (16*1024*1024) /* initial data size limit */
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: christos Date: Sat Dec 5 22:49:50 UTC 2020 Modified Files: src/sys/arch/hppa/include: proc.h types.h Log Message: Use __vaddr_t since we don't expose vaddr_t by default to userland. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hppa/include/proc.h cvs rdiff -u -r1.28 -r1.29 src/sys/arch/hppa/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/proc.h diff -u src/sys/arch/hppa/include/proc.h:1.12 src/sys/arch/hppa/include/proc.h:1.13 --- src/sys/arch/hppa/include/proc.h:1.12 Thu Mar 6 14:02:58 2014 +++ src/sys/arch/hppa/include/proc.h Sat Dec 5 17:49:50 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: proc.h,v 1.12 2014/03/06 19:02:58 skrll Exp $ */ +/* $NetBSD: proc.h,v 1.13 2020/12/05 22:49:50 christos Exp $ */ /* $OpenBSD: proc.h,v 1.4 2009/12/29 13:11:40 jsing Exp $ */ @@ -44,7 +44,7 @@ struct mdlwp { volatile int md_astpending; /* AST pending for this LWP */ int md_flags; /* machine-dependent flags */ - vaddr_t md_bpva; + __vaddr_t md_bpva; unsigned int md_bpsave[2]; }; Index: src/sys/arch/hppa/include/types.h diff -u src/sys/arch/hppa/include/types.h:1.28 src/sys/arch/hppa/include/types.h:1.29 --- src/sys/arch/hppa/include/types.h:1.28 Thu Apr 16 05:51:57 2020 +++ src/sys/arch/hppa/include/types.h Sat Dec 5 17:49:50 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.28 2020/04/16 09:51:57 skrll Exp $ */ +/* $NetBSD: types.h,v 1.29 2020/12/05 22:49:50 christos Exp $ */ /* $OpenBSD: types.h,v 1.6 2001/08/11 01:58:34 art Exp $ */ @@ -49,11 +49,13 @@ typedef struct label_t { } label_t; #endif +typedef unsigned long __vaddr_t; + #if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES) || defined(_STANDALONE) typedef unsigned long hppa_hpa_t; typedef unsigned long hppa_spa_t; typedef unsigned int pa_space_t; -typedef unsigned long vaddr_t; +typedef __vaddr_t vaddr_t; typedef unsigned long vsize_t; typedef unsigned long paddr_t; typedef unsigned long psize_t;
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: riastradh Date: Sat Mar 21 17:00:48 UTC 2020 Modified Files: src/sys/arch/hppa/include: param.h Log Message: Revert another historic $Hdr$ collapse. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hppa/include/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/param.h diff -u src/sys/arch/hppa/include/param.h:1.25 src/sys/arch/hppa/include/param.h:1.26 --- src/sys/arch/hppa/include/param.h:1.25 Thu Mar 5 15:18:54 2020 +++ src/sys/arch/hppa/include/param.h Sat Mar 21 17:00:47 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.25 2020/03/05 15:18:54 riastradh Exp $ */ +/* $NetBSD: param.h,v 1.26 2020/03/21 17:00:47 riastradh Exp $ */ /* $OpenBSD: param.h,v 1.12 2001/07/06 02:07:41 provos Exp $ */ @@ -22,7 +22,7 @@ * CSL requests users of this software to return to csl-d...@cs.utah.edu any * improvements that they make and grant CSL redistribution rights. * - * Utah $Hdr$ + * Utah $Hdr: param.h 1.18 94/12/16$ */ #ifdef _KERNEL
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Thu Dec 5 08:00:05 UTC 2019 Modified Files: src/sys/arch/hppa/include: cpu.h Log Message: Attempt to restore Utah $Hdr$ To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hppa/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/cpu.h diff -u src/sys/arch/hppa/include/cpu.h:1.8 src/sys/arch/hppa/include/cpu.h:1.9 --- src/sys/arch/hppa/include/cpu.h:1.8 Thu Dec 5 03:59:39 2019 +++ src/sys/arch/hppa/include/cpu.h Thu Dec 5 08:00:05 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.8 2019/12/05 03:59:39 riastradh Exp $ */ +/* $NetBSD: cpu.h,v 1.9 2019/12/05 08:00:05 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -47,7 +47,7 @@ * CSL requests users of this software to return to csl-d...@cs.utah.edu any * improvements that they make and grant CSL redistribution rights. * - * Utah $Hdr$ + * Utah $Hdr: cpu.h 1.19 94/12/16$ */ #ifndef _MACHINE_CPU_H_
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: riastradh Date: Thu Dec 5 03:59:39 UTC 2019 Modified Files: src/sys/arch/hppa/include: cpu.h Log Message: Only need one ci_onproc member. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/cpu.h diff -u src/sys/arch/hppa/include/cpu.h:1.7 src/sys/arch/hppa/include/cpu.h:1.8 --- src/sys/arch/hppa/include/cpu.h:1.7 Wed Dec 4 07:49:39 2019 +++ src/sys/arch/hppa/include/cpu.h Thu Dec 5 03:59:39 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.7 2019/12/04 07:49:39 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.8 2019/12/05 03:59:39 riastradh Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -47,7 +47,7 @@ * CSL requests users of this software to return to csl-d...@cs.utah.edu any * improvements that they make and grant CSL redistribution rights. * - * Utah $Hdr: cpu.h 1.19 94/12/16$ + * Utah $Hdr$ */ #ifndef _MACHINE_CPU_H_ @@ -296,7 +296,6 @@ struct cpu_info { #define CPUF_PRIMARY 0x0001 /* ... is monarch/primary */ #define CPUF_RUNNING 0x0002 /* ... is running. */ - struct lwp *ci_onproc; /* current user LWP / kthread */ volatile u_long ci_ipi; /* IPIs pending */ struct cpu_softc *ci_softc;
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Wed Dec 4 07:49:39 UTC 2019 Modified Files: src/sys/arch/hppa/include: cpu.h Log Message: +ci_onproc To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hppa/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/cpu.h diff -u src/sys/arch/hppa/include/cpu.h:1.6 src/sys/arch/hppa/include/cpu.h:1.7 --- src/sys/arch/hppa/include/cpu.h:1.6 Sun Dec 1 15:34:44 2019 +++ src/sys/arch/hppa/include/cpu.h Wed Dec 4 07:49:39 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.6 2019/12/01 15:34:44 ad Exp $ */ +/* $NetBSD: cpu.h,v 1.7 2019/12/04 07:49:39 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -288,6 +288,7 @@ struct cpu_info { struct hppa_interrupt_register ci_ir; struct hppa_interrupt_bit ci_ib[HPPA_INTERRUPT_BITS]; + struct lwp *ci_onproc; /* current user LWP / kthread */ #if defined(MULTIPROCESSOR) struct lwp *ci_curlwp; /* CPU owner */ paddr_t ci_stack; /* stack for spin up */
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Tue Apr 16 12:25:17 UTC 2019 Modified Files: src/sys/arch/hppa/include: aout_machdep.h asm.h cpu.h exec.h ieeefp.h int_limits.h limits.h lock.h param.h pcb.h pte.h reg.h signal.h vmparam.h Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/include/aout_machdep.h \ src/sys/arch/hppa/include/exec.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hppa/include/asm.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/hppa/include/cpu.h \ src/sys/arch/hppa/include/pte.h cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/include/ieeefp.h \ src/sys/arch/hppa/include/signal.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hppa/include/int_limits.h cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hppa/include/limits.h cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hppa/include/lock.h \ src/sys/arch/hppa/include/vmparam.h cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hppa/include/param.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hppa/include/pcb.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hppa/include/reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/aout_machdep.h diff -u src/sys/arch/hppa/include/aout_machdep.h:1.2 src/sys/arch/hppa/include/aout_machdep.h:1.3 --- src/sys/arch/hppa/include/aout_machdep.h:1.2 Tue Dec 10 17:14:10 2002 +++ src/sys/arch/hppa/include/aout_machdep.h Tue Apr 16 12:25:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: aout_machdep.h,v 1.2 2002/12/10 17:14:10 thorpej Exp $ */ +/* $NetBSD: aout_machdep.h,v 1.3 2019/04/16 12:25:17 skrll Exp $ */ /* * Copyright (c) 1993 Christopher G. Demetriou @@ -34,7 +34,7 @@ * XXX fredette - the definitions in this file (with * the possible exception of AOUT_LDPGSZ) are bogus, * and they exist only to let certain userland programs - * compile. I don't think any SunOS-style a.out HPPA + * compile. I don't think any SunOS-style a.out HPPA * binaries exist. */ @@ -44,7 +44,7 @@ struct relocation_info_hppa { int r_address;/* offset in text or data segment */ unsigned int r_symbolnum : 24, /* ordinal number of add symbol */ - r_pcrel : 1, /* 1 if value should be pc-relative */ + r_pcrel : 1, /* 1 if value should be pc-relative */ r_length : 2, /* log base 2 of value's width */ r_extern : 1, /* 1 if need to add symbol to value */ r_baserel : 1, /* linkage table relative */ Index: src/sys/arch/hppa/include/exec.h diff -u src/sys/arch/hppa/include/exec.h:1.2 src/sys/arch/hppa/include/exec.h:1.3 --- src/sys/arch/hppa/include/exec.h:1.2 Tue Dec 10 17:14:10 2002 +++ src/sys/arch/hppa/include/exec.h Tue Apr 16 12:25:17 2019 @@ -1,8 +1,8 @@ -/* $NetBSD: exec.h,v 1.2 2002/12/10 17:14:10 thorpej Exp $ */ +/* $NetBSD: exec.h,v 1.3 2019/04/16 12:25:17 skrll Exp $ */ /* $OpenBSD: exec.h,v 1.6 2001/01/22 14:51:03 art Exp $ */ -/* +/* * Copyright (c) 1994, The University of Utah and * the Computer Systems Laboratory at the University of Utah (CSL). * All rights reserved. @@ -37,7 +37,7 @@ #define ELF_TARG_CLASS ELFCLASS32 #define ELF_TARG_DATA ELFDATA2MSB -#define ELF_TARG_MACH EM_PARISC +#define ELF_TARG_MACH EM_PARISC /* #define _NLIST_DO_AOUT */ /* #define _NLIST_DO_ECOFF */ Index: src/sys/arch/hppa/include/asm.h diff -u src/sys/arch/hppa/include/asm.h:1.15 src/sys/arch/hppa/include/asm.h:1.16 --- src/sys/arch/hppa/include/asm.h:1.15 Thu Sep 12 15:36:17 2013 +++ src/sys/arch/hppa/include/asm.h Tue Apr 16 12:25:17 2019 @@ -1,8 +1,8 @@ -/* $NetBSD: asm.h,v 1.15 2013/09/12 15:36:17 joerg Exp $ */ +/* $NetBSD: asm.h,v 1.16 2019/04/16 12:25:17 skrll Exp $ */ /* $OpenBSD: asm.h,v 1.12 2001/03/29 02:15:57 mickey Exp $ */ -/* +/* * Copyright (c) 1990,1991,1994 The University of Utah and * the Computer Systems Laboratory (CSL). All rights reserved. * Index: src/sys/arch/hppa/include/cpu.h diff -u src/sys/arch/hppa/include/cpu.h:1.4 src/sys/arch/hppa/include/cpu.h:1.5 --- src/sys/arch/hppa/include/cpu.h:1.4 Wed Aug 22 01:05:22 2018 +++ src/sys/arch/hppa/include/cpu.h Tue Apr 16 12:25:17 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.4 2018/08/22 01:05:22 msaitoh Exp $ */ +/* $NetBSD: cpu.h,v 1.5 2019/04/16 12:25:17 skrll Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -79,7 +79,7 @@ enum hppa_cpu_type { hpcxtp, /* PA7200 (t') PA 1.1d */ hpcxl2, /* PA7300LC (l2) PA 1.1e */ hpcxu, /* PA8000 (u) PA 2.0 */ - hpcxup, /* PA8200 (u+) PA 2.0 */ + hpcxup, /* PA8200 (u+) PA 2.0 */ hpcxw, /* PA8500 (w) PA 2.0 */ hpcxwp, /* PA8600 (w+) PA 2.0 */ hpcxw2, /* PA8700 (piranha) PA 2.0 */ @@ -287,7 +287,7 @@ struct cpu_info { struct hppa_interrupt_register ci_ir; struct hppa_interrupt_bit ci_ib[HPPA_INTERRUPT_BITS]; - + #if defined(MULTIPROCESSOR) struct lwp *ci_curlwp; /* CPU owner */ paddr_t c
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: kamil Date: Tue Feb 27 11:26:39 UTC 2018 Modified Files: src/sys/arch/hppa/include: mcontext.h Log Message: Implement _UC_MACHINE_INTRV() for hppa INTRV = integer return value For hppa this is R28 alias _REG_RET0. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/hppa/include/mcontext.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/mcontext.h diff -u src/sys/arch/hppa/include/mcontext.h:1.9 src/sys/arch/hppa/include/mcontext.h:1.10 --- src/sys/arch/hppa/include/mcontext.h:1.9 Thu Feb 15 15:53:56 2018 +++ src/sys/arch/hppa/include/mcontext.h Tue Feb 27 11:26:39 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: mcontext.h,v 1.9 2018/02/15 15:53:56 kamil Exp $ */ +/* $NetBSD: mcontext.h,v 1.10 2018/02/27 11:26:39 kamil Exp $ */ #ifndef _HPPA_MCONTEXT_H_ #define _HPPA_MCONTEXT_H_ @@ -57,6 +57,7 @@ do { \ (uc)->uc_mcontext.__gregs[_REG_PCOQH] = (pc); \ (uc)->uc_mcontext.__gregs[_REG_PCOQT] = (pc) + 4; \ } while (/*CONSTCOND*/0) +#define _UC_MACHINE_INTRV(uc) ((uc)->uc_mcontext.__gregs[_REG_RET0]) static __inline void * __lwp_getprivate_fast(void)
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: christos Date: Wed Nov 29 17:36:03 UTC 2017 Modified Files: src/sys/arch/hppa/include: signal.h Log Message: need sigtypes.h for sigset_t, since includes this directly. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hppa/include/signal.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/signal.h diff -u src/sys/arch/hppa/include/signal.h:1.6 src/sys/arch/hppa/include/signal.h:1.7 --- src/sys/arch/hppa/include/signal.h:1.6 Sun Jan 2 13:07:02 2011 +++ src/sys/arch/hppa/include/signal.h Wed Nov 29 12:36:03 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: signal.h,v 1.6 2011/01/02 18:07:02 skrll Exp $ */ +/* $NetBSD: signal.h,v 1.7 2017/11/29 17:36:03 christos Exp $ */ /* $OpenBSD: signal.h,v 1.1 1998/06/23 19:45:27 mickey Exp $ */ @@ -33,6 +33,7 @@ */ #include +#include typedef int sig_atomic_t;
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: christos Date: Wed Oct 4 23:04:42 UTC 2017 Modified Files: src/sys/arch/hppa/include: mutex.h Log Message: const me harder! To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hppa/include/mutex.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/mutex.h diff -u src/sys/arch/hppa/include/mutex.h:1.12 src/sys/arch/hppa/include/mutex.h:1.13 --- src/sys/arch/hppa/include/mutex.h:1.12 Sun Sep 24 03:39:28 2017 +++ src/sys/arch/hppa/include/mutex.h Wed Oct 4 19:04:42 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: mutex.h,v 1.12 2017/09/24 07:39:28 christos Exp $ */ +/* $NetBSD: mutex.h,v 1.13 2017/10/04 23:04:42 christos Exp $ */ /*- * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc. @@ -141,13 +141,13 @@ MUTEX_DEBUG_P(const volatile struct kmut } static inline int -MUTEX_SPIN_P(volatile struct kmutex *mtx) +MUTEX_SPIN_P(const volatile struct kmutex *mtx) { return mtx->mtx_owner == MUTEX_SPIN_FLAG; } static inline int -MUTEX_ADAPTIVE_P(volatile struct kmutex *mtx) +MUTEX_ADAPTIVE_P(const volatile struct kmutex *mtx) { return mtx->mtx_owner != MUTEX_SPIN_FLAG; }
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: christos Date: Sun Sep 24 07:39:28 UTC 2017 Modified Files: src/sys/arch/hppa/include: mutex.h Log Message: const me harder. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/hppa/include/mutex.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/mutex.h diff -u src/sys/arch/hppa/include/mutex.h:1.11 src/sys/arch/hppa/include/mutex.h:1.12 --- src/sys/arch/hppa/include/mutex.h:1.11 Tue Nov 16 04:35:14 2010 +++ src/sys/arch/hppa/include/mutex.h Sun Sep 24 03:39:28 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: mutex.h,v 1.11 2010/11/16 09:35:14 uebayasi Exp $ */ +/* $NetBSD: mutex.h,v 1.12 2017/09/24 07:39:28 christos Exp $ */ /*- * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc. @@ -106,7 +106,7 @@ MUTEX_SET_WAITERS(struct kmutex *mtx, ui } static inline int -MUTEX_HAS_WAITERS(volatile struct kmutex *mtx) +MUTEX_HAS_WAITERS(const volatile struct kmutex *mtx) { return mtx->mtx_waiters != 0; } @@ -135,7 +135,7 @@ MUTEX_DESTROY(struct kmutex *mtx) } static inline bool -MUTEX_DEBUG_P(struct kmutex *mtx) +MUTEX_DEBUG_P(const volatile struct kmutex *mtx) { return mtx->mtx_dodebug != 0; }
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: christos Date: Sun Jan 15 18:03:12 UTC 2017 Modified Files: src/sys/arch/hppa/include: lock.h Log Message: undo paren change To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hppa/include/lock.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/lock.h diff -u src/sys/arch/hppa/include/lock.h:1.18 src/sys/arch/hppa/include/lock.h:1.19 --- src/sys/arch/hppa/include/lock.h:1.18 Sun Jan 15 10:27:41 2017 +++ src/sys/arch/hppa/include/lock.h Sun Jan 15 13:03:12 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: lock.h,v 1.18 2017/01/15 15:27:41 christos Exp $ */ +/* $NetBSD: lock.h,v 1.19 2017/01/15 18:03:12 christos Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ #define HPPA_LDCW_ALIGN 16UL #define __SIMPLELOCK_ALIGN(p) \ -(volatile unsigned long *)(((uintptr_t)((p) + HPPA_LDCW_ALIGN - 1)) & \ +(volatile unsigned long *)uintptr_t)(p) + HPPA_LDCW_ALIGN - 1)) & \ ~(HPPA_LDCW_ALIGN - 1)) #define __SIMPLELOCK_RAW_LOCKED 0UL
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: christos Date: Sun Jan 15 15:27:41 UTC 2017 Modified Files: src/sys/arch/hppa/include: lock.h Log Message: more types for constants To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hppa/include/lock.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/lock.h diff -u src/sys/arch/hppa/include/lock.h:1.17 src/sys/arch/hppa/include/lock.h:1.18 --- src/sys/arch/hppa/include/lock.h:1.17 Sat Jan 14 10:58:11 2017 +++ src/sys/arch/hppa/include/lock.h Sun Jan 15 10:27:41 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: lock.h,v 1.17 2017/01/14 15:58:11 christos Exp $ */ +/* $NetBSD: lock.h,v 1.18 2017/01/15 15:27:41 christos Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -39,10 +39,10 @@ #include -#define HPPA_LDCW_ALIGN 16 +#define HPPA_LDCW_ALIGN 16UL #define __SIMPLELOCK_ALIGN(p) \ -(volatile unsigned long *)(((uintptr_t)(p) + HPPA_LDCW_ALIGN - 1) & \ +(volatile unsigned long *)(((uintptr_t)((p) + HPPA_LDCW_ALIGN - 1)) & \ ~(HPPA_LDCW_ALIGN - 1)) #define __SIMPLELOCK_RAW_LOCKED 0UL
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: christos Date: Sat Jan 14 15:58:11 UTC 2017 Modified Files: src/sys/arch/hppa/include: lock.h Log Message: fix constant types To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hppa/include/lock.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/lock.h diff -u src/sys/arch/hppa/include/lock.h:1.16 src/sys/arch/hppa/include/lock.h:1.17 --- src/sys/arch/hppa/include/lock.h:1.16 Mon Apr 28 16:23:23 2008 +++ src/sys/arch/hppa/include/lock.h Sat Jan 14 10:58:11 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: lock.h,v 1.16 2008/04/28 20:23:23 martin Exp $ */ +/* $NetBSD: lock.h,v 1.17 2017/01/14 15:58:11 christos Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc. @@ -45,8 +45,8 @@ (volatile unsigned long *)(((uintptr_t)(p) + HPPA_LDCW_ALIGN - 1) & \ ~(HPPA_LDCW_ALIGN - 1)) -#define __SIMPLELOCK_RAW_LOCKED 0 -#define __SIMPLELOCK_RAW_UNLOCKED 1 +#define __SIMPLELOCK_RAW_LOCKED 0UL +#define __SIMPLELOCK_RAW_UNLOCKED 1UL static __inline int __SIMPLELOCK_LOCKED_P(__cpu_simple_lock_t *__ptr)
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: christos Date: Fri Nov 25 02:27:43 UTC 2016 Modified Files: src/sys/arch/hppa/include: ptrace.h Log Message: fix register names To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/include/ptrace.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/ptrace.h diff -u src/sys/arch/hppa/include/ptrace.h:1.5 src/sys/arch/hppa/include/ptrace.h:1.6 --- src/sys/arch/hppa/include/ptrace.h:1.5 Fri Sep 25 12:05:17 2015 +++ src/sys/arch/hppa/include/ptrace.h Thu Nov 24 21:27:43 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: ptrace.h,v 1.5 2015/09/25 16:05:17 christos Exp $ */ +/* $NetBSD: ptrace.h,v 1.6 2016/11/25 02:27:43 christos Exp $ */ /* $OpenBSD: ptrace.h,v 1.2 1998/12/01 03:05:44 mickey Exp $ */ @@ -50,8 +50,8 @@ (r)->r_pcoqh = (v); \ (r)->r_pcoqt = (v) + 4; \ } while (/*CONSTCOND*/0) -#define PTRACE_REG_SP(r) (r)->r_out[30] -#define PTRACE_REG_INTRV(r) (r)->r_out[28] +#define PTRACE_REG_SP(r) (r)->r_regs[30] +#define PTRACE_REG_INTRV(r) (r)->r_regs[28] #define PTRACE_BREAKPOINT ((const uint8_t[]) { 0x00, 0x01, 0x00, 0x04 }) #define PTRACE_BREAKPOINT_SIZE 4
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: christos Date: Mon Jan 25 18:14:40 UTC 2016 Modified Files: src/sys/arch/hppa/include: cpu.h Log Message: Don't expose kernel structs to userland. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hppa/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/cpu.h diff -u src/sys/arch/hppa/include/cpu.h:1.2 src/sys/arch/hppa/include/cpu.h:1.3 --- src/sys/arch/hppa/include/cpu.h:1.2 Thu Mar 6 14:02:58 2014 +++ src/sys/arch/hppa/include/cpu.h Mon Jan 25 13:14:40 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.2 2014/03/06 19:02:58 skrll Exp $ */ +/* $NetBSD: cpu.h,v 1.3 2016/01/25 18:14:40 christos Exp $ */ /* $OpenBSD: cpu.h,v 1.55 2008/07/23 17:39:35 kettenis Exp $ */ @@ -86,6 +86,7 @@ enum hppa_cpu_type { mako /* PA8800 (mako) PA 2.0 */ }; +#ifdef _KERNEL /* * A CPU description. */ @@ -116,7 +117,6 @@ struct hppa_cpu_info { 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;
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Mon Jan 11 08:14:08 UTC 2016 Modified Files: src/sys/arch/hppa/include: db_machdep.h Log Message: PR port-hppa/50642: src/sys/arch/hppa/include/db_machdep.h:118: bad if test ? Correct the test for rfir and add one for rfi while I'm here. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hppa/include/db_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/db_machdep.h diff -u src/sys/arch/hppa/include/db_machdep.h:1.12 src/sys/arch/hppa/include/db_machdep.h:1.13 --- src/sys/arch/hppa/include/db_machdep.h:1.12 Wed Jan 18 09:35:48 2012 +++ src/sys/arch/hppa/include/db_machdep.h Mon Jan 11 08:14:08 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: db_machdep.h,v 1.12 2012/01/18 09:35:48 skrll Exp $ */ +/* $NetBSD: db_machdep.h,v 1.13 2016/01/11 08:14:08 skrll Exp $ */ /* $OpenBSD: db_machdep.h,v 1.5 2001/02/16 19:20:13 mickey Exp $ */ @@ -115,7 +115,8 @@ static __inline int inst_return(u_int in (ins & 0xfc00) == 0xe000; } static __inline int inst_trap_return(u_int ins) { - return (ins & 0xfc001fc0) == 0x0ca0; + return (ins & 0xfc001fe0) == 0x0c00 || + (ins & 0xfc001fe0) == 0x0ca0; } #define db_clear_single_step(r) ((r)->tf_ipsw &= ~PSW_R)
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: martin Date: Tue Jan 13 11:15:29 UTC 2015 Modified Files: src/sys/arch/hppa/include: fenv.h ieeefp.h Log Message: Properly separate fenv.h and ieeefp.h by moving all fenv defines over to the former. Now that they are decoupled, make rounding modes match the hardware bits. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/include/fenv.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/hppa/include/ieeefp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/fenv.h diff -u src/sys/arch/hppa/include/fenv.h:1.1 src/sys/arch/hppa/include/fenv.h:1.2 --- src/sys/arch/hppa/include/fenv.h:1.1 Sat Dec 27 16:54:03 2014 +++ src/sys/arch/hppa/include/fenv.h Tue Jan 13 11:15:29 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: fenv.h,v 1.1 2014/12/27 16:54:03 martin Exp $ */ +/* $NetBSD: fenv.h,v 1.2 2015/01/13 11:15:29 martin Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -31,7 +31,23 @@ #define _HPPA_FENV_H_ #include -#include + +typedef unsigned fenv_t; +typedef unsigned fexcept_t; + +#define FE_INEXACT 0x01 /* imprecise (loss of precision) */ +#define FE_UNDERFLOW 0x02 /* underflow exception */ +#define FE_OVERFLOW 0x04 /* overflow exception */ +#define FE_DIVBYZERO 0x08 /* divide-by-zero exception */ +#define FE_INVALID 0x10 /* invalid operation exception */ + +#define FE_ALL_EXCEPT 0x1f + +#define FE_TONEAREST (0) /* round to nearest representable number */ +#define FE_TOWARDZERO (1<<9) /* round to zero (truncate) */ +#define FE_UPWARD (2<<9) /* round toward positive infinity */ +#define FE_DOWNWARD (3<<9) /* round toward negative infinity */ + __BEGIN_DECLS Index: src/sys/arch/hppa/include/ieeefp.h diff -u src/sys/arch/hppa/include/ieeefp.h:1.6 src/sys/arch/hppa/include/ieeefp.h:1.7 --- src/sys/arch/hppa/include/ieeefp.h:1.6 Mon Jan 12 09:14:45 2015 +++ src/sys/arch/hppa/include/ieeefp.h Tue Jan 13 11:15:29 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ieeefp.h,v 1.6 2015/01/12 09:14:45 mrg Exp $ */ +/* $NetBSD: ieeefp.h,v 1.7 2015/01/13 11:15:29 martin Exp $ */ /* * Written by J.T. Conklin, Apr 6, 1995 @@ -12,36 +12,20 @@ #if defined(_NETBSD_SOURCE) || defined(_ISOC99_SOURCE) -typedef unsigned fenv_t; -typedef unsigned fexcept_t; - -#define FE_INEXACT 0x01 /* imprecise (loss of precision) */ -#define FE_UNDERFLOW 0x02 /* underflow exception */ -#define FE_OVERFLOW 0x04 /* overflow exception */ -#define FE_DIVBYZERO 0x08 /* divide-by-zero exception */ -#define FE_INVALID 0x10 /* invalid operation exception */ - -#define FE_ALL_EXCEPT 0x1f - -#define FE_TONEAREST 0 /* round to nearest representable number */ -#define FE_TOWARDZERO 1 /* round to zero (truncate) */ -#define FE_UPWARD 2 /* round toward positive infinity */ -#define FE_DOWNWARD 3 /* round toward negative infinity */ - #if !defined(_ISOC99_SOURCE) typedef int fp_except; -#define FP_X_INV FE_INVALID /* invalid operation exception */ -#define FP_X_DZ FE_DIVBYZERO /* divide-by-zero exception */ -#define FP_X_OFL FE_OVERFLOW /* overflow exception */ -#define FP_X_UFL FE_UNDERFLOW /* underflow exception */ -#define FP_X_IMP FE_INEXACT /* imprecise (loss of precision) */ +#define FP_X_INV 0x10 /* invalid operation exception */ +#define FP_X_DZ 0x08 /* divide-by-zero exception */ +#define FP_X_OFL 0x04 /* overflow exception */ +#define FP_X_UFL 0x02 /* underflow exception */ +#define FP_X_IMP 0x01 /* imprecise (loss of precision) */ typedef enum { -FP_RN=FE_TONEAREST, /* round to nearest representable number */ -FP_RZ=FE_TOWARDZERO, /* round to zero (truncate) */ -FP_RP=FE_UPWARD, /* round toward positive infinity */ -FP_RM=FE_DOWNWARD /* round toward negative infinity */ +FP_RN=0, /* round to nearest representable number */ +FP_RZ=1, /* round to zero (truncate) */ +FP_RP=2, /* round toward positive infinity */ +FP_RM=3 /* round toward negative infinity */ } fp_rnd; #endif /* !_ISOC99_SOURCE */
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: mrg Date: Mon Jan 12 09:14:45 UTC 2015 Modified Files: src/sys/arch/hppa/include: ieeefp.h Log Message: use unsigned over uint32_t so that this file works without stdint.h being included before hand. fixes mknative-gcc problems, and likely others. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/include/ieeefp.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/ieeefp.h diff -u src/sys/arch/hppa/include/ieeefp.h:1.5 src/sys/arch/hppa/include/ieeefp.h:1.6 --- src/sys/arch/hppa/include/ieeefp.h:1.5 Sat Dec 27 16:54:03 2014 +++ src/sys/arch/hppa/include/ieeefp.h Mon Jan 12 09:14:45 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ieeefp.h,v 1.5 2014/12/27 16:54:03 martin Exp $ */ +/* $NetBSD: ieeefp.h,v 1.6 2015/01/12 09:14:45 mrg Exp $ */ /* * Written by J.T. Conklin, Apr 6, 1995 @@ -12,8 +12,8 @@ #if defined(_NETBSD_SOURCE) || defined(_ISOC99_SOURCE) -typedef uint32_t fenv_t; -typedef uint32_t fexcept_t; +typedef unsigned fenv_t; +typedef unsigned fexcept_t; #define FE_INEXACT 0x01 /* imprecise (loss of precision) */ #define FE_UNDERFLOW 0x02 /* underflow exception */
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: matt Date: Fri Jan 31 12:40:37 UTC 2014 Modified Files: src/sys/arch/hppa/include: ieee.h Log Message: Add inclusion protection. Convert to ieee_ext to use uint64_t Format uses implicit NBIT To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hppa/include/ieee.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/ieee.h diff -u src/sys/arch/hppa/include/ieee.h:1.12 src/sys/arch/hppa/include/ieee.h:1.13 --- src/sys/arch/hppa/include/ieee.h:1.12 Sun Jul 10 04:49:37 2011 +++ src/sys/arch/hppa/include/ieee.h Fri Jan 31 12:40:37 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ieee.h,v 1.12 2011/07/10 04:49:37 matt Exp $ */ +/* $NetBSD: ieee.h,v 1.13 2014/01/31 12:40:37 matt Exp $ */ /* $OpenBSD: ieee.h,v 1.1 1999/04/20 19:44:04 mickey Exp $ */ @@ -42,6 +42,9 @@ * @(#)ieee.h 8.1 (Berkeley) 6/11/93 */ +#ifndef _HPPA_IEEE_H_ +#define _HPPA_IEEE_H_ + /* * ieee.h defines the machine-dependent layout of the machine's IEEE * floating point. It does *not* define (yet?) any of the rounding @@ -52,26 +55,22 @@ #ifdef _LP64 #define EXT_EXPBITS 15 -#define EXT_FRACHBITS 16 -#define EXT_FRACHMBITS 32 -#define EXT_FRACLMBITS 32 -#define EXT_FRACLBITS 32 -#define EXT_FRACBITS (EXT_FRACLBITS + EXT_FRACLMBITS + EXT_FRACHMBITS + EXT_FRACHBITS) - -#define EXT_TO_ARRAY32(u, a) do { \ - (a)[0] = (uint32_t)(u).extu_ext.ext_fracl; \ - (a)[1] = (uint32_t)(u).extu_ext.ext_fraclm; \ - (a)[2] = (uint32_t)(u).extu_ext.ext_frachm; \ - (a)[3] = (uint32_t)(u).extu_ext.ext_frach; \ +#define EXT_FRACHBITS 48 +#define EXT_FRACLBITS 64 +#define EXT_FRACBITS (EXT_FRACLBITS + EXT_FRACHBITS) + +#define EXT_TO_ARRAY32(u, a) do {\ + (a)[0] = (uint32_t)((u).extu_ext.ext_fracl >> 0); \ + (a)[1] = (uint32_t)((u).extu_ext.ext_fracl >> 32); \ + (a)[2] = (uint32_t)((u).extu_ext.ext_frach >> 0); \ + (a)[3] = (uint32_t)((u).extu_ext.ext_frach >> 32); \ } while(/*CONSTCOND*/0) struct ieee_ext { - u_int ext_sign:1; - u_int ext_exp:EXT_EXPBITS; - u_int ext_frach:EXT_FRACHBITS; - u_int ext_frachm; - u_int ext_fraclm; - u_int ext_fracl; + uint64_t ext_sign:1; + uint64_t ext_exp:EXT_EXPBITS; + uint64_t ext_frach:EXT_FRACHBITS; + uint64_t ext_fracl; }; /* @@ -109,11 +108,10 @@ union ieee_ext_u { #define extu_exp extu_ext.ext_exp #define extu_sign extu_ext.ext_sign #define extu_fracl extu_ext.ext_fracl -#define extu_fraclm extu_ext.ext_fraclm -#define extu_frachm extu_ext.ext_frachm #define extu_frach extu_ext.ext_frach -#define LDBL_NBIT 0x8000 -#define mask_nbit_l(u) ((u).extu_frach &= ~LDBL_NBIT) +#define LDBL_IMPLICIT_NBIT 1 /* our NBIT is implicit */ #endif /* _LP64 */ + +#endif /* !_HPPA_IEEE_H_ */
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Sat Jul 13 10:26:31 UTC 2013 Modified Files: src/sys/arch/hppa/include: asm.h Log Message: Put some common entry stuff into _ENTRY and use it. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hppa/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/asm.h diff -u src/sys/arch/hppa/include/asm.h:1.13 src/sys/arch/hppa/include/asm.h:1.14 --- src/sys/arch/hppa/include/asm.h:1.13 Sat Feb 12 16:31:32 2011 +++ src/sys/arch/hppa/include/asm.h Sat Jul 13 10:26:30 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.13 2011/02/12 16:31:32 matt Exp $ */ +/* $NetBSD: asm.h,v 1.14 2013/07/13 10:26:30 skrll Exp $ */ /* $OpenBSD: asm.h,v 1.12 2001/03/29 02:15:57 mickey Exp $ */ @@ -42,15 +42,17 @@ #define _ASM_LS_CHAR ! -#define LEAF_ENTRY_NOPROFILE(x)!\ +#define _ENTRY(x) \ ! .text ! .align 4!\ - .export x, entry ! .label x ! .proc !\ + .export x, entry ! .label x ! .proc + +#define LEAF_ENTRY_NOPROFILE(x)!\ + _ENTRY(x) !\ .callinfo frame=0, no_calls, save_rp !\ .entry #define ENTRY_NOPROFILE(x,n)!\ - ! .text ! .align 4!\ - .export x, entry ! .label x ! .proc !\ + _ENTRY(x) !\ .callinfo frame=n, calls, save_rp, save_sp !\ .entry
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: chs Date: Mon Jan 7 16:57:28 UTC 2013 Modified Files: src/sys/arch/hppa/include: pmap.h vmparam.h Log Message: switch to __USE_TOPDOWN_VM. move the stack to the top of the user address space so that the available free space is more contiguous. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/hppa/include/pmap.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hppa/include/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/pmap.h diff -u src/sys/arch/hppa/include/pmap.h:1.36 src/sys/arch/hppa/include/pmap.h:1.37 --- src/sys/arch/hppa/include/pmap.h:1.36 Fri Jan 6 20:55:28 2012 +++ src/sys/arch/hppa/include/pmap.h Mon Jan 7 16:57:28 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.36 2012/01/06 20:55:28 skrll Exp $ */ +/* $NetBSD: pmap.h,v 1.37 2013/01/07 16:57:28 chs Exp $ */ /* $OpenBSD: pmap.h,v 1.35 2007/12/14 18:32:23 deraadt Exp $ */ @@ -118,13 +118,23 @@ static inline paddr_t hppa_unmap_poolpag * according to the parisc manual aliased va's should be * different by high 12 bits only. */ -#define PMAP_PREFER(o,h,s,td) do { \ - vaddr_t pmap_prefer_hint; \ - pmap_prefer_hint = (*(h) & HPPA_PGAMASK) | ((o) & HPPA_PGAOFF); \ - if (pmap_prefer_hint < *(h)) \ - pmap_prefer_hint += HPPA_PGALIAS; \ - *(h) = pmap_prefer_hint; \ -} while(0) +#define PMAP_PREFER(o,h,s,td) pmap_prefer((o), (h), (td)) + +static inline void +pmap_prefer(vaddr_t fo, vaddr_t *va, int td) +{ + vaddr_t newva; + + newva = (*va & HPPA_PGAMASK) | (fo & HPPA_PGAOFF); + if (td) { + if (newva > *va) + newva -= HPPA_PGALIAS; + } else { + if (newva < *va) + newva += HPPA_PGALIAS; + } + *va = newva; +} #define pmap_sid2pid(s) (((s) + 1) << 1) #define pmap_resident_count(pmap) ((pmap)->pm_stats.resident_count) Index: src/sys/arch/hppa/include/vmparam.h diff -u src/sys/arch/hppa/include/vmparam.h:1.19 src/sys/arch/hppa/include/vmparam.h:1.20 --- src/sys/arch/hppa/include/vmparam.h:1.19 Tue Nov 16 09:34:24 2010 +++ src/sys/arch/hppa/include/vmparam.h Mon Jan 7 16:57:28 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.19 2010/11/16 09:34:24 uebayasi Exp $ */ +/* $NetBSD: vmparam.h,v 1.20 2013/01/07 16:57:28 chs Exp $ */ /* $OpenBSD: vmparam.h,v 1.33 2006/06/04 17:21:24 miod Exp $ */ @@ -28,6 +28,8 @@ #ifndef _HPPA_VMPARAM_H_ #define _HPPA_VMPARAM_H_ +#define __USE_TOPDOWN_VM + /* * Machine dependent constants for HP PA */ @@ -43,8 +45,8 @@ /* * USRSTACK is the bottom (start) of the user stack. */ -#define USRSTACK 0x7000 /* Start of user stack */ -#define SYSCALLGATE 0xC000 /* syscall gateway page */ +#define USRSTACK (VM_MAXUSER_ADDRESS - MAXSSIZ) /* Start of user stack */ +#define SYSCALLGATE 0xc000 /* syscall gateway page */ /* * Virtual memory related constants, all in bytes
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Mon May 21 07:42:52 UTC 2012 Modified Files: src/sys/arch/hppa/include: cpufunc.h Log Message: Provide hppa_{enable,disable}_irq To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hppa/include/cpufunc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/cpufunc.h diff -u src/sys/arch/hppa/include/cpufunc.h:1.16 src/sys/arch/hppa/include/cpufunc.h:1.17 --- src/sys/arch/hppa/include/cpufunc.h:1.16 Tue Apr 3 12:07:26 2012 +++ src/sys/arch/hppa/include/cpufunc.h Mon May 21 07:42:51 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.h,v 1.16 2012/04/03 12:07:26 skrll Exp $ */ +/* $NetBSD: cpufunc.h,v 1.17 2012/05/21 07:42:51 skrll Exp $ */ /* $OpenBSD: cpufunc.h,v 1.17 2000/05/15 17:22:40 mickey Exp $ */ @@ -172,6 +172,18 @@ pdtlbe(pa_space_t sp, vaddr_t va) __asm volatile("pdtlbe %%r0(%%sr1, %0)":: "r" (va)); } +static __inline void +hppa_disable_irq(void) +{ +__asm volatile("rsm %0, %%r0" :: "i" (PSW_I) : "memory"); +} + +static __inline void +hppa_enable_irq(void) +{ +__asm volatile("ssm %0, %%r0" :: "i" (PSW_I) : "memory"); +} + #ifdef _KERNEL extern int (*cpu_hpt_init)(vaddr_t, vsize_t);
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Thu Mar 29 21:44:10 UTC 2012 Modified Files: src/sys/arch/hppa/include: psl.h Log Message: Remove unnecessary #include To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/include/psl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/psl.h diff -u src/sys/arch/hppa/include/psl.h:1.7 src/sys/arch/hppa/include/psl.h:1.8 --- src/sys/arch/hppa/include/psl.h:1.7 Tue Nov 3 05:07:26 2009 +++ src/sys/arch/hppa/include/psl.h Thu Mar 29 21:44:10 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: psl.h,v 1.7 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: psl.h,v 1.8 2012/03/29 21:44:10 skrll Exp $ */ /* $OpenBSD: psl.h,v 1.6 1999/11/25 18:29:01 mickey Exp $ */ @@ -106,8 +106,4 @@ #define PSW_MBS (PSW_C | PSW_Q | PSW_P | PSW_D | PSW_I) #define PSW_MBZ (PSW_Y | PSW_Z | PSW_S | PSW_X | PSW_M | PSW_R) -#ifdef _KERNEL -#include -#endif - #endif /* _HPPA_PSL_H_ */
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Sat Feb 4 16:33:27 UTC 2012 Modified Files: src/sys/arch/hppa/include: cpufunc.h Log Message: G/C unused [fp]dcache_small. OK riz@ To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hppa/include/cpufunc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/cpufunc.h diff -u src/sys/arch/hppa/include/cpufunc.h:1.14 src/sys/arch/hppa/include/cpufunc.h:1.15 --- src/sys/arch/hppa/include/cpufunc.h:1.14 Sun Nov 29 10:09:54 2009 +++ src/sys/arch/hppa/include/cpufunc.h Sat Feb 4 16:33:27 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.h,v 1.14 2009/11/29 10:09:54 skrll Exp $ */ +/* $NetBSD: cpufunc.h,v 1.15 2012/02/04 16:33:27 skrll Exp $ */ /* $OpenBSD: cpufunc.h,v 1.17 2000/05/15 17:22:40 mickey Exp $ */ @@ -187,36 +187,6 @@ hppa_hpa_t cpu_gethpa(int); #define PCXL2_ACCEL_IO_ADDR2MASK(a) (0x8 >> a) >> 25) - 2) & 3)) void eaio_l2(int); -/* - * These flush or purge the data cache for a item whose total - * size is <= the size of a data cache line, however they don't - * check this constraint. - */ -static __inline void -fdcache_small(pa_space_t sp, vaddr_t va, vsize_t size) -{ - __asm volatile( - " mtsp %0,%%sr1 \n" - " fdc %%r0(%%sr1, %1) \n" - " fdc %2(%%sr1, %1) \n" - " sync\n" - " syncdma\n" - : - : "r" (sp), "r" (va), "r" (size - 1)); -} -static __inline void -pdcache_small(pa_space_t sp, vaddr_t va, vsize_t size) -{ - __asm volatile( - " mtsp %0,%%sr1 \n" - " pdc %%r0(%%sr1, %1) \n" - " pdc %2(%%sr1, %1) \n" - " sync\n" - " syncdma\n" - : - : "r" (sp), "r" (va), "r" (size - 1)); -} - #endif /* _KERNEL */ #endif /* _HPPA_CPUFUNC_H_ */
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Tue Jan 10 16:26:43 UTC 2012 Modified Files: src/sys/arch/hppa/include: types.h Log Message: G/C vm_{offset,size}_t To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/hppa/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/types.h diff -u src/sys/arch/hppa/include/types.h:1.20 src/sys/arch/hppa/include/types.h:1.21 --- src/sys/arch/hppa/include/types.h:1.20 Thu Mar 17 22:14:43 2011 +++ src/sys/arch/hppa/include/types.h Tue Jan 10 16:26:43 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.20 2011/03/17 22:14:43 skrll Exp $ */ +/* $NetBSD: types.h,v 1.21 2012/01/10 16:26:43 skrll Exp $ */ /* $OpenBSD: types.h,v 1.6 2001/08/11 01:58:34 art Exp $ */ @@ -61,10 +61,6 @@ typedef unsigned long psize_t; #define PRIxPADDR "lx" #define PRIxPSIZE "lx" #define PRIuPSIZE "lu" -/* XXX DIE DIE DIE */ -typedef unsigned long vm_offset_t; -typedef unsigned long vm_size_t; - #endif /*
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Fri Jan 6 09:12:25 UTC 2012 Modified Files: src/sys/arch/hppa/include: pmap.h Log Message: Comment fix. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/hppa/include/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/pmap.h diff -u src/sys/arch/hppa/include/pmap.h:1.34 src/sys/arch/hppa/include/pmap.h:1.35 --- src/sys/arch/hppa/include/pmap.h:1.34 Fri Jan 6 09:11:45 2012 +++ src/sys/arch/hppa/include/pmap.h Fri Jan 6 09:12:25 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.34 2012/01/06 09:11:45 skrll Exp $ */ +/* $NetBSD: pmap.h,v 1.35 2012/01/06 09:12:25 skrll Exp $ */ /* $OpenBSD: pmap.h,v 1.35 2007/12/14 18:32:23 deraadt Exp $ */ @@ -200,7 +200,7 @@ pmap_protect(struct pmap *pmap, vaddr_t struct pv_entry; struct vm_page_md { - struct pv_entry *pvh_list; /* head of list (locked by pvh_lock) */ + struct pv_entry *pvh_list; /* head of list */ u_int pvh_attrs; /* to preserve ref/mod */ };
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Fri Jan 6 09:11:45 UTC 2012 Modified Files: src/sys/arch/hppa/include: pmap.h Log Message: No need to flush the icache/itlb for pool pages as they're never marked executable. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/hppa/include/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/pmap.h diff -u src/sys/arch/hppa/include/pmap.h:1.33 src/sys/arch/hppa/include/pmap.h:1.34 --- src/sys/arch/hppa/include/pmap.h:1.33 Fri Dec 23 16:35:00 2011 +++ src/sys/arch/hppa/include/pmap.h Fri Jan 6 09:11:45 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.33 2011/12/23 16:35:00 skrll Exp $ */ +/* $NetBSD: pmap.h,v 1.34 2012/01/06 09:11:45 skrll Exp $ */ /* $OpenBSD: pmap.h,v 1.35 2007/12/14 18:32:23 deraadt Exp $ */ @@ -104,9 +104,7 @@ static inline paddr_t hppa_unmap_poolpag #if defined(HP8000_CPU) || defined(HP8200_CPU) || \ defined(HP8500_CPU) || defined(HP8600_CPU) - ficache(HPPA_SID_KERNEL, va, PAGE_SIZE); pdtlb(HPPA_SID_KERNEL, va); - pitlb(HPPA_SID_KERNEL, va); #endif return (paddr_t)va;
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Fri Dec 16 13:38:44 UTC 2011 Modified Files: src/sys/arch/hppa/include: pmap.h Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/hppa/include/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/pmap.h diff -u src/sys/arch/hppa/include/pmap.h:1.31 src/sys/arch/hppa/include/pmap.h:1.32 --- src/sys/arch/hppa/include/pmap.h:1.31 Fri Dec 16 12:45:04 2011 +++ src/sys/arch/hppa/include/pmap.h Fri Dec 16 13:38:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.31 2011/12/16 12:45:04 skrll Exp $ */ +/* $NetBSD: pmap.h,v 1.32 2011/12/16 13:38:44 skrll Exp $ */ /* $OpenBSD: pmap.h,v 1.35 2007/12/14 18:32:23 deraadt Exp $ */ @@ -164,7 +164,7 @@ static inline int pmap_prot(struct pmap *pmap, int prot) { extern u_int hppa_prot[]; - return (hppa_prot[prot] | (pmap == pmap_kernel()? 0 : TLB_USER)); + return (hppa_prot[prot] | (pmap == pmap_kernel() ? 0 : TLB_USER)); } static inline void
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: matt Date: Mon Jul 11 02:54:05 UTC 2011 Modified Files: src/sys/arch/hppa/include: float.h limits.h Log Message: Fix FLT_* and DBL_* redefinition problem. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/include/float.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hppa/include/limits.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/float.h diff -u src/sys/arch/hppa/include/float.h:1.7 src/sys/arch/hppa/include/float.h:1.8 --- src/sys/arch/hppa/include/float.h:1.7 Sun Dec 11 12:17:37 2005 +++ src/sys/arch/hppa/include/float.h Mon Jul 11 02:54:04 2011 @@ -1,19 +1,55 @@ -/* $NetBSD: float.h,v 1.7 2005/12/11 12:17:37 christos Exp $ */ +/* $NetBSD: float.h,v 1.8 2011/07/11 02:54:04 matt Exp $ */ #ifndef _HPPA_FLOAT_H_ #define _HPPA_FLOAT_H_ #ifdef _LP64 +#ifdef __LDBL_MANT_DIG__ +#define LDBL_MANT_DIG __LDBL_MANT_DIG__ +#else #define LDBL_MANT_DIG 113 +#endif +#ifdef __LDBL_EPSILON__ +#define LDBL_EPSILON __LDBL_EPSILON__ +#else #define LDBL_EPSILON 1.925929944387235853055977942584927319E-34L +#endif +#ifdef __LDBL_DIG__ +#define LDBL_DIG __LDBL_DIG__ +#else #define LDBL_DIG 33 +#endif +#ifdef __LDBL_MIN_EXP__ +#define LDBL_MIN_EXP __LDBL_MIN_EXP__ +#else #define LDBL_MIN_EXP (-16381) +#endif +#ifdef __LDBL_MIN__ +#define LDBL_MIN __LDBL_MIN__ +#else #define LDBL_MIN 3.3621031431120935062626778173217526026E-4932L +#endif +#ifdef __LDBL_MIN_10_EXP__ +#define LDBL_MIN_10_EXP __LDBL_MIN_10_EXP__ +#else #define LDBL_MIN_10_EXP (-4931) +#endif +#ifdef __LDBL_MAX_EXP__ +#define LDBL_MAX_EXP __LDBL_MAX_EXP__ +#else #define LDBL_MAX_EXP 16384 +#endif +#ifdef __LDBL_MAX__ +#define LDBL_MAX __LDBL_MAX__ +#else #define LDBL_MAX 1.1897314953572317650857593266280070162E4932L +#endif +#ifdef __LDBL_MAX_10_EXP__ +#define LDBL_MAX_10_EXP __LDBL_MAX_10_EXP__ +#else #define LDBL_MAX_10_EXP 4932 #endif +#endif #include Index: src/sys/arch/hppa/include/limits.h diff -u src/sys/arch/hppa/include/limits.h:1.12 src/sys/arch/hppa/include/limits.h:1.13 --- src/sys/arch/hppa/include/limits.h:1.12 Mon Jun 7 13:52:30 2010 +++ src/sys/arch/hppa/include/limits.h Mon Jul 11 02:54:04 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: limits.h,v 1.12 2010/06/07 13:52:30 tnozaki Exp $ */ +/* $NetBSD: limits.h,v 1.13 2011/07/11 02:54:04 matt Exp $ */ /* $OpenBSD: limits.h,v 1.2 2000/07/31 20:06:02 millert Exp $ */ @@ -117,13 +117,54 @@ #define LONG_BIT 32 #define WORD_BIT 32 +#ifndef DBL_DIG +#ifdef __DBL_DIG__ +#define DBL_DIG __DBL_DIG__ +#else #define DBL_DIG 15 +#endif +#endif + +#ifndef DBL_MAX +#ifdef __DBL_MAX__ +#define DBL_MAX __DBL_MAX__ +#else #define DBL_MAX 1.7976931348623157E+308 +#endif +#endif + +#ifndef DBL_MIN +#ifdef __DBL_MIN__ +#define DBL_MIN __DBL_MIN__ +#else #define DBL_MIN 2.2250738585072014E-308 +#endif +#endif +#ifndef FLT_DIG +#ifdef __FLT_DIG__ +#define FLT_DIG __FLT_DIG__ +#else #define FLT_DIG 6 +#endif +#endif + +#ifndef FLT_MAX +#ifdef __FLT_MAX__ +#define FLT_MAX __FLT_MAX__ +#else #define FLT_MAX 3.40282347E+38F +#endif +#endif + +#ifndef FLT_MIN +#ifdef __FLT_MIN__ +#define FLT_MIN __FLT_MIN__ +#else #define FLT_MIN 1.17549435E-38F #endif +#endif + +#endif #endif /* _MACHINE_LIMITS_H_ */
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Thu Mar 17 22:14:43 UTC 2011 Modified Files: src/sys/arch/hppa/include: types.h Log Message: HPPA TLS support. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hppa/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/types.h diff -u src/sys/arch/hppa/include/types.h:1.19 src/sys/arch/hppa/include/types.h:1.20 --- src/sys/arch/hppa/include/types.h:1.19 Mon Feb 28 21:23:33 2011 +++ src/sys/arch/hppa/include/types.h Thu Mar 17 22:14:43 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.19 2011/02/28 21:23:33 skrll Exp $ */ +/* $NetBSD: types.h,v 1.20 2011/03/17 22:14:43 skrll Exp $ */ /* $OpenBSD: types.h,v 1.6 2001/08/11 01:58:34 art Exp $ */ @@ -94,6 +94,8 @@ extern const char __CONCAT(name,_ras_start[]), __CONCAT(name,_ras_end[]) #define __HAVE_CPU_LWP_SETPRIVATE +#define __HAVE_COMMON___TLS_GET_ADDR #define __HAVE___LWP_GETPRIVATE_FAST +#define __HAVE_TLS_VARIANT_I #endif /* _HPPA_TYPES_H_ */
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Mon Feb 28 21:23:33 UTC 2011 Modified Files: src/sys/arch/hppa/include: types.h Log Message: __HAVE___LWP_GETPRIVATE_FAST works now. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hppa/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/types.h diff -u src/sys/arch/hppa/include/types.h:1.18 src/sys/arch/hppa/include/types.h:1.19 --- src/sys/arch/hppa/include/types.h:1.18 Thu Feb 24 04:28:45 2011 +++ src/sys/arch/hppa/include/types.h Mon Feb 28 21:23:33 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.18 2011/02/24 04:28:45 joerg Exp $ */ +/* $NetBSD: types.h,v 1.19 2011/02/28 21:23:33 skrll Exp $ */ /* $OpenBSD: types.h,v 1.6 2001/08/11 01:58:34 art Exp $ */ @@ -94,8 +94,6 @@ extern const char __CONCAT(name,_ras_start[]), __CONCAT(name,_ras_end[]) #define __HAVE_CPU_LWP_SETPRIVATE -#if 0 #define __HAVE___LWP_GETPRIVATE_FAST -#endif #endif /* _HPPA_TYPES_H_ */
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: matt Date: Sat Feb 12 16:31:33 UTC 2011 Modified Files: src/sys/arch/hppa/include: asm.h Log Message: Put RCSIDs in section .ident. (use .pushsection/.popsection) To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hppa/include/asm.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/asm.h diff -u src/sys/arch/hppa/include/asm.h:1.12 src/sys/arch/hppa/include/asm.h:1.13 --- src/sys/arch/hppa/include/asm.h:1.12 Mon Dec 20 21:11:24 2010 +++ src/sys/arch/hppa/include/asm.h Sat Feb 12 16:31:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.12 2010/12/20 21:11:24 joerg Exp $ */ +/* $NetBSD: asm.h,v 1.13 2011/02/12 16:31:32 matt Exp $ */ /* $OpenBSD: asm.h,v 1.12 2001/03/29 02:15:57 mickey Exp $ */ @@ -97,9 +97,9 @@ #define ALTENTRY(x) ! .export x, entry ! .label x #define EXIT(x) ! .exit ! .procend ! .size x, .-x -#define RCSID(x) .text!\ +#define RCSID(x) .pushsection ".ident" !\ .asciz x !\ - .align 4 + .popsection #define WEAK_ALIAS(alias,sym)\ .weak alias ! \
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Sun Jan 2 18:07:02 UTC 2011 Modified Files: src/sys/arch/hppa/include: signal.h Log Message: __HAVE_SIGINFO has not been required/used for a long time now. Prompted by uwe@ To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/hppa/include/signal.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/signal.h diff -u src/sys/arch/hppa/include/signal.h:1.5 src/sys/arch/hppa/include/signal.h:1.6 --- src/sys/arch/hppa/include/signal.h:1.5 Sun Dec 11 12:17:37 2005 +++ src/sys/arch/hppa/include/signal.h Sun Jan 2 18:07:02 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: signal.h,v 1.5 2005/12/11 12:17:37 christos Exp $ */ +/* $NetBSD: signal.h,v 1.6 2011/01/02 18:07:02 skrll Exp $ */ /* $OpenBSD: signal.h,v 1.1 1998/06/23 19:45:27 mickey Exp $ */ @@ -36,8 +36,6 @@ typedef int sig_atomic_t; -#define __HAVE_SIGINFO - #if defined(_XOPEN_SOURCE) || defined(_NETBSD_SOURCE) #include /* codes for SIGILL, SIGFPE */ #endif
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: uebayasi Date: Tue Nov 16 09:35:14 UTC 2010 Modified Files: src/sys/arch/hppa/include: mutex.h Log Message: sys/mutex.h includes machine/intr.h via sys/intr.h, so no need here. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hppa/include/mutex.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/mutex.h diff -u src/sys/arch/hppa/include/mutex.h:1.10 src/sys/arch/hppa/include/mutex.h:1.11 --- src/sys/arch/hppa/include/mutex.h:1.10 Sun Nov 14 03:16:04 2010 +++ src/sys/arch/hppa/include/mutex.h Tue Nov 16 09:35:14 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: mutex.h,v 1.10 2010/11/14 03:16:04 uebayasi Exp $ */ +/* $NetBSD: mutex.h,v 1.11 2010/11/16 09:35:14 uebayasi Exp $ */ /*- * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc. @@ -42,7 +42,6 @@ #ifndef __ASSEMBLER__ -#include #include struct kmutex {
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: uebayasi Date: Tue Nov 16 09:34:25 UTC 2010 Modified Files: src/sys/arch/hppa/include: vmparam.h Log Message: MD interrupt implementation is not VM parameter. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/hppa/include/vmparam.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/vmparam.h diff -u src/sys/arch/hppa/include/vmparam.h:1.18 src/sys/arch/hppa/include/vmparam.h:1.19 --- src/sys/arch/hppa/include/vmparam.h:1.18 Sun Nov 14 13:33:21 2010 +++ src/sys/arch/hppa/include/vmparam.h Tue Nov 16 09:34:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.18 2010/11/14 13:33:21 uebayasi Exp $ */ +/* $NetBSD: vmparam.h,v 1.19 2010/11/16 09:34:24 uebayasi Exp $ */ /* $OpenBSD: vmparam.h,v 1.33 2006/06/04 17:21:24 miod Exp $ */ @@ -28,8 +28,6 @@ #ifndef _HPPA_VMPARAM_H_ #define _HPPA_VMPARAM_H_ -#include - /* * Machine dependent constants for HP PA */
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Wed Mar 31 06:40:30 UTC 2010 Modified Files: src/sys/arch/hppa/include: proc.h Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/hppa/include/proc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/proc.h diff -u src/sys/arch/hppa/include/proc.h:1.8 src/sys/arch/hppa/include/proc.h:1.9 --- src/sys/arch/hppa/include/proc.h:1.8 Sat Nov 21 15:13:14 2009 +++ src/sys/arch/hppa/include/proc.h Wed Mar 31 06:40:30 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: proc.h,v 1.8 2009/11/21 15:13:14 rmind Exp $ */ +/* $NetBSD: proc.h,v 1.9 2010/03/31 06:40:30 skrll Exp $ */ /* $OpenBSD: proc.h,v 1.1 1998/07/07 21:32:44 mickey Exp $ */ @@ -42,10 +42,10 @@ * Machine-dependent part of the lwp structure for hppa. */ struct mdlwp { - struct trapframe *md_regs; /* registers on current frame */ - int md_flags; /* machine-dependent flags */ + struct trapframe *md_regs; /* registers on current frame */ + int md_flags; /* machine-dependent flags */ - vaddr_t md_bpva; + vaddr_t md_bpva; unsigned int md_bpsave[2]; };
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Tue Mar 30 19:27:54 UTC 2010 Modified Files: src/sys/arch/hppa/include: frame.h Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hppa/include/frame.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/frame.h diff -u src/sys/arch/hppa/include/frame.h:1.10 src/sys/arch/hppa/include/frame.h:1.11 --- src/sys/arch/hppa/include/frame.h:1.10 Tue Mar 16 16:20:19 2010 +++ src/sys/arch/hppa/include/frame.h Tue Mar 30 19:27:54 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: frame.h,v 1.10 2010/03/16 16:20:19 skrll Exp $ */ +/* $NetBSD: frame.h,v 1.11 2010/03/30 19:27:54 skrll Exp $ */ /* $OpenBSD: frame.h,v 1.11 1999/11/25 18:28:06 mickey Exp $ */ @@ -93,8 +93,8 @@ /* here starts the `virtual' part */ u_int tf_sar; /* cr11 */ u_int tf_r1; - u_int tf_rp; /* r2 */ - u_int tf_r3; /* frame pointer when -g */ + u_int tf_rp; /* r2 */ + u_int tf_r3; /* frame pointer when -g */ u_int tf_r4; u_int tf_r5; u_int tf_r6;
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Sun Jan 17 08:24:06 UTC 2010 Modified Files: src/sys/arch/hppa/include: param.h Log Message: Simplify. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hppa/include/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/param.h diff -u src/sys/arch/hppa/include/param.h:1.13 src/sys/arch/hppa/include/param.h:1.14 --- src/sys/arch/hppa/include/param.h:1.13 Thu Apr 30 07:01:27 2009 +++ src/sys/arch/hppa/include/param.h Sun Jan 17 08:24:06 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.13 2009/04/30 07:01:27 skrll Exp $ */ +/* $NetBSD: param.h,v 1.14 2010/01/17 08:24:06 skrll Exp $ */ /* $OpenBSD: param.h,v 1.12 2001/07/06 02:07:41 provos Exp $ */ @@ -25,9 +25,7 @@ * Utah $Hdr: param.h 1.18 94/12/16$ */ -#include - -#if defined(_NETBSD_SOURCE) +#ifdef _KERNEL #include #endif
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Sat Jan 16 13:59:42 UTC 2010 Modified Files: src/sys/arch/hppa/include: pte.h Log Message: Add a couple of comments and some whitespace. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/include/pte.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/pte.h diff -u src/sys/arch/hppa/include/pte.h:1.3 src/sys/arch/hppa/include/pte.h:1.4 --- src/sys/arch/hppa/include/pte.h:1.3 Thu Apr 30 07:01:27 2009 +++ src/sys/arch/hppa/include/pte.h Sat Jan 16 13:59:42 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pte.h,v 1.3 2009/04/30 07:01:27 skrll Exp $ */ +/* $NetBSD: pte.h,v 1.4 2010/01/16 13:59:42 skrll Exp $ */ /* $OpenBSD: pte.h,v 1.11 2002/09/05 18:41:19 mickey Exp $ */ @@ -40,6 +40,7 @@ #define PTE_PAGE(pte) ((pte) & ~PGOFSET) /* TLB access/protection values */ +/* 0x8000 has no pt_entry_t equivalent */ #define TLB_WIRED 0x4000 /* software only */ #define TLB_REFTRAP 0x2000 /* bit 2, T */ #define TLB_DIRTY 0x1000 /* bit 3, D */ @@ -55,30 +56,31 @@ #define TLB_AR_RW TLB_READ|TLB_WRITE #define TLB_AR_RX TLB_READ|TLB_EXECUTE #define TLB_AR_RWX TLB_READ|TLB_WRITE|TLB_EXECUTE -#define TLB_UNCACHEABLE 0x0008 /* bit 12, U */ +#define TLB_UNCACHEABLE 0x0008 /* bit 12, U */ /* bit 13-30, Access ID */ -#define TLB_PID_MASK 0xfffe +#define TLB_PID_MASK 0xfffe +/* 0x0001 has no pt_entry_t equivalent */ #define TLB_BITS \ "\177\020" /* New bitmask */ \ - "b\036WIRED\0" /* bit 30 (1) */ \ - "b\035T\0" /* bit 29 (2) */ \ - "b\034D\0" /* bit 28 (3) */ \ - "b\033B\0" /* bit 27 (4) */ \ - "b\023U\0" /* bit 19 (12) */ \ - "f\024\07AR\0" /* bit 20 (11) .. 26 (5) */ \ - "=\x73" "--\0"\ - "=\x00" "r-\0"\ - "=\x10" "rw\0"\ - "=\x20" "r-x---\0"\ - "=\x30" "rwx---\0"\ - "=\x0f" "r--r--\0"\ - "=\x1f" "rw-rw-\0"\ - "=\x2f" "r-xr-x\0"\ - "=\x3f" "rwxrwx\0"\ - "=\x4c" "gate\0"\ - "=\x2c" "break\0"\ - "f\001\017PID\0\0" /* bit 1 (30) .. 15 (16) */ + "b\036wired\0" /* bit 30 (1) */ \ + "b\035T\0" /* bit 29 (2) */ \ + "b\034D\0" /* bit 28 (3) */ \ + "b\033B\0" /* bit 27 (4) */ \ + "b\023U\0" /* bit 19 (12) */ \ + "f\024\07ar\0" /* bit 20 (11) .. 26 (5) */ \ + "=\x73" "--\0" \ + "=\x00" "r-\0" \ + "=\x10" "rw\0" \ + "=\x20" "r-x---\0" \ + "=\x30" "rwx---\0" \ + "=\x0f" "r--r--\0" \ + "=\x1f" "rw-rw-\0" \ + "=\x2f" "r-xr-x\0" \ + "=\x3f" "rwxrwx\0" \ + "=\x4c" "gate\0" \ + "=\x2c" "break\0" \ + "f\001\017pid\0\0" /* bit 1 (30) .. 15 (16) */ /* protection for a gateway page */ #define TLB_GATE_PROT 0x04c0
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Sat Jan 16 10:06:31 UTC 2010 Modified Files: src/sys/arch/hppa/include: trap.h Log Message: Use the description in the ACD for T_DBREAK. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/include/trap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/trap.h diff -u src/sys/arch/hppa/include/trap.h:1.3 src/sys/arch/hppa/include/trap.h:1.4 --- src/sys/arch/hppa/include/trap.h:1.3 Tue Nov 3 05:07:26 2009 +++ src/sys/arch/hppa/include/trap.h Sat Jan 16 10:06:31 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.h,v 1.3 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: trap.h,v 1.4 2010/01/16 10:06:31 skrll Exp $ */ /* $OpenBSD: trap.h,v 1.8 2000/02/10 20:05:39 mickey Exp $ */ @@ -53,7 +53,7 @@ #define T_ITLBMISSNA 16 /* ITLB non-access miss */ #define T_DTLBMISSNA 17 /* DTLB non-access miss */ #define T_DPROT 18 /* data protection/rights/alignment <7100 */ -#define T_DBREAK 19 /* data break */ +#define T_DBREAK 19 /* data memory break */ #define T_TLB_DIRTY 20 /* TLB dirty bit */ #define T_PAGEREF 21 /* page reference */ #define T_EMULATION 22 /* assist emulation */
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Sun Nov 29 10:09:55 UTC 2009 Modified Files: src/sys/arch/hppa/include: cpufunc.h Log Message: Add lci to get coherence index for an address. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hppa/include/cpufunc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/cpufunc.h diff -u src/sys/arch/hppa/include/cpufunc.h:1.13 src/sys/arch/hppa/include/cpufunc.h:1.14 --- src/sys/arch/hppa/include/cpufunc.h:1.13 Sun Nov 29 10:08:10 2009 +++ src/sys/arch/hppa/include/cpufunc.h Sun Nov 29 10:09:54 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.h,v 1.13 2009/11/29 10:08:10 skrll Exp $ */ +/* $NetBSD: cpufunc.h,v 1.14 2009/11/29 10:09:54 skrll Exp $ */ /* $OpenBSD: cpufunc.h,v 1.17 2000/05/15 17:22:40 mickey Exp $ */ @@ -89,6 +89,19 @@ #define ssm(v,r) __asm volatile("ssm %1,%0": "=r" (r): "i" (v)) #define rsm(v,r) __asm volatile("rsm %1,%0": "=r" (r): "i" (v)) + +/* Get coherence index for an address */ +static __inline register_t +lci(pa_space_t sp, vaddr_t va) { + register_t ret; + + mtsp((sp), 1); \ + __asm volatile("lci 0(%%sr1, %1), %0" : "=r" (ret) : "r" (va)); + + return ret; +} + + /* Move to system mask. Old value of system mask is returned. */ static __inline register_t mtsm(register_t mask) { register_t ret;
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Sun Nov 29 10:08:10 UTC 2009 Modified Files: src/sys/arch/hppa/include: cpufunc.h Log Message: KNF To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hppa/include/cpufunc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/cpufunc.h diff -u src/sys/arch/hppa/include/cpufunc.h:1.12 src/sys/arch/hppa/include/cpufunc.h:1.13 --- src/sys/arch/hppa/include/cpufunc.h:1.12 Tue Nov 3 05:07:26 2009 +++ src/sys/arch/hppa/include/cpufunc.h Sun Nov 29 10:08:10 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: cpufunc.h,v 1.12 2009/11/03 05:07:26 snj Exp $ */ +/* $NetBSD: cpufunc.h,v 1.13 2009/11/29 10:08:10 skrll Exp $ */ /* $OpenBSD: cpufunc.h,v 1.17 2000/05/15 17:22:40 mickey Exp $ */ @@ -68,7 +68,8 @@ #define hptbtop(b) ((b) >> 17) /* Get space register for an address */ -static __inline register_t ldsid(vaddr_t p) { +static __inline register_t +ldsid(vaddr_t p) { register_t ret; __asm volatile("ldsid (%1),%0" : "=r" (ret) : "r" (p)); return ret;
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Sun Nov 15 12:26:02 UTC 2009 Modified Files: src/sys/arch/hppa/include: pmap.h Log Message: Put PMAP_NOCACHE in the MD space. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hppa/include/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/pmap.h diff -u src/sys/arch/hppa/include/pmap.h:1.22 src/sys/arch/hppa/include/pmap.h:1.23 --- src/sys/arch/hppa/include/pmap.h:1.22 Wed Nov 11 16:08:31 2009 +++ src/sys/arch/hppa/include/pmap.h Sun Nov 15 12:26:02 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.22 2009/11/11 16:08:31 skrll Exp $ */ +/* $NetBSD: pmap.h,v 1.23 2009/11/15 12:26:02 skrll Exp $ */ /* $OpenBSD: pmap.h,v 1.35 2007/12/14 18:32:23 deraadt Exp $ */ @@ -209,7 +209,7 @@ /* * MD flags that we use for pmap_kenter_pa: */ -#define PMAP_NOCACHE0x01 /* set the non-cacheable bit */ +#define PMAP_NOCACHE 0x0100 /* set the non-cacheable bit */ #endif /* _KERNEL */
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Tue May 19 05:50:58 UTC 2009 Modified Files: src/sys/arch/hppa/include: elf_machdep.h Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/include/elf_machdep.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/elf_machdep.h diff -u src/sys/arch/hppa/include/elf_machdep.h:1.1 src/sys/arch/hppa/include/elf_machdep.h:1.2 --- src/sys/arch/hppa/include/elf_machdep.h:1.1 Wed Jun 5 01:04:21 2002 +++ src/sys/arch/hppa/include/elf_machdep.h Tue May 19 05:50:58 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: elf_machdep.h,v 1.1 2002/06/05 01:04:21 fredette Exp $ */ +/* $NetBSD: elf_machdep.h,v 1.2 2009/05/19 05:50:58 skrll Exp $ */ #define ELF32_MACHDEP_ENDIANNESS ELFDATA2MSB #define ELF32_MACHDEP_ID_CASES \ @@ -92,10 +92,10 @@ #define R_PARISC_BASEREL14DR108 #define R_PARISC_SEGREL64 112 #define R_PARISC_PLTOFF14WR 115 -#define R_PARISC_PLTOFF14DR 116 -#define R_PARISC_PLTOFF16F 117 -#define R_PARISC_PLTOFF16WF 118 -#define R_PARISC_PLTOFF16DF 119 +#define R_PARISC_PLTOFF14DR 116 +#define R_PARISC_PLTOFF16F 117 +#define R_PARISC_PLTOFF16WF 118 +#define R_PARISC_PLTOFF16DF 119 #define R_PARISC_LTOFF_FPTR64 120 #define R_PARISC_LTOFF_FPTR14WR 123 #define R_PARISC_LTOFF_FPTR14DR 124 @@ -112,11 +112,11 @@ #define R_PARISC_LTOFF_TP14R166 #define R_PARISC_LTOFF_TP14F167 #define R_PARISC_TPREL64216 -#define R_PARISC_TPREL14WR 219 -#define R_PARISC_TPREL14DR 220 -#define R_PARISC_TPREL16F 221 -#define R_PARISC_TPREL16WF 222 -#define R_PARISC_TPREL16DF 223 +#define R_PARISC_TPREL14WR 219 +#define R_PARISC_TPREL14DR 220 +#define R_PARISC_TPREL16F 221 +#define R_PARISC_TPREL16WF 222 +#define R_PARISC_TPREL16DF 223 #define R_PARISC_LTOFF_TP64 224 #define R_PARISC_LTOFF_TP14WR 227 #define R_PARISC_LTOFF_TP14DR 228
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Sat May 16 12:57:05 UTC 2009 Modified Files: src/sys/arch/hppa/include: reg.h Log Message: Note that CR27 is used for thread local storage (TLS) To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/include/reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/reg.h diff -u src/sys/arch/hppa/include/reg.h:1.7 src/sys/arch/hppa/include/reg.h:1.8 --- src/sys/arch/hppa/include/reg.h:1.7 Thu Apr 30 07:01:27 2009 +++ src/sys/arch/hppa/include/reg.h Sat May 16 12:57:05 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: reg.h,v 1.7 2009/04/30 07:01:27 skrll Exp $ */ +/* $NetBSD: reg.h,v 1.8 2009/05/16 12:57:05 skrll Exp $ */ /* $OpenBSD: reg.h,v 1.7 2000/06/15 17:00:37 mickey Exp $ */ @@ -88,8 +88,8 @@ /* Temporary control registers */ #define CR_CURLWP 24 /* tr0: curlwp*/ #define CR_VTOP 25 /* tr1: virt to phys table address */ -#define CR_TR2 26 /* tr2: (TLS?)*/ -#define CR_TR3 27 /* tr3: (TLS?)*/ +#define CR_TR2 26 /* tr2: temporary */ +#define CR_TLS 27 /* tr3: thread local storage pointer */ #define CR_HVTP 28 /* tr4: faulted HVT slot ptr on LC cpus */ #define CR_TR5 29 /* tr5: emu / TLB_STATS_{PRE,AFT} */ #define CR_UPADDR 30 /* tr6: paddr of U-area of curlwp */
CVS commit: src/sys/arch/hppa/include
Module Name:src Committed By: skrll Date: Thu Apr 30 19:15:18 UTC 2009 Modified Files: src/sys/arch/hppa/include: pmap.h Log Message: Remove if defined(HP7100LC_CPU) || defined(HP7300LC_CPU) from around pmap_hptsize and pdc_hwtlb (for now). To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/hppa/include/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hppa/include/pmap.h diff -u src/sys/arch/hppa/include/pmap.h:1.19 src/sys/arch/hppa/include/pmap.h:1.20 --- src/sys/arch/hppa/include/pmap.h:1.19 Thu Apr 30 15:34:24 2009 +++ src/sys/arch/hppa/include/pmap.h Thu Apr 30 19:15:18 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.19 2009/04/30 15:34:24 skrll Exp $ */ +/* $NetBSD: pmap.h,v 1.20 2009/04/30 19:15:18 skrll Exp $ */ /* $OpenBSD: pmap.h,v 1.35 2007/12/14 18:32:23 deraadt Exp $ */ @@ -107,10 +107,8 @@ struct vm_page *pv_ptp; /* the vm_page of the PTP */ }; -#if defined(HP7100LC_CPU) || defined(HP7300LC_CPU) extern int pmap_hptsize; extern struct pdc_hwtlb pdc_hwtlb; -#endif /* * pool quickmaps