diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2006-11-04 23:59:11 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-06-18 00:26:50 +0200 |
| commit | b0549e1deaf86b24e5963d93919264dc30f90f35 (patch) | |
| tree | ad429183cf00ca0b829e522e8cd03a1c9d5f76e8 /i386/intel/pmap.h | |
| parent | 59109a24209263600cee53978850b7f5432d5dc7 (diff) | |
| download | gnumach-b0549e1deaf86b24e5963d93919264dc30f90f35.tar.gz gnumach-b0549e1deaf86b24e5963d93919264dc30f90f35.tar.bz2 gnumach-b0549e1deaf86b24e5963d93919264dc30f90f35.zip | |
2006-11-05 Samuel Thibault <samuel.thibault@ens-lyon.org>
Drop i860 architecture support.
* i386/i386/pmap.h: Remove i860 comment.
* i386/intel/pmap.c: Remove i860 comments. Don't include
`i860ipsc/nodehw.h'.
(INVALIDATE_TLB): Remove i860 case.
(paging_enabled): Remove variable.
(pmap_map): Remove setting INTEL_PTE_NCACHE.
(pmap_bootstrap): Remove i860 support.
(pmap_page_table_page_alloc): Remove setting INTEL_PTE_NCACHE.
(pmap_enter): Remove call to flush function.
(set_dirbase): Remove function.
* i386/intel/pmap.h: Remove i860 comments.
(INTEL_PGBYTES, INTEL_PGSHIFT, intel_btop, intel_ptob,
intel_round_page, intel_trunc_page, trunc_intel_to_vm,
round_intel_to_vm, vm_to_intel, INTEL_PTE_VALID, set_dirbase): Remove
i860 case.
(INTEL_PTE_valid): Remove macro.
* i386/intel/read_fault.c: Remove i860 comment.
Diffstat (limited to 'i386/intel/pmap.h')
| -rw-r--r-- | i386/intel/pmap.h | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/i386/intel/pmap.h b/i386/intel/pmap.h index 1ea84bfd..25ccc1a1 100644 --- a/i386/intel/pmap.h +++ b/i386/intel/pmap.h @@ -58,20 +58,9 @@ #define round_intel_to_vm(x) round_i386_to_vm(x) #define vm_to_intel(x) vm_to_i386(x) #endif /* i386 */ -#if i860 -#define INTEL_PGBYTES I860_PGBYTES -#define INTEL_PGSHIFT I860_PGSHIFT -#define intel_btop(x) i860_btop(x) -#define intel_ptob(x) i860_ptob(x) -#define intel_round_page(x) i860_round_page(x) -#define intel_trunc_page(x) i860_trunc_page(x) -#define trunc_intel_to_vm(x) trunc_i860_to_vm(x) -#define round_intel_to_vm(x) round_i860_to_vm(x) -#define vm_to_intel(x) vm_to_i860(x) -#endif /* i860 */ /* - * i386/i486/i860 Page Table Entry + * i386/i486 Page Table Entry */ typedef unsigned int pt_entry_t; @@ -108,11 +97,7 @@ typedef unsigned int pt_entry_t; * without using the bit fields). */ -#if i860 -#define INTEL_PTE_valid 0x00000001 -#else #define INTEL_PTE_VALID 0x00000001 -#endif #define INTEL_PTE_WRITE 0x00000002 #define INTEL_PTE_USER 0x00000004 #define INTEL_PTE_WTHRU 0x00000008 @@ -122,22 +107,6 @@ typedef unsigned int pt_entry_t; #define INTEL_PTE_WIRED 0x00000200 #define INTEL_PTE_PFN 0xfffff000 -#if i860 -#if NOCACHE -#define INTEL_PTE_VALID (INTEL_PTE_valid \ - |INTEL_PTE_WTHRU \ - |INTEL_PTE_NCACHE \ - |INTEL_PTE_REF \ - |INTEL_PTE_MOD \ - ) -#else /* NOCACHE */ -#define INTEL_PTE_VALID (INTEL_PTE_valid \ - |INTEL_PTE_REF \ - |INTEL_PTE_MOD \ - ) -#endif /* NOCACHE */ -#endif /* i860 */ - #define pa_to_pte(a) ((a) & INTEL_PTE_PFN) #define pte_to_pa(p) ((p) & INTEL_PTE_PFN) #define pte_increment_pa(p) ((p) += INTEL_OFFMASK+1) @@ -164,11 +133,7 @@ typedef struct pmap *pmap_t; #define PMAP_NULL ((pmap_t) 0) -#if i860 -/*#define set_dirbase(dirbase) flush_and_ctxsw(dirbase)*//*akp*/ -#else #define set_dirbase(dirbase) set_cr3(dirbase) -#endif #if NCPUS > 1 /* @@ -202,7 +167,7 @@ extern pmap_t kernel_pmap; #endif /* NCPUS > 1 */ /* - * Machine dependent routines that are used only for i386/i486/i860. + * Machine dependent routines that are used only for i386/i486. */ pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t addr); |