[src/trunk]: src/usr.bin/pmap Merge from matt-nb5-mips64; adapt to vaddr_t / ...

[uebayasi <uebayasi%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/43e051e87f81
branches:  trunk
changeset: 750042:43e051e87f81
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Mon Dec 14 14:29:09 2009 +0000

description:
Merge from matt-nb5-mips64; adapt to vaddr_t / vsize_t format specifiers.

diffstat:

 usr.bin/pmap/pmap.c |  24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diffs (90 lines):

diff -r f5b3b4611159 -r 43e051e87f81 usr.bin/pmap/pmap.c
--- a/usr.bin/pmap/pmap.c       Mon Dec 14 14:13:16 2009 +0000
+++ b/usr.bin/pmap/pmap.c       Mon Dec 14 14:29:09 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.43 2009/04/13 00:27:38 lukem Exp $ */
+/*     $NetBSD: pmap.c,v 1.44 2009/12/14 14:29:09 uebayasi Exp $ */
 
 /*
  * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: pmap.c,v 1.43 2009/04/13 00:27:38 lukem Exp $");
+__RCSID("$NetBSD: pmap.c,v 1.44 2009/12/14 14:29:09 uebayasi Exp $");
 #endif
 
 #include <string.h>
@@ -136,7 +136,7 @@
                printf("%*s    lock = <struct lock>,", indent(2), "");
                printf(" header = <struct vm_map_entry>,");
                printf(" nentries = %d,\n", D(vm_map, vm_map)->nentries);
-               printf("%*s    size = %lx,", indent(2), "",
+               printf("%*s    size = %#"PRIxVSIZE",", indent(2), "",
                       D(vm_map, vm_map)->size);
                printf(" ref_count = %d,", D(vm_map, vm_map)->ref_count);
                printf("%*s    hint = %p,", indent(2), "",
@@ -161,11 +161,11 @@
        if (print_ddb) {
                const char *name = mapname(P(vm_map));
 
-               printf("%*s%s %p: [0x%lx->0x%lx]\n", indent(2), "",
+               printf("%*s%s %p: [0x%#"PRIxVADDR"->0x%#"PRIxVADDR"]\n", indent(2), "",
                       recurse < 2 ? "MAP" : "SUBMAP", P(vm_map),
                       vm_map_min(D(vm_map, vm_map)),
                       vm_map_max(D(vm_map, vm_map)));
-               printf("\t%*s#ent=%d, sz=%ld, ref=%d, version=%d, flags=0x%x\n",
+               printf("\t%*s#ent=%d, sz=%"PRIdVSIZE", ref=%d, version=%d, flags=0x%x\n",
                       indent(2), "", D(vm_map, vm_map)->nentries,
                       D(vm_map, vm_map)->size, D(vm_map, vm_map)->ref_count,
                       D(vm_map, vm_map)->timestamp, D(vm_map, vm_map)->flags);
@@ -284,8 +284,8 @@
                       P(vm_map_entry));
                printf(" prev = %p,", vme->prev);
                printf(" next = %p,\n", vme->next);
-               printf("%*s    start = %lx,", indent(2), "", vme->start);
-               printf(" end = %lx,", vme->end);
+               printf("%*s    start = %#"PRIxVADDR",", indent(2), "", vme->start);
+               printf(" end = %#"PRIxVADDR",", vme->end);
                printf(" object.uvm_obj/sub_map = %p,\n", vme->object.uvm_obj);
                printf("%*s    offset = %" PRIx64 ",", indent(2), "",
                       vme->offset);
@@ -384,7 +384,7 @@
        name = findname(kd, vmspace, vm_map_entry, vp, vfs, uvm_obj);
 
        if (print_map) {
-               printf("%*s0x%lx 0x%lx %c%c%c %c%c%c %s %s %d %d %d",
+               printf("%*s0x%#"PRIxVADDR" 0x%#"PRIxVADDR" %c%c%c %c%c%c %s %s %d %d %d",
                       indent(2), "",
                       vme->start, vme->end,
                       (vme->protection & VM_PROT_READ) ? 'r' : '-',
@@ -410,7 +410,7 @@
        }
 
        if (print_maps) {
-               printf("%*s%0*lx-%0*lx %c%c%c%c %0*" PRIx64 " %02llx:%02llx %llu     %s\n",
+               printf("%*s%0*"PRIxVADDR"-%0*"PRIxVADDR" %c%c%c%c %0*" PRIx64 " %02llx:%02llx %llu     %s\n",
                       indent(2), "",
                       (int)sizeof(void *) * 2, vme->start,
                       (int)sizeof(void *) * 2, vme->end,
@@ -427,7 +427,7 @@
        }
 
        if (print_ddb) {
-               printf("%*s - %p: 0x%lx->0x%lx: obj=%p/0x%" PRIx64 ", amap=%p/%d\n",
+               printf("%*s - %p: 0x%"PRIxVADDR"->0x%"PRIxVADDR": obj=%p/0x%" PRIx64 ", amap=%p/%d\n",
                       indent(2), "",
                       P(vm_map_entry), vme->start, vme->end,
                       vme->object.uvm_obj, vme->offset,
@@ -480,8 +480,8 @@
        if (print_all) {
                sz = (size_t)((vme->end - vme->start) / 1024);
                printf(A(vp) ?
-                      "%*s%0*lx-%0*lx %7luk %0*" PRIx64 " %c%c%c%c%c (%c%c%c) %d/%d/%d %02llu:%02llu %7llu - %s [%p]\n" :
-                      "%*s%0*lx-%0*lx %7luk %0*" PRIx64 " %c%c%c%c%c (%c%c%c) %d/%d/%d %02llu:%02llu %7llu - %s\n",
+                      "%*s%0*"PRIxVADDR"-%0*"PRIxVADDR" %7luk %0*" PRIx64 " %c%c%c%c%c (%c%c%c) %d/%d/%d %02llu:%02llu %7llu - %s [%p]\n" :
+                      "%*s%0*"PRIxVADDR"-%0*"PRIxVADDR" %7luk %0*" PRIx64 " %c%c%c%c%c (%c%c%c) %d/%d/%d %02llu:%02llu %7llu - %s\n",
                       indent(2), "",
                       (int)sizeof(void *) * 2,
                       vme->start,