Page MenuHomeFreeBSD
Files F147063749

D3206.id7403.diff
No OneTemporary
Actions

D3206.id7403.diff
View Options

Index: sys/arm/arm/pmap-v6-new.c
===================================================================
--- sys/arm/arm/pmap-v6-new.c
+++ sys/arm/arm/pmap-v6-new.c
@@ -162,7 +162,6 @@
static void pmap_zero_page_check(vm_page_t m);
void pmap_debug(int level);
int pmap_pid_dump(int pid);
-void pmap_pvdump(vm_paddr_t pa);
#define PDEBUG(_lev_,_stat_) \
if (pmap_debug_level >= (_lev_)) \
@@ -6344,63 +6343,6 @@
sx_sunlock(&allproc_lock);
return (npte2);
}
-
-/*
- * Print address space of pmap.
- */
-static void
-pads(pmap_t pmap)
-{
- int i, j;
- vm_paddr_t va;
- pt1_entry_t pte1;
- pt2_entry_t *pte2p, pte2;
-
- if (pmap == kernel_pmap)
- return;
- for (i = 0; i < NPTE1_IN_PT1; i++) {
- pte1 = pte1_load(&pmap->pm_pt1[i]);
- if (pte1_is_section(pte1)) {
- /*
- * QQQ: Do something here!
- */
- } else if (pte1_is_link(pte1)) {
- for (j = 0; j < NPTE2_IN_PT2; j++) {
- va = (i << PTE1_SHIFT) + (j << PAGE_SHIFT);
- if (pmap == kernel_pmap && va < KERNBASE)
- continue;
- if (pmap != kernel_pmap && va >= KERNBASE &&
- (va < UPT2V_MIN_ADDRESS ||
- va >= UPT2V_MAX_ADDRESS))
- continue;
-
- pte2p = pmap_pte2(pmap, va);
- pte2 = pte2_load(pte2p);
- pmap_pte2_release(pte2p);
- if (!pte2_is_valid(pte2))
- continue;
- printf("%x:%x ", va, pte2);
- }
- }
- }
-}
-
-void
-pmap_pvdump(vm_paddr_t pa)
-{
- pv_entry_t pv;
- pmap_t pmap;
- vm_page_t m;
-
- printf("pa %x", pa);
- m = PHYS_TO_VM_PAGE(pa);
- TAILQ_FOREACH(pv, &m->md.pv_list, pv_next) {
- pmap = PV_PMAP(pv);
- printf(" -> pmap %p, va %x", (void *)pmap, pv->pv_va);
- pads(pmap);
- }
- printf(" ");
-}
#endif
#ifdef DDB
Index: sys/i386/i386/pmap.c
===================================================================
--- sys/i386/i386/pmap.c
+++ sys/i386/i386/pmap.c
@@ -5461,51 +5461,3 @@
return (npte);
}
#endif
-
-#if defined(DEBUG)
-
-static void pads(pmap_t pm);
-void pmap_pvdump(vm_paddr_t pa);
-
-/* print address space of pmap*/
-static void
-pads(pmap_t pm)
-{
- int i, j;
- vm_paddr_t va;
- pt_entry_t *ptep;
-
- if (pm == kernel_pmap)
- return;
- for (i = 0; i < NPDEPTD; i++)
- if (pm->pm_pdir[i])
- for (j = 0; j < NPTEPG; j++) {
- va = (i << PDRSHIFT) + (j << PAGE_SHIFT);
- if (pm == kernel_pmap && va < KERNBASE)
- continue;
- if (pm != kernel_pmap && va > UPT_MAX_ADDRESS)
- continue;
- ptep = pmap_pte(pm, va);
- if (pmap_pte_v(ptep))
- printf("%x:%x ", va, *ptep);
- };
-
-}
-
-void
-pmap_pvdump(vm_paddr_t pa)
-{
- pv_entry_t pv;
- pmap_t pmap;
- vm_page_t m;
-
- printf("pa %x", pa);
- m = PHYS_TO_VM_PAGE(pa);
- TAILQ_FOREACH(pv, &m->md.pv_list, pv_next) {
- pmap = PV_PMAP(pv);
- printf(" -> pmap %p, va %x", (void *)pmap, pv->pv_va);
- pads(pmap);
- }
- printf(" ");
-}
-#endif
Index: sys/mips/mips/pmap.c
===================================================================
--- sys/mips/mips/pmap.c
+++ sys/mips/mips/pmap.c
@@ -3294,56 +3294,6 @@
}
#endif
-#if defined(DEBUG)
-
-static void pads(pmap_t pm);
-void pmap_pvdump(vm_offset_t pa);
-
-/* print address space of pmap*/
-static void
-pads(pmap_t pm)
-{
- unsigned va, i, j;
- pt_entry_t *ptep;
-
- if (pm == kernel_pmap)
- return;
- for (i = 0; i < NPTEPG; i++)
- if (pm->pm_segtab[i])
- for (j = 0; j < NPTEPG; j++) {
- va = (i << SEGSHIFT) + (j << PAGE_SHIFT);
- if (pm == kernel_pmap && va < KERNBASE)
- continue;
- if (pm != kernel_pmap &&
- va >= VM_MAXUSER_ADDRESS)
- continue;
- ptep = pmap_pte(pm, va);
- if (pte_test(ptep, PTE_V))
- printf("%x:%x ", va, *(int *)ptep);
- }
-
-}
-
-void
-pmap_pvdump(vm_offset_t pa)
-{
- register pv_entry_t pv;
- vm_page_t m;
-
- printf("pa %x", pa);
- m = PHYS_TO_VM_PAGE(pa);
- for (pv = TAILQ_FIRST(&m->md.pv_list); pv;
- pv = TAILQ_NEXT(pv, pv_list)) {
- printf(" -> pmap %p, va %x", (void *)pv->pv_pmap, pv->pv_va);
- pads(pv->pv_pmap);
- }
- printf(" ");
-}
-
-/* N/C */
-#endif
-
-
/*
* Allocate TLB address space tag (called ASID or TLBPID) and return it.
* It takes almost as much or more time to search the TLB for a

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 9, 12:58 AM (20 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29425531
Default Alt Text
D3206.id7403.diff (5 KB)

Event Timeline