diff options
Diffstat (limited to 'sys/arch/amiga/include/pte.h')
| -rw-r--r-- | sys/arch/amiga/include/pte.h | 89 |
1 files changed, 10 insertions, 79 deletions
diff --git a/sys/arch/amiga/include/pte.h b/sys/arch/amiga/include/pte.h index a5acfc91685..fbde5180950 100644 --- a/sys/arch/amiga/include/pte.h +++ b/sys/arch/amiga/include/pte.h @@ -1,5 +1,4 @@ -/* $OpenBSD: pte.h,v 1.5 2001/12/20 19:02:26 miod Exp $ */ -/* $NetBSD: pte.h,v 1.14 1995/09/29 13:52:09 chopps Exp $ */ +/* $OpenBSD: pte.h,v 1.6 2002/02/23 00:31:11 miod Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -45,72 +44,8 @@ #ifndef _MACHINE_PTE_H_ #define _MACHINE_PTE_H_ -/* - * AMIGA hardware segment/page table entries - */ - -struct pte { - u_int pte; -}; -typedef u_int pt_entry_t; /* Mach page table entry */ - -struct ste { - u_int ste; -}; -typedef u_int st_entry_t; /* segment table entry */ - -#define PT_ENTRY_NULL ((pt_entry_t *) 0) -#define ST_ENTRY_NULL ((st_entry_t *) 0) - -#define SG_V 0x00000002 /* segment is valid */ -#define SG_NV 0x00000000 -#define SG_PROT 0x00000004 /* access protection mask */ -#define SG_RO 0x00000004 -#define SG_RW 0x00000000 -#define SG_U 0x00000008 /* modified bit (68040) */ -#define SG_FRAME 0xffffe000 -#define SG_IMASK 0xff000000 -#define SG_ISHIFT 24 -#define SG_PMASK 0x00ffe000 -#define SG_PSHIFT 13 +#include <m68k/pte_motorola.h> -/* 68040 additions */ -#define SG4_MASK1 0xfe000000 /* pointer table 1 index mask */ -#define SG4_SHIFT1 25 -#define SG4_MASK2 0x01fc0000 /* pointer table 2 index mask */ -#define SG4_SHIFT2 18 -#define SG4_MASK3 0x0003e000 /* page table index mask */ -#define SG4_SHIFT3 13 -#define SG4_ADDR1 0xfffffe00 /* pointer table address mask */ -#define SG4_ADDR2 0xffffff80 /* page table address mask */ -#define SG4_LEV1SIZE 128 /* entries in pointer table 1 */ -#define SG4_LEV2SIZE 128 /* entries in pointer table 2 */ -#define SG4_LEV3SIZE 32 /* entries in page table */ - -#define PG_V 0x00000001 -#define PG_NV 0x00000000 -#define PG_PROT 0x00000004 -#define PG_U 0x00000008 -#define PG_M 0x00000010 -#define PG_W 0x00000100 -#define PG_RO 0x00000004 -#define PG_RW 0x00000000 -#define PG_FRAME 0xffffe000 -#define PG_CI 0x00000040 -#define PG_SHIFT 13 -#define PG_PFNUM(x) (((x) & PG_FRAME) >> PG_SHIFT) - -/* 68040 additions */ -#define PG_CMASK 0x00000060 /* cache mode mask */ -#define PG_CWT 0x00000000 /* writethrough caching */ -#define PG_CCB 0x00000020 /* copyback caching */ -#define PG_CIS 0x00000040 /* cache inhibited serialized */ -#define PG_CIN 0x00000060 /* cache inhibited nonserialized */ -#define PG_SO 0x00000080 /* supervisor only */ - -#define AMIGA_040RTSIZE 512 /* root (level 1) table size */ -#define AMIGA_040STSIZE 512 /* segment (level 2) table size */ -#define AMIGA_040PTSIZE 128 /* page (level 3) table size */ #if 0 #define AMIGA_STSIZE 1024 /* segment table size */ #else @@ -125,9 +60,10 @@ typedef u_int st_entry_t; /* segment table entry */ * AMIGA_MAX_KPTSIZE the most number of bytes for kpt pages * AMIGA_MAX_PTSIZE the number of bytes to map everything */ +extern vaddr_t amiga_uptbase; #define AMIGA_MAX_COREUPT 1024 #define AMIGA_UPTSIZE roundup(VM_MAXUSER_ADDRESS / NPTEPG, NBPG) -#define AMIGA_UPTBASE 0x10000000 +#define AMIGA_UPTBASE amiga_uptbase #define AMIGA_UPTMAXSIZE \ roundup((AMIGA_MAX_COREUPT * AMIGA_UPTSIZE), NBPG) #define AMIGA_MAX_KPTSIZE \ @@ -136,15 +72,10 @@ typedef u_int st_entry_t; /* segment table entry */ roundup((VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS) / NPTEPG, NBPG) #define AMIGA_MAX_PTSIZE roundup(0xffffffff / NPTEPG, NBPG) -/* - * Kernel virtual address to page table entry and to physical address. - */ -#define kvtopte(va) \ - (&Sysmap[((unsigned)(va) - VM_MIN_KERNEL_ADDRESS) >> PGSHIFT]) -#define ptetokv(pt) \ - ((((u_int *)(pt) - Sysmap) << PGSHIFT) + VM_MIN_KERNEL_ADDRESS) -#define kvtophys(va) \ - ((kvtopte(va)->pg_pfnum << PGSHIFT) | ((int)(va) & PGOFSET)) - +#define MACHINE_STSIZE AMIGA_STSIZE +#define MACHINE_MAX_PTSIZE AMIGA_MAX_PTSIZE +#define MACHINE_MAX_KPTSIZE AMIGA_MAX_KPTSIZE +#define MACHINE_PTBASE AMIGA_UPTBASE +#define MACHINE_PTMAXSIZE AMIGA_UPTMAXSIZE -#endif /* !_MACHINE_PTE_H_ */ +#endif /* _MACHINE_PTE_H_ */ |