Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove some vto*() macros that won't stand a chance of working

Browse Source 
with PSE or PAE, and reimplement vtphys() in terms of pmap_extract().
This commit is contained in:
thorpej 2000-09-06 19:09:45 +00:00
parent 08e45b3689
commit 7dd395bb7f
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/arch/i386/i386/pmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.c,v 1.99 2000/09/05 21:56:41 thorpej Exp $ */
/* $NetBSD: pmap.c,v 1.100 2000/09/06 19:09:45 thorpej Exp $ */
/*
*
@ -2029,6 +2029,23 @@ pmap_extract(pmap, va, pap)
}
/*
* vtophys: virtual address to physical address. For use by
* machine-dependent code only.
*/
paddr_t
vtophys(va)
vaddr_t va;
{
paddr_t pa;
if (pmap_extract(pmap_kernel(), va, &pa) == TRUE)
return (pa);
return (0);
}
/*
* pmap_virtual_space: used during bootup [pmap_steal_memory] to
* determine the bounds of the kernel virtual addess space.

12
sys/arch/i386/include/pmap.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap.h,v 1.45 2000/06/15 13:35:34 mycroft Exp $ */
/* $NetBSD: pmap.h,v 1.46 2000/09/06 19:09:46 thorpej Exp $ */
/*
*
@ -193,21 +193,12 @@
*
* vtopte: return a pointer to the PTE mapping a VA
* kvtopte: same as above (takes a KVA, but doesn't matter with this pmap)
* ptetov: given a pointer to a PTE, return the VA that it maps
* vtophys: translate a VA to the PA mapped to it
*
* plus alternative versions of the above
*/
#define vtopte(VA) (PTE_BASE + i386_btop(VA))
#define kvtopte(VA) vtopte(VA)
#define ptetov(PT) (i386_ptob(PT - PTE_BASE))
#define vtophys(VA) ((*vtopte(VA) & PG_FRAME) | \
((unsigned)(VA) & ~PG_FRAME))
#define avtopte(VA) (APTE_BASE + i386_btop(VA))
#define ptetoav(PT) (i386_ptob(PT - APTE_BASE))
#define avtophys(VA) ((*avtopte(VA) & PG_FRAME) | \
((unsigned)(VA) & ~PG_FRAME))
/*
* pdei/ptei: generate index into PDP/PTP from a VA
@ -502,6 +493,7 @@ pmap_protect(pmap, sva, eva, prot)
}
}
paddr_t vtophys __P((vaddr_t));
vaddr_t pmap_map __P((vaddr_t, paddr_t, paddr_t, vm_prot_t));
#if defined(USER_LDT)