accel/tcg: Zero-pad vaddr in tlb_debug output
PATCH 1/1 accel/tcg: Zero-pad vaddr in tlb_debug output
In replacing target_ulong with vaddr and TARGET_FMT_lx with VADDR_PRIx, the zero-padding of TARGET_FMT_lx got lost. Readd 16-wide zero-padding for logging consistency.
Suggested-by Peter Maydell <[email protected]>
Signed-off-by Anton Johansson <[email protected]>
--- accel/tcg/cputlb.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
accel/tcg/cputlb.c +10 -10
@@ -497,8 +497,8 @@ static void tlb_flush_page_locked(CPUArchState *env, int midx, vaddr page)/* Check if we need to flush due to large pages. */ if ((page & lp_mask) == lp_addr) { -tlb_debug ("forcing full flush midx %d (%" - VADDR_PRIx"/%" VADDR_PRIx")\n" , +tlb_debug ("forcing full flush midx %d (%016" + VADDR_PRIx"/%016" VADDR_PRIx")\n" , midx, lp_addr, lp_mask);tlb_flush_one_mmuidx_locked (env, midx,get_clock_realtime ()); }else {
@@ -527,7 +527,7 @@ static void tlb_flush_page_by_mmuidx_async_0(CPUState *cpu,assert_cpu_is_self (cpu); -tlb_debug ("page addr: %" VADDR_PRIx" mmu_map:0x%x\n" , addr, idxmap); +tlb_debug ("page addr: %016" VADDR_PRIx" mmu_map:0x%x\n" , addr, idxmap);qemu_spin_lock (&env_tlb (env)->c.lock);for (mmu_idx =0 ; mmu_idx <NB_MMU_MODES ; mmu_idx++) {
@@ -591,7 +591,7 @@ static void tlb_flush_page_by_mmuidx_async_2(CPUState *cpu,void tlb_flush_page_by_mmuidx (CPUState *cpu,vaddr addr,uint16_t idxmap) { -tlb_debug ("addr: %" VADDR_PRIx" mmu_idx:%" PRIx16"\n" , addr, idxmap); +tlb_debug ("addr: %016" VADDR_PRIx" mmu_idx:%" PRIx16"\n" , addr, idxmap);/* This should already be page aligned */ addr &=TARGET_PAGE_MASK ;
@@ -625,7 +625,7 @@ void tlb_flush_page(CPUState *cpu, vaddr addr)void tlb_flush_page_by_mmuidx_all_cpus (CPUState *src_cpu,vaddr addr,uint16_t idxmap) { -tlb_debug ("addr: %" VADDR_PRIx" mmu_idx:%" PRIx16"\n" , addr, idxmap); +tlb_debug ("addr: %016" VADDR_PRIx" mmu_idx:%" PRIx16"\n" , addr, idxmap);/* This should already be page aligned */ addr &=TARGET_PAGE_MASK ;
@@ -666,7 +666,7 @@ void tlb_flush_page_by_mmuidx_all_cpus_synced(CPUState *src_cpu, vaddr addr, uint16_t idxmap) { -tlb_debug ("addr: %" VADDR_PRIx" mmu_idx:%" PRIx16"\n" , addr, idxmap); +tlb_debug ("addr: %016" VADDR_PRIx" mmu_idx:%" PRIx16"\n" , addr, idxmap);/* This should already be page aligned */ addr &=TARGET_PAGE_MASK ;
@@ -728,7 +728,7 @@ static void tlb_flush_range_locked(CPUArchState *env, int midx,*/ if (mask < f->mask || len > f->mask) {tlb_debug ("forcing full flush midx %d (" -"%" VADDR_PRIx"/%" VADDR_PRIx"+%" VADDR_PRIx")\n" , +"%016" VADDR_PRIx"/%016" VADDR_PRIx"+%016" VADDR_PRIx")\n" , midx, addr, mask, len);tlb_flush_one_mmuidx_locked (env, midx,get_clock_realtime ());return ;
@@ -741,7 +741,7 @@ static void tlb_flush_range_locked(CPUArchState *env, int midx,*/ if (((addr + len -1 ) & d->large_page_mask) == d->large_page_addr) {tlb_debug ("forcing full flush midx %d (" -"%" VADDR_PRIx"/%" VADDR_PRIx")\n" , +"%016" VADDR_PRIx"/%016" VADDR_PRIx")\n" , midx, d->large_page_addr, d->large_page_mask);tlb_flush_one_mmuidx_locked (env, midx,get_clock_realtime ());return ;
@@ -773,7 +773,7 @@ static void tlb_flush_range_by_mmuidx_async_0(CPUState *cpu,assert_cpu_is_self (cpu); -tlb_debug ("range: %" VADDR_PRIx"/%u+%" VADDR_PRIx" mmu_map:0x%x\n" , +tlb_debug ("range: %016" VADDR_PRIx"/%u+%016" VADDR_PRIx" mmu_map:0x%x\n" , d.addr, d.bits, d.len, d.idxmap);qemu_spin_lock (&env_tlb (env)->c.lock);
@@ -1165,7 +1165,7 @@ void tlb_set_page_full(CPUState *cpu, int mmu_idx, &xlat, &sz, full->attrs, &prot);assert (sz >=TARGET_PAGE_SIZE ); -tlb_debug ("vaddr=%" VADDR_PRIx" paddr=0x" HWADDR_FMT_plx +tlb_debug ("vaddr=%016" VADDR_PRIx" paddr=0x" HWADDR_FMT_plx" prot=%x idx=%d\n" , addr, full->phys_addr, prot, mmu_idx);
Signature · 1 line
2.41.0
Quoted 9 lines · Anton Johansson
In replacing
target_ulongwith vaddr andTARGET_FMT_lxwithVADDR_PRIx, the zero-padding ofTARGET_FMT_lxgot lost. Readd 16-wide zero-padding for logging consistency.Suggested-by Peter Maydell<[email protected]>Signed-off-by Anton Johansson<[email protected]>--- accel/tcg/cputlb.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-)
Reviewed-by Richard Henderson <[email protected]>
And queued, thanks.
r~