Move <machine/pte.h> to mips64 land.

2 files changed, 128 insertions, 126 deletions

diff --git a/sys/arch/mips64/include/pte.h b/sys/arch/mips64/include/pte.h
new file mode 100644
index 00000000000..9491b91c676
--- /dev/null
+++ b/sys/arch/mips64/include/pte.h
@@ -0,0 +1,126 @@
+/*	$OpenBSD: pte.h,v 1.1 2004/09/20 20:03:18 miod Exp $	*/
+
+/*
+ * Copyright (c) 1988 University of Utah.
+ * Copyright (c) 1992, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * the Systems Programming Group of the University of Utah Computer
+ * Science Department and Ralph Campbell.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	from: Utah Hdr: pte.h 1.11 89/09/03
+ *	from: @(#)pte.h	8.1 (Berkeley) 6/10/93
+ */
+
+/*
+ * R4000 hardware page table entry
+ */
+
+#ifndef _LOCORE
+
+/*
+ * Structure defining an tlb entry data set.
+ */
+
+struct tlb {
+	int	tlb_mask;
+	int	tlb_hi;
+	int	tlb_lo0;
+	int	tlb_lo1;
+};
+
+typedef union pt_entry {
+	unsigned int	pt_entry;	/* for copying, etc. */
+	unsigned int	pt_pte;		/* XXX void */
+} pt_entry_t;	/* Mips page table entry */
+#endif /* _LOCORE */
+
+#define	PT_ENTRY_NULL	((pt_entry_t *) 0)
+
+#define PG_RO		0x40000000	/* SW */
+
+#define	PG_SVPN		0xfffff000	/* Software page no mask */
+#define	PG_HVPN		0xffffe000	/* Hardware page no mask */
+#define	PG_ODDPG	0x00001000	/* Odd even pte entry */
+#define	PG_ASID		0x000000ff	/* Address space ID */
+#define	PG_G		0x00000001	/* HW */
+#define	PG_V		0x00000002
+#define	PG_NV		0x00000000
+#define	PG_M		0x00000004
+#define	PG_ATTR		0x0000003f
+#define	PG_UNCACHED	0x00000010
+#define	PG_CACHED	0x00000018
+#define	PG_CACHEMODE	0x00000038
+#define	PG_ROPAGE	(PG_V | PG_RO | PG_CACHED) /* Write protected */
+#define	PG_RWPAGE	(PG_V | PG_M | PG_CACHED)  /* Not wr-prot not clean */
+#define	PG_CWPAGE	(PG_V | PG_CACHED)	   /* Not wr-prot but clean */
+#define	PG_IOPAGE	(PG_G | PG_V | PG_M | PG_UNCACHED)
+#define	PG_FRAME	0x3fffffc0
+#define PG_SHIFT	6
+#define pfn_is_ext(x) ((x) & 0x3c000000)
+#define vad_to_pfn(x) (((unsigned)(x) >> PG_SHIFT) & PG_FRAME)
+#define vad_to_pfn64(x) (((quad_t)(x) >> PG_SHIFT) & PG_FRAME)
+#define vad_to_vpn(x) ((int)((unsigned)(x) & PG_SVPN))
+#define vpn_to_vad(x) ((int)((x) & PG_SVPN))
+/* User virtual to pte page entry */
+#define uvtopte(adr) (((adr) >> PGSHIFT) & (NPTEPG -1))
+
+#define	PG_SIZE_4K	0x00000000
+#define	PG_SIZE_16K	0x00006000
+#define	PG_SIZE_64K	0x0001e000
+#define	PG_SIZE_256K	0x0007e000
+#define	PG_SIZE_1M	0x001fe000
+#define	PG_SIZE_4M	0x007fe000
+#define	PG_SIZE_16M	0x01ffe000
+
+#if defined(_KERNEL) && !defined(_LOCORE)
+
+static __inline vaddr_t
+pfn_to_pad(unsigned int pte)
+{
+	vaddr_t pa;
+
+	pa = (long)(int)(((pte & PG_FRAME) << PG_SHIFT));
+	return pa;
+}
+
+/*
+ * Kernel virtual address to page table entry and visa versa.
+ */
+#define	kvtopte(va) \
+	(Sysmap + (((vaddr_t)(va) - VM_MIN_KERNEL_ADDRESS) >> PGSHIFT))
+#define	ptetokv(pte) \
+	((((pt_entry_t *)(pte) - Sysmap) << PGSHIFT) + VM_MIN_KERNEL_ADDRESS)
+
+extern	pt_entry_t *Sysmap;		/* kernel pte table */
+extern	u_int Sysmapsize;		/* number of pte's in Sysmap */
+#endif
diff --git a/sys/arch/sgi/include/pte.h b/sys/arch/sgi/include/pte.h
index 50740ce3670..80006a2b750 100644
--- a/sys/arch/sgi/include/pte.h
+++ b/sys/arch/sgi/include/pte.h
@@ -1,126 +1,2 @@
-/*	$OpenBSD: pte.h,v 1.3 2004/09/16 07:25:26 miod Exp $	*/
-
-/*
- * Copyright (c) 1988 University of Utah.
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * the Systems Programming Group of the University of Utah Computer
- * Science Department and Ralph Campbell.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	from: Utah Hdr: pte.h 1.11 89/09/03
- *	from: @(#)pte.h	8.1 (Berkeley) 6/10/93
- */
-
-/*
- * R4000 hardware page table entry
- */
-
-#ifndef _LOCORE
-
-/*
- * Structure defining an tlb entry data set.
- */
-
-struct tlb {
-	int	tlb_mask;
-	int	tlb_hi;
-	int	tlb_lo0;
-	int	tlb_lo1;
-};
-
-typedef union pt_entry {
-	unsigned int	pt_entry;	/* for copying, etc. */
-	unsigned int	pt_pte;		/* XXX void */
-} pt_entry_t;	/* Mips page table entry */
-#endif /* _LOCORE */
-
-#define	PT_ENTRY_NULL	((pt_entry_t *) 0)
-
-#define PG_RO		0x40000000	/* SW */
-
-#define	PG_SVPN		0xfffff000	/* Software page no mask */
-#define	PG_HVPN		0xffffe000	/* Hardware page no mask */
-#define	PG_ODDPG	0x00001000	/* Odd even pte entry */
-#define	PG_ASID		0x000000ff	/* Address space ID */
-#define	PG_G		0x00000001	/* HW */
-#define	PG_V		0x00000002
-#define	PG_NV		0x00000000
-#define	PG_M		0x00000004
-#define	PG_ATTR		0x0000003f
-#define	PG_UNCACHED	0x00000010
-#define	PG_CACHED	0x00000018
-#define	PG_CACHEMODE	0x00000038
-#define	PG_ROPAGE	(PG_V | PG_RO | PG_CACHED) /* Write protected */
-#define	PG_RWPAGE	(PG_V | PG_M | PG_CACHED)  /* Not wr-prot not clean */
-#define	PG_CWPAGE	(PG_V | PG_CACHED)	   /* Not wr-prot but clean */
-#define	PG_IOPAGE	(PG_G | PG_V | PG_M | PG_UNCACHED)
-#define	PG_FRAME	0x3fffffc0
-#define PG_SHIFT	6
-#define pfn_is_ext(x) ((x) & 0x3c000000)
-#define vad_to_pfn(x) (((unsigned)(x) >> PG_SHIFT) & PG_FRAME)
-#define vad_to_pfn64(x) (((quad_t)(x) >> PG_SHIFT) & PG_FRAME)
-#define vad_to_vpn(x) ((int)((unsigned)(x) & PG_SVPN))
-#define vpn_to_vad(x) ((int)((x) & PG_SVPN))
-/* User virtual to pte page entry */
-#define uvtopte(adr) (((adr) >> PGSHIFT) & (NPTEPG -1))
-
-#define	PG_SIZE_4K	0x00000000
-#define	PG_SIZE_16K	0x00006000
-#define	PG_SIZE_64K	0x0001e000
-#define	PG_SIZE_256K	0x0007e000
-#define	PG_SIZE_1M	0x001fe000
-#define	PG_SIZE_4M	0x007fe000
-#define	PG_SIZE_16M	0x01ffe000
-
-#if defined(_KERNEL) && !defined(_LOCORE)
-
-static __inline vaddr_t
-pfn_to_pad(unsigned int pte)
-{
-	vaddr_t pa;
-
-	pa = (long)(int)(((pte & PG_FRAME) << PG_SHIFT));
-	return pa;
-}
-
-/*
- * Kernel virtual address to page table entry and visa versa.
- */
-#define	kvtopte(va) \
-	(Sysmap + (((vaddr_t)(va) - VM_MIN_KERNEL_ADDRESS) >> PGSHIFT))
-#define	ptetokv(pte) \
-	((((pt_entry_t *)(pte) - Sysmap) << PGSHIFT) + VM_MIN_KERNEL_ADDRESS)
-
-extern	pt_entry_t *Sysmap;		/* kernel pte table */
-extern	u_int Sysmapsize;		/* number of pte's in Sysmap */
-#endif
+/*	$OpenBSD: pte.h,v 1.4 2004/09/20 20:03:19 miod Exp $	*/
+#include <mips64/pte.h>