Module Name: src
Committed By: matt
Date: Fri Dec 11 05:52:04 UTC 2009
Modified Files:
src/sys/arch/alpha/include: types.h
src/sys/arch/amd64/include: types.h
src/sys/arch/arm/include: types.h
src/sys/arch/hppa/include: types.h
src/sys/arch/i386/include: types.h
src/sys/arch/ia64/include: types.h
src/sys/arch/m68k/include: types.h
src/sys/arch/powerpc/include: types.h
src/sys/arch/sh3/include: types.h
src/sys/arch/sparc/include: types.h
src/sys/arch/usermode/include: types.h
src/sys/arch/vax/include: types.h
Log Message:
Add PRIx{P,V}{ADDR,SIZE}, PRIu{P,V}SIZE, and PRIxREGISTER{,32,64} for all
(except where they will be added via merge). These should be used to print
{p,v}{addr,size}_t and register*_t as appropriate.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/alpha/include/types.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amd64/include/types.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/include/types.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hppa/include/types.h
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/i386/include/types.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/include/types.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/m68k/include/types.h
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/powerpc/include/types.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sh3/include/types.h
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/sparc/include/types.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/usermode/include/types.h
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/vax/include/types.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/arch/alpha/include/types.h
diff -u src/sys/arch/alpha/include/types.h:1.41 src/sys/arch/alpha/include/types.h:1.42
--- src/sys/arch/alpha/include/types.h:1.41 Thu Aug 20 21:31:49 2009
+++ src/sys/arch/alpha/include/types.h Fri Dec 11 05:52:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.41 2009/08/20 21:31:49 matt Exp $ */
+/* $NetBSD: types.h,v 1.42 2009/12/11 05:52:03 matt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -50,15 +50,17 @@
typedef unsigned long psize_t;
typedef unsigned long vaddr_t;
typedef unsigned long vsize_t;
-#define PRTxPADDR "lx"
-#define PRTxPSIZE "lx"
-#define PRTxVADDR "lx"
-#define PRTxVSIZE "lx"
+#define PRIxPADDR "lx"
+#define PRIxPSIZE "lx"
+#define PRIuPSIZE "lu"
+#define PRIxVADDR "lx"
+#define PRIxVSIZE "lx"
+#define PRIuVSIZE "lu"
#endif
typedef long int register_t;
#if defined(_NETBSD_SOURCE)
-#define PRTxREGISTER "lx"
+#define PRIxREGISTER "lx"
#endif
typedef volatile int __cpu_simple_lock_t;
Index: src/sys/arch/amd64/include/types.h
diff -u src/sys/arch/amd64/include/types.h:1.32 src/sys/arch/amd64/include/types.h:1.33
--- src/sys/arch/amd64/include/types.h:1.32 Sun Apr 19 14:11:36 2009
+++ src/sys/arch/amd64/include/types.h Fri Dec 11 05:52:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.32 2009/04/19 14:11:36 ad Exp $ */
+/* $NetBSD: types.h,v 1.33 2009/12/11 05:52:03 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -52,10 +52,18 @@
typedef unsigned long psize_t;
typedef unsigned long vaddr_t;
typedef unsigned long vsize_t;
+#define PRIxPADDR "lx"
+#define PRIxPSIZE "lx"
+#define PRIuPSIZE "lu"
+#define PRIxVADDR "lx"
+#define PRIxVSIZE "lx"
+#define PRIuVSIZE "lu"
#endif
-typedef long int register_t;
-typedef int register32_t;
+typedef long int register_t;
+typedef int register32_t;
+#define PRIxREGISTER "lx"
+#define PRIxREGISTER32 "x"
typedef volatile unsigned char __cpu_simple_lock_t;
Index: src/sys/arch/arm/include/types.h
diff -u src/sys/arch/arm/include/types.h:1.16 src/sys/arch/arm/include/types.h:1.17
--- src/sys/arch/arm/include/types.h:1.16 Sun Jan 20 18:09:05 2008
+++ src/sys/arch/arm/include/types.h Fri Dec 11 05:52:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.16 2008/01/20 18:09:05 joerg Exp $ */
+/* $NetBSD: types.h,v 1.17 2009/12/11 05:52:03 matt Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -46,21 +46,28 @@
/* NB: This should probably be if defined(_KERNEL) */
#if defined(_NETBSD_SOURCE)
-typedef unsigned long vm_offset_t;
-typedef unsigned long vm_size_t;
+typedef unsigned long vm_offset_t; /* depreciated */
+typedef unsigned long vm_size_t; /* depreciated */
-typedef vm_offset_t paddr_t;
-typedef vm_size_t psize_t;
-typedef vm_offset_t vaddr_t;
-typedef vm_size_t vsize_t;
+typedef unsigned long paddr_t;
+typedef unsigned long psize_t;
+typedef unsigned long vaddr_t;
+typedef unsigned long vsize_t;
+#define PRIxPADDR "lx"
+#define PRIxPSIZE "lx"
+#define PRIuPSIZE "lu"
+#define PRIxVADDR "lx"
+#define PRIxVSIZE "lx"
+#define PRIuVSIZE "lu"
#endif
+typedef int register_t;
+#define PRIxREGISTER "x"
+
typedef unsigned long pmc_evid_t;
#define PMC_INVALID_EVID (-1)
typedef unsigned long pmc_ctr_t;
-typedef int register_t;
-
/*
* This should have always been an 8-bit type, but since it's been exposed
* to user-space, we don't want ABI breakage there.
Index: src/sys/arch/hppa/include/types.h
diff -u src/sys/arch/hppa/include/types.h:1.16 src/sys/arch/hppa/include/types.h:1.17
--- src/sys/arch/hppa/include/types.h:1.16 Wed Oct 17 19:54:41 2007
+++ src/sys/arch/hppa/include/types.h Fri Dec 11 05:52:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.16 2007/10/17 19:54:41 garbled Exp $ */
+/* $NetBSD: types.h,v 1.17 2009/12/11 05:52:03 matt Exp $ */
/* $OpenBSD: types.h,v 1.6 2001/08/11 01:58:34 art Exp $ */
@@ -55,6 +55,12 @@
typedef unsigned long vsize_t;
typedef unsigned long paddr_t;
typedef unsigned long psize_t;
+#define PRIxVADDR "lx"
+#define PRIxVSIZE "lx"
+#define PRIuVSIZE "lu"
+#define PRIxPADDR "lx"
+#define PRIxPSIZE "lx"
+#define PRIuPSIZE "lu"
/* XXX DIE DIE DIE */
typedef unsigned long vm_offset_t;
typedef unsigned long vm_size_t;
@@ -73,6 +79,7 @@
#define __SIMPLELOCK_UNLOCKED { { 1, 1, 1, 1} }
typedef int register_t;
+#define PRIxREGISTER "x"
#define __MACHINE_STACK_GROWS_UP /* stack grows to higher addresses */
#define __HAVE_FUNCTION_DESCRIPTORS /* function ptrs may be descriptors */
Index: src/sys/arch/i386/include/types.h
diff -u src/sys/arch/i386/include/types.h:1.66 src/sys/arch/i386/include/types.h:1.67
--- src/sys/arch/i386/include/types.h:1.66 Sun Jun 28 09:24:09 2009
+++ src/sys/arch/i386/include/types.h Fri Dec 11 05:52:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.66 2009/06/28 09:24:09 ad Exp $ */
+/* $NetBSD: types.h,v 1.67 2009/12/11 05:52:03 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -52,17 +52,27 @@
#ifdef PAE
typedef unsigned long long paddr_t;
typedef unsigned long long psize_t;
+#define PRIxPADDR "llx"
+#define PRIxPSIZE "llx"
+#define PRIuPSIZE "llu"
#else
typedef unsigned long paddr_t;
typedef unsigned long psize_t;
+#define PRIxPADDR "lx"
+#define PRIxPSIZE "lx"
+#define PRIuPSIZE "lu"
#endif /* PAE */
typedef unsigned long vaddr_t;
typedef unsigned long vsize_t;
+#define PRIxVADDR "lx"
+#define PRIxVSIZE "lx"
+#define PRIuVSIZE "lu"
#endif
typedef int pmc_evid_t;
typedef __uint64_t pmc_ctr_t;
typedef int register_t;
+#define PRIxREGISTER "x"
typedef volatile unsigned char __cpu_simple_lock_t;
Index: src/sys/arch/ia64/include/types.h
diff -u src/sys/arch/ia64/include/types.h:1.4 src/sys/arch/ia64/include/types.h:1.5
--- src/sys/arch/ia64/include/types.h:1.4 Thu Mar 20 09:09:20 2008
+++ src/sys/arch/ia64/include/types.h Fri Dec 11 05:52:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.4 2008/03/20 09:09:20 kochi Exp $ */
+/* $NetBSD: types.h,v 1.5 2009/12/11 05:52:03 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -50,11 +50,18 @@
typedef unsigned long psize_t;
typedef unsigned long vaddr_t;
typedef unsigned long vsize_t;
+#define PRIxPADDR "lx"
+#define PRIxPSIZE "lx"
+#define PRIuPSIZE "lu"
+#define PRIxVADDR "lx"
+#define PRIxVSIZE "lx"
+#define PRIuVSIZE "lu"
#endif
typedef int pmc_evid_t;
typedef __uint64_t pmc_ctr_t;
typedef long int register_t;
+#define PRIxREGISTER "lx"
typedef __volatile int __cpu_simple_lock_t;
Index: src/sys/arch/m68k/include/types.h
diff -u src/sys/arch/m68k/include/types.h:1.27 src/sys/arch/m68k/include/types.h:1.28
--- src/sys/arch/m68k/include/types.h:1.27 Wed Oct 17 19:55:05 2007
+++ src/sys/arch/m68k/include/types.h Fri Dec 11 05:52:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.27 2007/10/17 19:55:05 garbled Exp $ */
+/* $NetBSD: types.h,v 1.28 2009/12/11 05:52:03 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -45,16 +45,23 @@
/* NB: This should probably be if defined(_KERNEL) */
#if defined(_NETBSD_SOURCE)
-typedef unsigned long vm_offset_t;
-typedef unsigned long vm_size_t;
+typedef unsigned long vm_offset_t; /* depreciated */
+typedef unsigned long vm_size_t; /* depreciated */
-typedef vm_offset_t paddr_t;
-typedef vm_size_t psize_t;
-typedef vm_offset_t vaddr_t;
-typedef vm_size_t vsize_t;
+typedef unsigned long paddr_t;
+typedef unsigned long psize_t;
+typedef unsigned long vaddr_t;
+typedef unsigned long vsize_t;
+#define PRIxPADDR "lx"
+#define PRIxPSIZE "lx"
+#define PRIuPSIZE "lu"
+#define PRIxVADDR "lx"
+#define PRIxVSIZE "lx"
+#define PRIuVSIZE "lu"
#endif
typedef int register_t;
+#define PRIxREGISTER "x"
typedef volatile unsigned char __cpu_simple_lock_t;
Index: src/sys/arch/powerpc/include/types.h
diff -u src/sys/arch/powerpc/include/types.h:1.33 src/sys/arch/powerpc/include/types.h:1.34
--- src/sys/arch/powerpc/include/types.h:1.33 Thu Jan 31 05:30:00 2008
+++ src/sys/arch/powerpc/include/types.h Fri Dec 11 05:52:03 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.33 2008/01/31 05:30:00 matt Exp $ */
+/* $NetBSD: types.h,v 1.34 2009/12/11 05:52:03 matt Exp $ */
/*-
* Copyright (C) 1995 Wolfgang Solfrank.
@@ -42,6 +42,12 @@
#if defined(_NETBSD_SOURCE)
typedef unsigned long paddr_t, vaddr_t;
typedef unsigned long psize_t, vsize_t;
+#define PRIxPADDR "lx"
+#define PRIxPSIZE "lx"
+#define PRIuPSIZE "lu"
+#define PRIxVADDR "lx"
+#define PRIxVSIZE "lx"
+#define PRIuVSIZE "lu"
#endif
/*
@@ -50,6 +56,9 @@
typedef unsigned long register_t;
typedef __uint64_t register64_t;
typedef __uint32_t register32_t;
+#define PRIxREGISTER "lx"
+#define PRIxREGISTER64 PRIx64
+#define PRIxREGISTER32 PRIx32
#if defined(_KERNEL)
typedef struct label_t {
Index: src/sys/arch/sh3/include/types.h
diff -u src/sys/arch/sh3/include/types.h:1.28 src/sys/arch/sh3/include/types.h:1.29
--- src/sys/arch/sh3/include/types.h:1.28 Wed Oct 21 21:12:02 2009
+++ src/sys/arch/sh3/include/types.h Fri Dec 11 05:52:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.28 2009/10/21 21:12:02 rmind Exp $ */
+/* $NetBSD: types.h,v 1.29 2009/12/11 05:52:04 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -53,9 +53,16 @@
typedef unsigned long psize_t;
typedef unsigned long vaddr_t;
typedef unsigned long vsize_t;
+#define PRIxPADDR "lx"
+#define PRIxPSIZE "lx"
+#define PRIuPSIZE "lu"
+#define PRIxVADDR "lx"
+#define PRIxVSIZE "lx"
+#define PRIuVSIZE "lu"
#endif
typedef int register_t;
+#define PRIxREGISTER "x"
typedef volatile unsigned char __cpu_simple_lock_t;
Index: src/sys/arch/sparc/include/types.h
diff -u src/sys/arch/sparc/include/types.h:1.50 src/sys/arch/sparc/include/types.h:1.51
--- src/sys/arch/sparc/include/types.h:1.50 Sun Jan 20 18:09:09 2008
+++ src/sys/arch/sparc/include/types.h Fri Dec 11 05:52:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.50 2008/01/20 18:09:09 joerg Exp $ */
+/* $NetBSD: types.h,v 1.51 2009/12/11 05:52:04 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -57,12 +57,16 @@
/* The following are unsigned to prevent annoying sign extended pointers. */
typedef unsigned long int register_t;
+#define PRIxREGISTER "lx"
typedef unsigned int register32_t;
+#define PRIxREGISTER32 "x"
#ifdef __arch64__
typedef unsigned long int register64_t;
+#define PRIxREGISTER64 "lx"
#else
/* LONGLONG */
typedef unsigned long long int register64_t;
+#define PRIxREGISTER64 "llx"
#endif
#if defined(_KERNEL)
@@ -78,17 +82,27 @@
#if defined(_NETBSD_SOURCE)
typedef unsigned long int vaddr_t;
typedef vaddr_t vsize_t;
+#define PRIxVADDR "lx"
+#define PRIxVSIZE "lx"
+#define PRIuVSIZE "lu"
#ifdef SUN4U
#ifdef __arch64__
typedef unsigned long int paddr_t;
+#define PRIxPADDR "lx"
+#define PRIuPSIZE "lu"
#else
/* LONGLONG */
typedef unsigned long long int paddr_t;
+#define PRIxPADDR "llx"
+#define PRIuPSIZE "llu"
#endif /* __arch64__ */
#else
typedef unsigned long int paddr_t;
+#define PRIxPADDR "lx"
+#define PRIuPSIZE "lu"
#endif /* SUN4U */
typedef paddr_t psize_t;
+#define PRIxPSIZE PRIxPADDR
#endif
typedef volatile unsigned char __cpu_simple_lock_t;
Index: src/sys/arch/usermode/include/types.h
diff -u src/sys/arch/usermode/include/types.h:1.5 src/sys/arch/usermode/include/types.h:1.6
--- src/sys/arch/usermode/include/types.h:1.5 Wed Oct 21 16:06:59 2009
+++ src/sys/arch/usermode/include/types.h Fri Dec 11 05:52:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.5 2009/10/21 16:06:59 snj Exp $ */
+/* $NetBSD: types.h,v 1.6 2009/12/11 05:52:04 matt Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -44,6 +44,13 @@
typedef unsigned long vaddr_t;
typedef unsigned long vsize_t;
typedef long int register_t;
+#define PRIxPADDR "lx"
+#define PRIxPSIZE "lx"
+#define PRIuPSIZE "lu"
+#define PRIxVADDR "lx"
+#define PRIxVSIZE "lx"
+#define PRIuVSIZE "lu"
+#define PRIxREGISTER "lx"
typedef volatile unsigned char __cpu_simple_lock_t;
#define __CPU_SIMPLE_LOCK_PAD
Index: src/sys/arch/vax/include/types.h
diff -u src/sys/arch/vax/include/types.h:1.39 src/sys/arch/vax/include/types.h:1.40
--- src/sys/arch/vax/include/types.h:1.39 Wed Feb 20 16:37:52 2008
+++ src/sys/arch/vax/include/types.h Fri Dec 11 05:52:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.39 2008/02/20 16:37:52 matt Exp $ */
+/* $NetBSD: types.h,v 1.40 2009/12/11 05:52:04 matt Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -50,9 +50,16 @@
typedef unsigned long psize_t;
typedef unsigned long vaddr_t;
typedef unsigned long vsize_t;
+#define PRIxPADDR "lx"
+#define PRIxPSIZE "lx"
+#define PRIuPSIZE "lu"
+#define PRIxVADDR "lx"
+#define PRIxVSIZE "lx"
+#define PRIuVSIZE "lu"
#endif
typedef int register_t;
+#define PRIxREGISTER "x"
/*
* BBCCI/BBSSI can operate on bytes so let's save some space.
