Module Name: src
Committed By: skrll
Date: Fri Dec 18 19:17:08 UTC 2009
Modified Files:
src/sys/arch/hppa/hppa: pmap.c
Log Message:
DPRINTF format fixes.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/hppa/hppa/pmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/hppa/pmap.c
diff -u src/sys/arch/hppa/hppa/pmap.c:1.61 src/sys/arch/hppa/hppa/pmap.c:1.62
--- src/sys/arch/hppa/hppa/pmap.c:1.61 Fri Dec 18 15:20:15 2009
+++ src/sys/arch/hppa/hppa/pmap.c Fri Dec 18 19:17:08 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.61 2009/12/18 15:20:15 skrll Exp $ */
+/* $NetBSD: pmap.c,v 1.62 2009/12/18 19:17:08 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.61 2009/12/18 15:20:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.62 2009/12/18 19:17:08 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -313,7 +313,7 @@
{
DPRINTF(PDB_FOLLOW|PDB_VP,
- ("%s(%p, 0x%x, 0x%x)\n", __func__, pm, (int)va, (int)ptp));
+ ("%s(%p, 0x%lx, 0x%lx)\n", __func__, pm, va, ptp));
KASSERT((ptp & PGOFSET) == 0);
@@ -327,7 +327,7 @@
paddr_t pa;
DPRINTF(PDB_FOLLOW|PDB_VP,
- ("%s(%p, 0x%x, %p)\n", __func__, pm, (int)va, pdep));
+ ("%s(%p, 0x%lx, %p)\n", __func__, pm, va, pdep));
KASSERT(pm != pmap_kernel());
KASSERT(mutex_owned(&pm->pm_lock));
@@ -339,7 +339,7 @@
pa = VM_PAGE_TO_PHYS(pg);
- DPRINTF(PDB_FOLLOW|PDB_VP, ("%s: pde %x\n", __func__, (int)pa));
+ DPRINTF(PDB_FOLLOW|PDB_VP, ("%s: pde %lx\n", __func__, pa));
pg->flags &= ~PG_BUSY; /* never busy */
pg->wire_count = 1; /* no mappings yet */
@@ -361,7 +361,7 @@
if (pm->pm_ptphint && VM_PAGE_TO_PHYS(pm->pm_ptphint) == pa)
return (pm->pm_ptphint);
- DPRINTF(PDB_FOLLOW|PDB_PV, ("%s: lookup 0x%x\n", __func__, (int)pa));
+ DPRINTF(PDB_FOLLOW|PDB_PV, ("%s: lookup 0x%lx\n", __func__, pa));
return (PHYS_TO_VM_PAGE(pa));
}
@@ -371,7 +371,7 @@
{
DPRINTF(PDB_FOLLOW|PDB_PV,
- ("%s(%p, 0x%x, %p)\n", __func__, pmap, (int)va, ptp));
+ ("%s(%p, 0x%lx, %p)\n", __func__, pmap, va, ptp));
KASSERT(pmap != pmap_kernel());
if (pmap != pmap_kernel() && --ptp->wire_count <= 1) {
@@ -400,8 +400,8 @@
pmap_pte_set(volatile pt_entry_t *pde, vaddr_t va, pt_entry_t pte)
{
- DPRINTF(PDB_FOLLOW|PDB_VP, ("%s(%p, 0x%x, 0x%x)\n",
- __func__, pde, (int)va, (int)pte));
+ DPRINTF(PDB_FOLLOW|PDB_VP, ("%s(%p, 0x%lx, 0x%x)\n",
+ __func__, pde, va, pte));
KASSERT(pde != NULL);
KASSERT(((paddr_t)pde & PGOFSET) == 0);
@@ -518,8 +518,7 @@
u_int attrs;
DPRINTF(PDB_FOLLOW|PDB_ALIAS,
- ("%s(%p, %p, 0x%x, %p)\n", __func__, pg, pve, (int)va,
- ptep));
+ ("%s(%p, %p, 0x%lx, %p)\n", __func__, pg, pve, va, ptep));
/* we should only be looking if we're not PVF_NC */
KASSERT((pg->mdpage.pvh_attrs & PVF_NC) == 0);
@@ -529,13 +528,13 @@
attrs = pmap_pvh_attrs(*ptep);
DPRINTF(PDB_FOLLOW|PDB_ALIAS,
- ("%s: va 0x%08x attrs 0x%08x (new)\n", __func__, (int)va,
+ ("%s: va 0x%08lx attrs 0x%08x (new)\n", __func__, va,
attrs));
} else {
attrs = 0;
DPRINTF(PDB_FOLLOW|PDB_ALIAS,
- ("%s: va 0x%08x (removed)\n", __func__, (int)va));
+ ("%s: va 0x%08lx (removed)\n", __func__, va));
}
/*
@@ -554,8 +553,8 @@
nonequiv = true;
DPRINTF(PDB_FOLLOW|PDB_ALIAS,
- ("%s: va 0x%08x:0x%08x attrs 0x%08x %s\n", __func__,
- (int)tpve->pv_pmap->pm_space, (int)tpve->pv_va & PV_VAMASK,
+ ("%s: va 0x%08x:0x%08lx attrs 0x%08x %s\n", __func__,
+ tpve->pv_pmap->pm_space, tpve->pv_va & PV_VAMASK,
pmap_pvh_attrs(pte), nonequiv ? "alias" : ""));
}
@@ -640,8 +639,8 @@
pmap_pv_enter(struct vm_page *pg, struct pv_entry *pve, pmap_t pm,
vaddr_t va, struct vm_page *pdep, u_int flags)
{
- DPRINTF(PDB_FOLLOW|PDB_PV, ("%s(%p, %p, %p, 0x%x, %p, 0x%x)\n",
- __func__, pg, pve, pm, (int)va, pdep, flags));
+ DPRINTF(PDB_FOLLOW|PDB_PV, ("%s(%p, %p, %p, 0x%lx, %p, 0x%x)\n",
+ __func__, pg, pve, pm, va, pdep, flags));
KASSERT(mutex_owned(&pg->mdpage.pvh_lock));
@@ -695,7 +694,7 @@
extern int __rodata_start, __rodata_end;
extern int __data_start;
- DPRINTF(PDB_FOLLOW|PDB_INIT, ("%s(0x%x)\n", __func__, (int)vstart));
+ DPRINTF(PDB_FOLLOW|PDB_INIT, ("%s(0x%lx)\n", __func__, vstart));
uvm_setpagesize();
@@ -733,8 +732,8 @@
size = round_page((hppa_sid_max + 1) * 4);
memset((void *)addr, 0, size);
fdcache(HPPA_SID_KERNEL, addr, size);
- DPRINTF(PDB_INIT, ("%s: vtop 0x%x @ 0x%x\n", __func__, (int)size,
- (int)addr));
+ DPRINTF(PDB_INIT, ("%s: vtop 0x%lx @ 0x%lx\n", __func__, size,
+ addr));
addr += size;
pmap_sdir_set(HPPA_SID_KERNEL, kpm->pm_pdir);
@@ -763,8 +762,8 @@
pmap_hpt = addr;
addr += pmap_hptsize;
- DPRINTF(PDB_INIT, ("%s: hpt_table 0x%x @ 0x%x\n", __func__,
- pmap_hptsize, (int)addr));
+ DPRINTF(PDB_INIT, ("%s: hpt_table 0x%x @ 0x%lx\n", __func__,
+ pmap_hptsize, addr));
if ((error = (cpu_hpt_init)(pmap_hpt, pmap_hptsize)) < 0) {
printf("WARNING: HPT init error %d -- DISABLED\n",
@@ -772,9 +771,9 @@
pmap_hpt = 0;
} else
DPRINTF(PDB_INIT,
- ("%s: HPT installed for %ld entries @ 0x%x\n",
+ ("%s: HPT installed for %ld entries @ 0x%lx\n",
__func__, pmap_hptsize / sizeof(struct hpt_entry),
- (int)addr));
+ addr));
}
#endif
@@ -800,8 +799,8 @@
/* now map the pde for the physmem */
memset((void *)addr, 0, PAGE_SIZE);
DPRINTF(PDB_INIT|PDB_VP,
- ("%s: pde premap 0x%08x 0x%08x\n", __func__, (int)va,
- (int)addr));
+ ("%s: pde premap 0x%08lx 0x%08lx\n", __func__, va,
+ addr));
pmap_pde_set(kpm, va, addr);
kpm->pm_stats.resident_count++; /* count PTP as resident */
}
@@ -1030,10 +1029,10 @@
}
/* XXXNH update */
- DPRINTF(PDB_INIT, ("%s: mapped 0x%x - 0x%x\n", __func__, (int)ksro,
- (int)kero));
- DPRINTF(PDB_INIT, ("%s: mapped 0x%x - 0x%x\n", __func__, (int)ksrw,
- (int)kerw));
+ DPRINTF(PDB_INIT, ("%s: mapped 0x%lx - 0x%lx\n", __func__, ksro,
+ kero));
+ DPRINTF(PDB_INIT, ("%s: mapped 0x%lx - 0x%lx\n", __func__, ksrw,
+ kerw));
}
@@ -1186,8 +1185,8 @@
for (haggis = sheep->mdpage.pvh_list; haggis != NULL; )
if (haggis->pv_pmap == pmap) {
- DPRINTF(PDB_FOLLOW, (" 0x%x",
- (int)haggis->pv_va));
+ DPRINTF(PDB_FOLLOW, (" 0x%lx",
+ haggis->pv_va));
pmap_remove(pmap,
haggis->pv_va & PV_VAMASK,
@@ -1244,8 +1243,8 @@
bool wired = (flags & PMAP_WIRED) != 0;
DPRINTF(PDB_FOLLOW|PDB_ENTER,
- ("%s(%p, 0x%x, 0x%x, 0x%x, 0x%x)\n", __func__,
- pmap, (int)va, (int)pa, prot, flags));
+ ("%s(%p, 0x%lx, 0x%lx, 0x%x, 0x%x)\n", __func__, pmap, va, pa,
+ prot, flags));
PMAP_LOCK(pmap);
@@ -1265,7 +1264,7 @@
if ((pte = pmap_pte_get(pde, va))) {
DPRINTF(PDB_ENTER,
- ("%s: remapping 0x%x -> 0x%x\n", __func__, pte, (int)pa));
+ ("%s: remapping 0x%x -> 0x%lx\n", __func__, pte, pa));
pmap_pte_flush(pmap, va, pte);
if (wired && !(pte & PTE_PROT(TLB_WIRED)))
@@ -1285,8 +1284,8 @@
pg->mdpage.pvh_attrs |= pmap_pvh_attrs(pte);
mutex_exit(&pg->mdpage.pvh_lock);
} else {
- DPRINTF(PDB_ENTER, ("%s: new mapping 0x%x -> 0x%x\n",
- __func__, (int)va, (int)pa));
+ DPRINTF(PDB_ENTER, ("%s: new mapping 0x%lx -> 0x%lx\n",
+ __func__, va, pa));
pte = PTE_PROT(TLB_REFTRAP);
pve = NULL;
pmap->pm_stats.resident_count++;
@@ -1348,7 +1347,7 @@
int batch;
DPRINTF(PDB_FOLLOW|PDB_REMOVE,
- ("%s(%p, 0x%x, 0x%x)\n", __func__, pmap, (int)sva, (int)eva));
+ ("%s(%p, 0x%lx, 0x%lx)\n", __func__, pmap, sva, eva));
PMAP_LOCK(pmap);
@@ -1412,8 +1411,7 @@
u_int pteprot, pdemask;
DPRINTF(PDB_FOLLOW|PDB_PMAP,
- ("%s(%p, %x, %x, %x)\n", __func__, pmap, (int)sva, (int)eva,
- prot));
+ ("%s(%p, %lx, %lx, %x)\n", __func__, pmap, sva, eva, prot));
sva = trunc_page(sva);
pteprot = PTE_PROT(pmap_prot(pmap, prot));
@@ -1431,8 +1429,7 @@
if ((pte = pmap_pte_get(pde, sva))) {
DPRINTF(PDB_PMAP,
- ("%s: va=0x%x pte=0x%x\n", __func__,
- (int)sva, pte));
+ ("%s: va=0x%lx pte=0x%x\n", __func__, sva, pte));
/*
* Determine if mapping is changing.
* If not, nothing to do.
@@ -1522,8 +1519,7 @@
volatile pt_entry_t *pde;
pt_entry_t pte = 0;
- DPRINTF(PDB_FOLLOW|PDB_PMAP, ("%s(%p, 0x%x)\n", __func__, pmap,
- (int)va));
+ DPRINTF(PDB_FOLLOW|PDB_PMAP, ("%s(%p, 0x%lx)\n", __func__, pmap, va));
PMAP_LOCK(pmap);
if ((pde = pmap_pde_get(pmap->pm_pdir, va))) {
@@ -1547,7 +1543,7 @@
{
bool rv;
- DPRINTF(PDB_FOLLOW|PDB_BITS,
+ DPRINTF(PDB_FOLLOW|PDB_BITS,
("%s(%p, %x, %x)\n", __func__, pg, set, clear));
mutex_enter(&pg->mdpage.pvh_lock);
@@ -1585,8 +1581,8 @@
#ifdef PMAPDEBUG
if (!pte) {
DPRINTF(PDB_FOLLOW|PDB_BITS,
- ("%s: zero pte for 0x%x\n", __func__,
- (int)va));
+ ("%s: zero pte for 0x%lx\n", __func__,
+ va));
continue;
}
#endif
@@ -1647,8 +1643,7 @@
{
pt_entry_t pte;
- DPRINTF(PDB_FOLLOW|PDB_EXTRACT, ("%s(%p, %x)\n", __func__, pmap,
- (int)va));
+ DPRINTF(PDB_FOLLOW|PDB_EXTRACT, ("%s(%p, %lx)\n", __func__, pmap, va));
PMAP_LOCK(pmap);
pte = pmap_vp_find(pmap, va);
@@ -1720,7 +1715,7 @@
pmap_zero_page(paddr_t pa)
{
- DPRINTF(PDB_FOLLOW|PDB_PHYS, ("%s(%x)\n", __func__, (int)pa));
+ DPRINTF(PDB_FOLLOW|PDB_PHYS, ("%s(%lx)\n", __func__, pa));
KASSERT(PHYS_TO_VM_PAGE(pa)->mdpage.pvh_list == NULL);
@@ -1738,8 +1733,7 @@
{
struct vm_page *srcpg = PHYS_TO_VM_PAGE(spa);
- DPRINTF(PDB_FOLLOW|PDB_PHYS, ("%s(%x, %x)\n", __func__, (int)spa,
- (int)dpa));
+ DPRINTF(PDB_FOLLOW|PDB_PHYS, ("%s(%lx, %lx)\n", __func__, spa, dpa));
KASSERT(PHYS_TO_VM_PAGE(dpa)->mdpage.pvh_list == NULL);
@@ -1770,7 +1764,7 @@
#endif /* PMAPDEBUG */
DPRINTF(PDB_FOLLOW|PDB_ENTER,
- ("%s(%x, %x, %x)\n", __func__, (int)va, (int)pa, prot));
+ ("%s(%lx, %lx, %x)\n", __func__, va, pa, prot));
if (!(pde = pmap_pde_get(pmap_kernel()->pm_pdir, va)) &&
!(pde = pmap_pde_alloc(pmap_kernel(), va, NULL)))
@@ -1805,8 +1799,8 @@
panic("%s: no pv entries available",
__func__);
DPRINTF(PDB_FOLLOW|PDB_ENTER,
- ("%s(%x, %x, %x) TLB_KENTER\n", __func__,
- (int)va, (int)pa, pte));
+ ("%s(%lx, %lx, %x) TLB_KENTER\n", __func__,
+ va, pa, pte));
pmap_pv_enter(pg, pve, pmap_kernel(), va, NULL,
PV_KENTER);
@@ -1846,7 +1840,7 @@
#endif /* PMAPDEBUG */
DPRINTF(PDB_FOLLOW|PDB_REMOVE,
- ("%s(%x, %x)\n", __func__, (int)va, (int)size));
+ ("%s(%lx, %lx)\n", __func__, va, size));
#ifdef PMAPDEBUG
/*
@@ -1857,8 +1851,8 @@
*/
if (va != 0 && va < ptoa(physmem)) {
DPRINTF(PDB_FOLLOW|PDB_REMOVE,
- ("%s(%x, %x): unmapping physmem\n", __func__, (int)va,
- (int)size));
+ ("%s(%lx, %lx): unmapping physmem\n", __func__, va,
+ size));
pmapdebug = opmapdebug;
return;
}
@@ -1874,8 +1868,8 @@
}
if (!(pte = pmap_pte_get(pde, va))) {
DPRINTF(PDB_FOLLOW|PDB_REMOVE,
- ("%s: unmapping unmapped 0x%x\n", __func__,
- (int)va));
+ ("%s: unmapping unmapped 0x%lx\n", __func__,
+ va));
continue;
}
