diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2002-09-15 09:42:59 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2002-09-15 09:42:59 +0000 |
| commit | 11b7e14cf64561a2c8424e5cf21e783d23a9ec32 (patch) | |
| tree | 3bb5ca2d842dceecfab636909916cc05a56bb31a /sys/arch/hppa | |
| parent | 453094a91e0017a096f41afffe65e1fa8eb6a40b (diff) | |
better alias checking, verified w/ the regress
Diffstat (limited to 'sys/arch/hppa')
| -rw-r--r-- | sys/arch/hppa/hppa/pmap.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sys/arch/hppa/hppa/pmap.c b/sys/arch/hppa/hppa/pmap.c index 758443d0d68..68caa4af957 100644 --- a/sys/arch/hppa/hppa/pmap.c +++ b/sys/arch/hppa/hppa/pmap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pmap.c,v 1.84 2002/09/10 22:37:46 mickey Exp $ */ +/* $OpenBSD: pmap.c,v 1.85 2002/09/15 09:42:58 mickey Exp $ */ /* * Copyright (c) 1998-2002 Michael Shalayeff @@ -365,22 +365,20 @@ pmap_dump_pv(paddr_t pa) #ifdef PMAPDEBUG int -pmap_check_alias(struct pv_entry *pve, vaddr_t va) +pmap_check_alias(struct pv_entry *pve, vaddr_t va, pt_entry_t pte) { - pt_entry_t pte; - int ret = 0; + int ret; /* check for non-equ aliased mappings */ - for (pte = 0; pve; pve = pve->pv_next) { - pt_entry_t pte1 = pmap_vp_find(pve->pv_pmap, pve->pv_va); + for (ret = 0; pve; pve = pve->pv_next) { + pte |= pmap_vp_find(pve->pv_pmap, pve->pv_va); if ((va & HPPA_PGAOFF) != (pve->pv_va & HPPA_PGAOFF) && - pte && (pte1 & PTE_PROT(TLB_WRITE))) { + (pte & PTE_PROT(TLB_WRITE))) { printf("pmap_pv_enter: " - "aliased writable mapping %d:0x%x", + "aliased writable mapping 0x%x:0x%x\n", pve->pv_pmap->pm_space, pve->pv_va); ret++; } - pte |= pte1; } return (ret); @@ -430,7 +428,7 @@ pmap_pv_enter(struct pv_head *pvh, struct pv_entry *pve, struct pmap *pm, simple_lock(&pvh->pvh_lock); /* lock pv_head */ pve->pv_next = pvh->pvh_list; pvh->pvh_list = pve; - if (pmap_check_alias(pve, va)) + if (pmap_check_alias(pve, va, 0)) Debugger(); simple_unlock(&pvh->pvh_lock); /* unlock, done! */ } @@ -1242,7 +1240,7 @@ pmap_kenter_pa(va, pa, prot) if (pmap_initialized && bank != -1) { pvh = &vm_physmem[bank].pmseg.pvhead[off]; simple_lock(&pvh->pvh_lock); - if (pmap_check_alias(pvh->pvh_list, va)) + if (pmap_check_alias(pvh->pvh_list, va, pte)) Debugger(); simple_unlock(&pvh->pvh_lock); } |