Module Name: src
Committed By: joerg
Date: Thu May 26 15:34:14 UTC 2011
Modified Files:
src/sys/arch/alpha/include: db_machdep.h
src/sys/arch/amd64/include: db_machdep.h
src/sys/arch/arm/include: db_machdep.h
src/sys/arch/hppa/include: db_machdep.h
src/sys/arch/i386/include: db_machdep.h
src/sys/arch/ia64/include: db_machdep.h
src/sys/arch/m68k/include: db_machdep.h
src/sys/arch/mips/include: db_machdep.h
src/sys/arch/powerpc/include: db_machdep.h
src/sys/arch/sh3/include: db_machdep.h
src/sys/arch/sparc/include: db_machdep.h
src/sys/arch/sparc64/include: db_machdep.h
src/sys/arch/vax/include: db_machdep.h
src/sys/ddb: db_examine.c db_interface.h db_lex.c
Log Message:
Introduce DDB_EXPR_FMT and replace the logic around DB_EXPR_T_IS_QUAD.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/alpha/include/db_machdep.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amd64/include/db_machdep.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/include/db_machdep.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hppa/include/db_machdep.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/i386/include/db_machdep.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/db_machdep.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/m68k/include/db_machdep.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/mips/include/db_machdep.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/include/db_machdep.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sh3/include/db_machdep.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sparc/include/db_machdep.h
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/sparc64/include/db_machdep.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/vax/include/db_machdep.h
cvs rdiff -u -r1.34 -r1.35 src/sys/ddb/db_examine.c
cvs rdiff -u -r1.26 -r1.27 src/sys/ddb/db_interface.h
cvs rdiff -u -r1.21 -r1.22 src/sys/ddb/db_lex.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/alpha/include/db_machdep.h
diff -u src/sys/arch/alpha/include/db_machdep.h:1.17 src/sys/arch/alpha/include/db_machdep.h:1.18
--- src/sys/arch/alpha/include/db_machdep.h:1.17 Wed Feb 21 22:59:37 2007
+++ src/sys/arch/alpha/include/db_machdep.h Thu May 26 15:34:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.17 2007/02/21 22:59:37 thorpej Exp $ */
+/* $NetBSD: db_machdep.h,v 1.18 2011/05/26 15:34:12 joerg Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
@@ -39,6 +39,7 @@
#include <machine/frame.h>
typedef vaddr_t db_addr_t; /* address - unsigned */
+#define DDB_EXPR_FMT "l" /* expression is long */
typedef long db_expr_t; /* expression - signed */
typedef struct trapframe db_regs_t;
Index: src/sys/arch/amd64/include/db_machdep.h
diff -u src/sys/arch/amd64/include/db_machdep.h:1.10 src/sys/arch/amd64/include/db_machdep.h:1.11
--- src/sys/arch/amd64/include/db_machdep.h:1.10 Sun Apr 10 20:36:49 2011
+++ src/sys/arch/amd64/include/db_machdep.h Thu May 26 15:34:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.10 2011/04/10 20:36:49 christos Exp $ */
+/* $NetBSD: db_machdep.h,v 1.11 2011/05/26 15:34:12 joerg Exp $ */
/*
* Mach Operating System
@@ -41,6 +41,7 @@
#include <machine/trap.h>
typedef vaddr_t db_addr_t; /* address - unsigned */
+#define DDB_EXPR_FMT "l" /* expression is long */
typedef long db_expr_t; /* expression - signed */
typedef struct trapframe db_regs_t;
Index: src/sys/arch/arm/include/db_machdep.h
diff -u src/sys/arch/arm/include/db_machdep.h:1.16 src/sys/arch/arm/include/db_machdep.h:1.17
--- src/sys/arch/arm/include/db_machdep.h:1.16 Sat Mar 14 14:45:55 2009
+++ src/sys/arch/arm/include/db_machdep.h Thu May 26 15:34:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.16 2009/03/14 14:45:55 dsl Exp $ */
+/* $NetBSD: db_machdep.h,v 1.17 2011/05/26 15:34:12 joerg Exp $ */
/*
* Copyright (c) 1996 Scott K Stevens
@@ -43,6 +43,7 @@
/* end of mangling */
typedef vaddr_t db_addr_t; /* address - unsigned */
+#define DDB_EXPR_FMT "l" /* expression is long */
typedef long db_expr_t; /* expression - signed */
typedef trapframe_t db_regs_t;
Index: src/sys/arch/hppa/include/db_machdep.h
diff -u src/sys/arch/hppa/include/db_machdep.h:1.10 src/sys/arch/hppa/include/db_machdep.h:1.11
--- src/sys/arch/hppa/include/db_machdep.h:1.10 Fri Jan 14 02:06:26 2011
+++ src/sys/arch/hppa/include/db_machdep.h Thu May 26 15:34:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.10 2011/01/14 02:06:26 rmind Exp $ */
+/* $NetBSD: db_machdep.h,v 1.11 2011/05/26 15:34:12 joerg Exp $ */
/* $OpenBSD: db_machdep.h,v 1.5 2001/02/16 19:20:13 mickey Exp $ */
@@ -39,6 +39,7 @@
/* types the generic ddb module needs */
typedef vaddr_t db_addr_t;
+#define DDB_EXPR_FMT "l" /* expression is long */
typedef long db_expr_t;
typedef struct trapframe db_regs_t;
Index: src/sys/arch/i386/include/db_machdep.h
diff -u src/sys/arch/i386/include/db_machdep.h:1.29 src/sys/arch/i386/include/db_machdep.h:1.30
--- src/sys/arch/i386/include/db_machdep.h:1.29 Mon Apr 11 04:22:30 2011
+++ src/sys/arch/i386/include/db_machdep.h Thu May 26 15:34:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.29 2011/04/11 04:22:30 mrg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.30 2011/05/26 15:34:13 joerg Exp $ */
/*
* Mach Operating System
@@ -41,6 +41,7 @@
#include <machine/trap.h>
typedef vaddr_t db_addr_t; /* address - unsigned */
+#define DDB_EXPR_FMT "l" /* expression is long */
typedef long db_expr_t; /* expression - signed */
typedef struct trapframe db_regs_t;
Index: src/sys/arch/ia64/include/db_machdep.h
diff -u src/sys/arch/ia64/include/db_machdep.h:1.2 src/sys/arch/ia64/include/db_machdep.h:1.3
--- src/sys/arch/ia64/include/db_machdep.h:1.2 Wed Aug 30 11:12:04 2006
+++ src/sys/arch/ia64/include/db_machdep.h Thu May 26 15:34:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.2 2006/08/30 11:12:04 cherry Exp $ */
+/* $NetBSD: db_machdep.h,v 1.3 2011/05/26 15:34:13 joerg Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
@@ -41,6 +41,7 @@
#include <machine/ia64_cpu.h>
typedef vaddr_t db_addr_t; /* address - unsigned */
+#define DDB_EXPR_FMT "l" /* expression is long */
typedef long db_expr_t; /* expression - signed */
typedef struct trapframe db_regs_t;
Index: src/sys/arch/m68k/include/db_machdep.h
diff -u src/sys/arch/m68k/include/db_machdep.h:1.29 src/sys/arch/m68k/include/db_machdep.h:1.30
--- src/sys/arch/m68k/include/db_machdep.h:1.29 Mon Apr 11 04:22:30 2011
+++ src/sys/arch/m68k/include/db_machdep.h Thu May 26 15:34:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.29 2011/04/11 04:22:30 mrg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.30 2011/05/26 15:34:13 joerg Exp $ */
/*
* Mach Operating System
@@ -46,6 +46,7 @@
#include <machine/trap.h>
typedef vaddr_t db_addr_t; /* address - unsigned */
+#define DDB_EXPR_FMT "l" /* expression is long */
typedef long db_expr_t; /* expression - signed */
typedef struct trapframe db_regs_t;
Index: src/sys/arch/mips/include/db_machdep.h
diff -u src/sys/arch/mips/include/db_machdep.h:1.26 src/sys/arch/mips/include/db_machdep.h:1.27
--- src/sys/arch/mips/include/db_machdep.h:1.26 Thu Apr 14 05:07:56 2011
+++ src/sys/arch/mips/include/db_machdep.h Thu May 26 15:34:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.26 2011/04/14 05:07:56 cliff Exp $ */
+/* $NetBSD: db_machdep.h,v 1.27 2011/05/26 15:34:13 joerg Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -42,6 +42,7 @@
typedef vaddr_t db_addr_t; /* address - unsigned */
+#define DDB_EXPR_FMT "l" /* expression is long */
typedef long db_expr_t; /* expression - signed */
typedef struct reg db_regs_t;
Index: src/sys/arch/powerpc/include/db_machdep.h
diff -u src/sys/arch/powerpc/include/db_machdep.h:1.22 src/sys/arch/powerpc/include/db_machdep.h:1.23
--- src/sys/arch/powerpc/include/db_machdep.h:1.22 Tue Jan 18 01:02:54 2011
+++ src/sys/arch/powerpc/include/db_machdep.h Thu May 26 15:34:13 2011
@@ -1,5 +1,5 @@
/* $OpenBSD: db_machdep.h,v 1.2 1997/03/21 00:48:48 niklas Exp $ */
-/* $NetBSD: db_machdep.h,v 1.22 2011/01/18 01:02:54 matt Exp $ */
+/* $NetBSD: db_machdep.h,v 1.23 2011/05/26 15:34:13 joerg Exp $ */
/*
* Mach Operating System
@@ -45,6 +45,7 @@
#define DB_ELFSIZE 32
typedef vaddr_t db_addr_t; /* address - unsigned */
+#define DDB_EXPR_FMT "l" /* expression is long */
typedef long db_expr_t; /* expression - signed */
struct powerpc_saved_state {
u_int32_t r[32]; /* data registers */
Index: src/sys/arch/sh3/include/db_machdep.h
diff -u src/sys/arch/sh3/include/db_machdep.h:1.15 src/sys/arch/sh3/include/db_machdep.h:1.16
--- src/sys/arch/sh3/include/db_machdep.h:1.15 Fri Jan 14 02:06:30 2011
+++ src/sys/arch/sh3/include/db_machdep.h Thu May 26 15:34:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.15 2011/01/14 02:06:30 rmind Exp $ */
+/* $NetBSD: db_machdep.h,v 1.16 2011/05/26 15:34:13 joerg Exp $ */
/*
* Mach Operating System
@@ -39,6 +39,7 @@
#include <sh3/pcb.h>
typedef vaddr_t db_addr_t; /* address - unsigned */
+#define DDB_EXPR_FMT "l" /* expression is long */
typedef long db_expr_t; /* expression - signed */
typedef struct trapframe db_regs_t;
Index: src/sys/arch/sparc/include/db_machdep.h
diff -u src/sys/arch/sparc/include/db_machdep.h:1.25 src/sys/arch/sparc/include/db_machdep.h:1.26
--- src/sys/arch/sparc/include/db_machdep.h:1.25 Mon Apr 11 04:22:31 2011
+++ src/sys/arch/sparc/include/db_machdep.h Thu May 26 15:34:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.25 2011/04/11 04:22:31 mrg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.26 2011/05/26 15:34:13 joerg Exp $ */
/*
* Mach Operating System
@@ -40,6 +40,7 @@
#include <machine/reg.h>
typedef vaddr_t db_addr_t; /* address - unsigned */
+#define DDB_EXPR_FMT "l" /* expression is long */
typedef long db_expr_t; /* expression - signed */
typedef struct {
Index: src/sys/arch/sparc64/include/db_machdep.h
diff -u src/sys/arch/sparc64/include/db_machdep.h:1.29 src/sys/arch/sparc64/include/db_machdep.h:1.30
--- src/sys/arch/sparc64/include/db_machdep.h:1.29 Wed Apr 13 03:22:49 2011
+++ src/sys/arch/sparc64/include/db_machdep.h Thu May 26 15:34:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.29 2011/04/13 03:22:49 mrg Exp $ */
+/* $NetBSD: db_machdep.h,v 1.30 2011/05/26 15:34:13 joerg Exp $ */
/*
* Mach Operating System
@@ -46,6 +46,7 @@
/* use 64-bit types explicitly for 32-bit kernels */
typedef vaddr_t db_addr_t; /* address - unsigned */
+#define DDB_EXPR_FMT "l" /* expression is int64_t (long) */
typedef int64_t db_expr_t; /* expression - signed */
struct trapstate {
Index: src/sys/arch/vax/include/db_machdep.h
diff -u src/sys/arch/vax/include/db_machdep.h:1.17 src/sys/arch/vax/include/db_machdep.h:1.18
--- src/sys/arch/vax/include/db_machdep.h:1.17 Sat Nov 6 11:46:03 2010
+++ src/sys/arch/vax/include/db_machdep.h Thu May 26 15:34:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.17 2010/11/06 11:46:03 uebayasi Exp $ */
+/* $NetBSD: db_machdep.h,v 1.18 2011/05/26 15:34:14 joerg Exp $ */
/*
* Mach Operating System
@@ -40,6 +40,7 @@
#include <machine/psl.h>
typedef vaddr_t db_addr_t; /* address - unsigned */
+#define DDB_EXPR_FMT "l" /* expression is long */
typedef long db_expr_t; /* expression - signed */
typedef struct trapframe db_regs_t;
Index: src/sys/ddb/db_examine.c
diff -u src/sys/ddb/db_examine.c:1.34 src/sys/ddb/db_examine.c:1.35
--- src/sys/ddb/db_examine.c:1.34 Sat Mar 7 22:02:17 2009
+++ src/sys/ddb/db_examine.c Thu May 26 15:34:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_examine.c,v 1.34 2009/03/07 22:02:17 ad Exp $ */
+/* $NetBSD: db_examine.c,v 1.35 2011/05/26 15:34:14 joerg Exp $ */
/*
* Mach Operating System
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_examine.c,v 1.34 2009/03/07 22:02:17 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_examine.c,v 1.35 2011/05/26 15:34:14 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -117,8 +117,7 @@
case 'x': /* unsigned hex */
value = db_get_value(addr, size, false);
addr += size;
- db_printf(DB_EXPR_T_IS_QUAD ? "%-*qx" : "%-*lx",
- width, value);
+ db_printf("%-*" DDB_EXPR_FMT "x", width, value);
break;
case 'm': /* hex dump */
/*
@@ -135,8 +134,8 @@
db_get_value(addr+bytes, 1,
false);
db_printf(
- DB_EXPR_T_IS_QUAD ? "%02qx":
- "%02lx", value);
+ "%02" DDB_EXPR_FMT "x",
+ value);
bytes++;
if (!(bytes % 4))
db_printf(" ");
@@ -165,20 +164,17 @@
case 'd': /* signed decimal */
value = db_get_value(addr, size, true);
addr += size;
- db_printf(DB_EXPR_T_IS_QUAD ? "%-*qd" : "%-*ld",
- width, value);
+ db_printf("%-*" DDB_EXPR_FMT "d", width, value);
break;
case 'u': /* unsigned decimal */
value = db_get_value(addr, size, false);
addr += size;
- db_printf(DB_EXPR_T_IS_QUAD ? "%-*qu" : "%-*lu",
- width, value);
+ db_printf("%-*" DDB_EXPR_FMT "u", width, value);
break;
case 'o': /* unsigned octal */
value = db_get_value(addr, size, false);
addr += size;
- db_printf(DB_EXPR_T_IS_QUAD ? "%-*qo" : "%-*lo",
- width, value);
+ db_printf("%-*" DDB_EXPR_FMT "o", width, value);
break;
case 'c': /* character */
value = db_get_value(addr, 1, false);
@@ -244,7 +240,7 @@
break;
}
case 'x':
- db_printf(DB_EXPR_T_IS_QUAD ? "%16qx" : "%8lx", addr);
+ db_printf("%16" DDB_EXPR_FMT "x", addr);
break;
case 'z':
{
@@ -255,13 +251,13 @@
break;
}
case 'd':
- db_printf(DB_EXPR_T_IS_QUAD ? "%11qd" : "%11ld", addr);
+ db_printf("%11" DDB_EXPR_FMT "d", addr);
break;
case 'u':
- db_printf(DB_EXPR_T_IS_QUAD ? "%11qu" : "%11lu", addr);
+ db_printf("%11" DDB_EXPR_FMT "u", addr);
break;
case 'o':
- db_printf(DB_EXPR_T_IS_QUAD ? "%15qo" : "%16lo", addr);
+ db_printf("%15" DDB_EXPR_FMT "o", addr);
break;
case 'c':
value = addr & 0xFF;
Index: src/sys/ddb/db_interface.h
diff -u src/sys/ddb/db_interface.h:1.26 src/sys/ddb/db_interface.h:1.27
--- src/sys/ddb/db_interface.h:1.26 Sun Apr 10 20:59:22 2011
+++ src/sys/ddb/db_interface.h Thu May 26 15:34:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.h,v 1.26 2011/04/10 20:59:22 christos Exp $ */
+/* $NetBSD: db_interface.h,v 1.27 2011/05/26 15:34:14 joerg Exp $ */
/*-
* Copyright (c) 1995 The NetBSD Foundation, Inc.
@@ -72,10 +72,4 @@
/* kern/subr_vmem.c */
void db_show_all_vmems(db_expr_t, bool, db_expr_t, const char *);
-/*
- * This is used in several places to determine which printf format
- * string is appropriate for displaying a variable of type db_expr_t.
- */
-#define DB_EXPR_T_IS_QUAD (/* CONSTCOND */ sizeof(db_expr_t) > sizeof(long))
-
#endif /* _DDB_DB_INTERFACE_H_ */
Index: src/sys/ddb/db_lex.c
diff -u src/sys/ddb/db_lex.c:1.21 src/sys/ddb/db_lex.c:1.22
--- src/sys/ddb/db_lex.c:1.21 Sat Mar 7 22:02:17 2009
+++ src/sys/ddb/db_lex.c Thu May 26 15:34:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_lex.c,v 1.21 2009/03/07 22:02:17 ad Exp $ */
+/* $NetBSD: db_lex.c,v 1.22 2011/05/26 15:34:14 joerg Exp $ */
/*
* Mach Operating System
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_lex.c,v 1.21 2009/03/07 22:02:17 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_lex.c,v 1.22 2011/05/26 15:34:14 joerg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -150,14 +150,11 @@
static char buf[25];
if (db_radix == 16)
- snprintf(buf, sizeof(buf), DB_EXPR_T_IS_QUAD ? "%#qx" : "%#lx",
- val);
+ snprintf(buf, sizeof(buf), "%" DDB_EXPR_FMT "x", val);
else if (db_radix == 8)
- snprintf(buf, sizeof(buf), DB_EXPR_T_IS_QUAD ? "%#qo" : "%#lo",
- val);
+ snprintf(buf, sizeof(buf), "%" DDB_EXPR_FMT "o", val);
else
- snprintf(buf, sizeof(buf), DB_EXPR_T_IS_QUAD ? "%qu" : "%lu",
- val);
+ snprintf(buf, sizeof(buf), "%" DDB_EXPR_FMT "u", val);
return (buf);
}
