Module Name: src
Committed By: matt
Date: Mon Aug 24 04:05:56 UTC 2009
Modified Files:
src/sys/miscfs/procfs [matt-nb5-mips64]: procfs_map.c
src/usr.bin/pmap [matt-nb5-mips64]: pmap.c pmap.h
Log Message:
Fix some vaddr_t/vaddr_t type droppings.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.36.12.1 src/sys/miscfs/procfs/procfs_map.c
cvs rdiff -u -r1.41 -r1.41.10.1 src/usr.bin/pmap/pmap.c
cvs rdiff -u -r1.7 -r1.7.12.1 src/usr.bin/pmap/pmap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/miscfs/procfs/procfs_map.c
diff -u src/sys/miscfs/procfs/procfs_map.c:1.36 src/sys/miscfs/procfs/procfs_map.c:1.36.12.1
--- src/sys/miscfs/procfs/procfs_map.c:1.36 Fri Jul 25 18:36:50 2008
+++ src/sys/miscfs/procfs/procfs_map.c Mon Aug 24 04:05:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_map.c,v 1.36 2008/07/25 18:36:50 christos Exp $ */
+/* $NetBSD: procfs_map.c,v 1.36.12.1 2009/08/24 04:05:56 matt Exp $ */
/*
* Copyright (c) 1993
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_map.c,v 1.36 2008/07/25 18:36:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: procfs_map.c,v 1.36.12.1 2009/08/24 04:05:56 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -171,19 +171,21 @@
}
}
pos += snprintf(buffer + pos, bufsize - pos,
- "%0*lx-%0*lx %c%c%c%c %0*lx %02x:%02x %ld %s\n",
- (int)sizeof(void *) * 2,(unsigned long)entry->start,
- (int)sizeof(void *) * 2,(unsigned long)entry->end,
+ "%0*"PRIxVADDR"-%0*"PRIxVADDR
+ " %c%c%c%c %0*"PRIxVADDR" %02x:%02x %ld %s\n",
+ (int)sizeof(void *) * 2, entry->start,
+ (int)sizeof(void *) * 2, entry->end,
(entry->protection & VM_PROT_READ) ? 'r' : '-',
(entry->protection & VM_PROT_WRITE) ? 'w' : '-',
(entry->protection & VM_PROT_EXECUTE) ? 'x' : '-',
(entry->etype & UVM_ET_COPYONWRITE) ? 'p' : 's',
(int)sizeof(void *) * 2,
- (unsigned long)entry->offset,
+ (vsize_t)entry->offset,
major(dev), minor(dev), fileid, path);
} else {
pos += snprintf(buffer + pos, bufsize - pos,
- "0x%lx 0x%lx %c%c%c %c%c%c %s %s %d %d %d\n",
+ "%#"PRIxVADDR" %#"PRIxVADDR
+ " %c%c%c %c%c%c %s %s %d %d %d\n",
entry->start, entry->end,
(entry->protection & VM_PROT_READ) ? 'r' : '-',
(entry->protection & VM_PROT_WRITE) ? 'w' : '-',
Index: src/usr.bin/pmap/pmap.c
diff -u src/usr.bin/pmap/pmap.c:1.41 src/usr.bin/pmap/pmap.c:1.41.10.1
--- src/usr.bin/pmap/pmap.c:1.41 Mon Apr 28 20:24:14 2008
+++ src/usr.bin/pmap/pmap.c Mon Aug 24 04:05:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.41 2008/04/28 20:24:14 martin Exp $ */
+/* $NetBSD: pmap.c,v 1.41.10.1 2009/08/24 04:05:56 matt 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.41 2008/04/28 20:24:14 martin Exp $");
+__RCSID("$NetBSD: pmap.c,v 1.41.10.1 2009/08/24 04:05:56 matt 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' : '-',
@@ -408,7 +408,7 @@
}
if (print_maps) {
- printf("%*s%0*lx-%0*lx %c%c%c%c %0*" PRIx64 " %02x:%02x %llu %s\n",
+ printf("%*s%0*"PRIxVADDR"-%0*"PRIxVADDR" %c%c%c%c %0*" PRIx64 " %02x:%02x %llu %s\n",
indent(2), "",
(int)sizeof(void *) * 2, vme->start,
(int)sizeof(void *) * 2, vme->end,
@@ -423,7 +423,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,
@@ -475,8 +475,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 %02u:%02u %7llu - %s [%p]\n" :
- "%*s%0*lx-%0*lx %7luk %0*" PRIx64 " %c%c%c%c%c (%c%c%c) %d/%d/%d %02u:%02u %7llu - %s\n",
+ "%*s%0*"PRIxVADDR"-%0*"PRIxVADDR" %7luk %0*" PRIx64 " %c%c%c%c%c (%c%c%c) %d/%d/%d %02u:%02u %7llu - %s [%p]\n" :
+ "%*s%0*"PRIxVADDR"-%0*"PRIxVADDR" %7luk %0*" PRIx64 " %c%c%c%c%c (%c%c%c) %d/%d/%d %02u:%02u %7llu - %s\n",
indent(2), "",
(int)sizeof(void *) * 2,
vme->start,
Index: src/usr.bin/pmap/pmap.h
diff -u src/usr.bin/pmap/pmap.h:1.7 src/usr.bin/pmap/pmap.h:1.7.12.1
--- src/usr.bin/pmap/pmap.h:1.7 Mon Apr 28 20:24:14 2008
+++ src/usr.bin/pmap/pmap.h Mon Aug 24 04:05:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.7 2008/04/28 20:24:14 martin Exp $ */
+/* $NetBSD: pmap.h,v 1.7.12.1 2009/08/24 04:05:56 matt Exp $ */
/*
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@@ -103,6 +103,13 @@
#define KDEREFOK(kd, item) _KDEREFOK((kd), A(item), D(item, data), S(item))
#define KDEREF(kd, item) _KDEREF((kd), A(item), D(item, data), S(item))
+#ifndef PRIxVADDR
+#define PRIxVADDR "lx"
+#endif
+#ifndef PRIxVSIZE
+#define PRIxVSIZE "lx"
+#endif
+
struct kbit {
/*
* size of data chunk
