Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Interface change: db_printsym() takes a third argument, ...
details: https://anonhg.NetBSD.org/src/rev/d8d263859a90
branches: trunk
changeset: 486563:d8d263859a90
user: jhawk <jhawk%NetBSD.org@localhost>
date: Thu May 25 19:57:30 2000 +0000
description:
Interface change: db_printsym() takes a third argument, pr, a function
pointer indicating how to print the symbol. This allows db_printsym()
to called in places where db_printf() is not an appropriate output
function.
While straightforward, apologies in advance if I've introduced any minor
syntax errors; I was unable to test compilation this on all the affected
platforms.
diffstat:
sys/arch/alpha/alpha/db_disasm.c | 6 +++---
sys/arch/alpha/alpha/db_trace.c | 6 +++---
sys/arch/arm26/arm26/db_disasm.c | 4 ++--
sys/arch/arm26/arm26/db_machdep.c | 5 +++--
sys/arch/arm26/arm26/db_trace.c | 6 +++---
sys/arch/arm32/arm32/db_disasm.c | 4 ++--
sys/arch/arm32/arm32/db_machdep.c | 5 +++--
sys/arch/arm32/arm32/db_trace.c | 4 ++--
sys/arch/i386/i386/db_disasm.c | 13 ++++++++-----
sys/arch/i386/i386/db_trace.c | 6 +++---
sys/arch/pc532/pc532/db_disasm.c | 19 ++++++++++++-------
sys/arch/pc532/pc532/db_trace.c | 6 +++---
sys/arch/sh3/sh3/db_disasm.c | 13 ++++++++-----
sys/arch/sh3/sh3/db_trace.c | 6 +++---
sys/arch/sparc/sparc/db_disasm.c | 8 ++++----
sys/arch/sparc/sparc/db_trace.c | 4 ++--
sys/arch/sparc64/sparc64/db_disasm.c | 18 +++++++++---------
sys/arch/sparc64/sparc64/db_interface.c | 6 +++---
sys/arch/sparc64/sparc64/db_trace.c | 8 ++++----
sys/ddb/db_break.c | 4 ++--
sys/ddb/db_examine.c | 8 ++++----
sys/ddb/db_sym.c | 13 +++++++------
sys/ddb/db_sym.h | 4 ++--
sys/ddb/db_write_cmd.c | 4 ++--
sys/ddb/db_xxx.c | 4 ++--
25 files changed, 99 insertions(+), 85 deletions(-)
diffs (truncated from 689 to 300 lines):
diff -r 92c4c6050b96 -r d8d263859a90 sys/arch/alpha/alpha/db_disasm.c
--- a/sys/arch/alpha/alpha/db_disasm.c Thu May 25 19:36:20 2000 +0000
+++ b/sys/arch/alpha/alpha/db_disasm.c Thu May 25 19:57:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.7 2000/03/20 02:54:45 thorpej Exp $ */
+/* $NetBSD: db_disasm.c,v 1.8 2000/05/25 19:57:30 jhawk Exp $ */
/*
* Mach Operating System
@@ -48,7 +48,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.7 2000/03/20 02:54:45 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.8 2000/05/25 19:57:30 jhawk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1080,7 +1080,7 @@
register_name(i.branch_format.ra));
branch_displacement:
db_printsym(iadr + sizeof(alpha_instruction) +
- (signed_immediate << 2), DB_STGY_PROC);
+ (signed_immediate << 2), DB_STGY_PROC, db_printf);
break;
default:
/*
diff -r 92c4c6050b96 -r d8d263859a90 sys/arch/alpha/alpha/db_trace.c
--- a/sys/arch/alpha/alpha/db_trace.c Thu May 25 19:36:20 2000 +0000
+++ b/sys/arch/alpha/alpha/db_trace.c Thu May 25 19:57:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.4 1999/07/12 07:37:14 ross Exp $ */
+/* $NetBSD: db_trace.c,v 1.5 2000/05/25 19:57:30 jhawk Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.4 1999/07/12 07:37:14 ross Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.5 2000/05/25 19:57:30 jhawk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -208,7 +208,7 @@
* debugger (for serious debugging).
*/
db_printf("%s() at ", symname);
- db_printsym(callpc, DB_STGY_PROC);
+ db_printsym(callpc, DB_STGY_PROC, db_printf);
db_printf("\n");
/*
diff -r 92c4c6050b96 -r d8d263859a90 sys/arch/arm26/arm26/db_disasm.c
--- a/sys/arch/arm26/arm26/db_disasm.c Thu May 25 19:36:20 2000 +0000
+++ b/sys/arch/arm26/arm26/db_disasm.c Thu May 25 19:57:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.1 2000/05/09 21:55:55 bjh21 Exp $ */
+/* $NetBSD: db_disasm.c,v 1.2 2000/05/25 19:57:32 jhawk Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe.
@@ -62,7 +62,7 @@
db_disasm_printaddr(u_int address)
{
- db_printsym((db_addr_t)address, DB_STGY_ANY);
+ db_printsym((db_addr_t)address, DB_STGY_ANY, db_printf);
}
vm_offset_t
diff -r 92c4c6050b96 -r d8d263859a90 sys/arch/arm26/arm26/db_machdep.c
--- a/sys/arch/arm26/arm26/db_machdep.c Thu May 25 19:36:20 2000 +0000
+++ b/sys/arch/arm26/arm26/db_machdep.c Thu May 25 19:57:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.1 2000/05/09 21:55:55 bjh21 Exp $ */
+/* $NetBSD: db_machdep.c,v 1.2 2000/05/25 19:57:32 jhawk Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@@ -173,7 +173,8 @@
name = "?";
db_printf("%s(", name);
- db_printsym((u_int)ptr->ih_func, DB_STGY_PROC);
+ db_printsym((u_int)ptr->ih_func, DB_STGY_PROC,
+ db_printf);
db_printf(") %08x\n", (u_int)ptr->ih_arg);
ptr = ptr->ih_next;
}
diff -r 92c4c6050b96 -r d8d263859a90 sys/arch/arm26/arm26/db_trace.c
--- a/sys/arch/arm26/arm26/db_trace.c Thu May 25 19:36:20 2000 +0000
+++ b/sys/arch/arm26/arm26/db_trace.c Thu May 25 19:57:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.2 2000/05/13 14:43:11 bjh21 Exp $ */
+/* $NetBSD: db_trace.c,v 1.3 2000/05/25 19:57:32 jhawk Exp $ */
/*
* Copyright (c) 1996 Scott K. Stevens
@@ -140,9 +140,9 @@
db_printf("%s", name);
db_printf("(scp=0x%x(", frame[FR_SCP]);
- db_printsym(scp, DB_STGY_PROC);
+ db_printsym(scp, DB_STGY_PROC, db_printf);
db_printf("), rlv=0x%x(", frame[FR_RLV]);
- db_printsym(frame[FR_RLV] & R15_PC, DB_STGY_PROC);
+ db_printsym(frame[FR_RLV] & R15_PC, DB_STGY_PROC, db_printf);
db_printf("),\n\trsp=0x%x", frame[FR_RSP]);
db_printf(", rfp=0x%x", frame[FR_RFP]);
diff -r 92c4c6050b96 -r d8d263859a90 sys/arch/arm32/arm32/db_disasm.c
--- a/sys/arch/arm32/arm32/db_disasm.c Thu May 25 19:36:20 2000 +0000
+++ b/sys/arch/arm32/arm32/db_disasm.c Thu May 25 19:57:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.12 1998/04/01 23:04:16 mark Exp $ */
+/* $NetBSD: db_disasm.c,v 1.13 2000/05/25 19:57:32 jhawk Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe.
@@ -55,7 +55,7 @@
db_disasm_printaddr(address)
u_int address;
{
- db_printsym((db_addr_t)address, DB_STGY_ANY);
+ db_printsym((db_addr_t)address, DB_STGY_ANY, db_printf);
}
vm_offset_t
diff -r 92c4c6050b96 -r d8d263859a90 sys/arch/arm32/arm32/db_machdep.c
--- a/sys/arch/arm32/arm32/db_machdep.c Thu May 25 19:36:20 2000 +0000
+++ b/sys/arch/arm32/arm32/db_machdep.c Thu May 25 19:57:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.c,v 1.14 1999/10/05 12:34:32 tron Exp $ */
+/* $NetBSD: db_machdep.c,v 1.15 2000/05/25 19:57:32 jhawk Exp $ */
/*
* Copyright (c) 1996 Mark Brinicombe
@@ -178,7 +178,8 @@
name = "?";
db_printf("%s(", name);
- db_printsym((u_int)ptr->ih_func, DB_STGY_PROC);
+ db_printsym((u_int)ptr->ih_func, DB_STGY_PROC,
+ db_printf);
db_printf(") %08x\n", (u_int)ptr->ih_arg);
ptr = ptr->ih_next;
}
diff -r 92c4c6050b96 -r d8d263859a90 sys/arch/arm32/arm32/db_trace.c
--- a/sys/arch/arm32/arm32/db_trace.c Thu May 25 19:36:20 2000 +0000
+++ b/sys/arch/arm32/arm32/db_trace.c Thu May 25 19:57:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.11 1999/04/12 20:38:18 pk Exp $ */
+/* $NetBSD: db_trace.c,v 1.12 2000/05/25 19:57:32 jhawk Exp $ */
/*
* Copyright (c) 1996 Scott K. Stevens
@@ -115,7 +115,7 @@
name = "?";
db_printf("%s(", name);
- db_printsym(pc, DB_STGY_PROC);
+ db_printsym(pc, DB_STGY_PROC, db_printf);
db_printf(")");
db_printf("\n");
diff -r 92c4c6050b96 -r d8d263859a90 sys/arch/i386/i386/db_disasm.c
--- a/sys/arch/i386/i386/db_disasm.c Thu May 25 19:36:20 2000 +0000
+++ b/sys/arch/i386/i386/db_disasm.c Thu May 25 19:57:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.17 2000/03/28 19:15:40 thorpej Exp $ */
+/* $NetBSD: db_disasm.c,v 1.18 2000/05/25 19:57:33 jhawk Exp $ */
/*
* Mach Operating System
@@ -970,7 +970,7 @@
if (seg)
db_printf("%s:", seg);
- db_printsym((db_addr_t)addrp->disp, DB_STGY_ANY);
+ db_printsym((db_addr_t)addrp->disp, DB_STGY_ANY, db_printf);
if (addrp->base != 0 || addrp->index != 0) {
db_printf("(");
if (addrp->base)
@@ -1323,15 +1323,18 @@
if (seg)
db_printf("%s:%#r",seg, displ);
else
- db_printsym((db_addr_t)displ, DB_STGY_ANY);
+ db_printsym((db_addr_t)displ, DB_STGY_ANY,
+ db_printf);
break;
case Db:
get_value_inc(displ, loc, 1, TRUE);
- db_printsym((db_addr_t)(displ + loc), DB_STGY_XTRN);
+ db_printsym((db_addr_t)(displ + loc), DB_STGY_XTRN,
+ db_printf);
break;
case Dl:
get_value_inc(displ, loc, 4, TRUE);
- db_printsym((db_addr_t)(displ + loc), DB_STGY_XTRN);
+ db_printsym((db_addr_t)(displ + loc), DB_STGY_XTRN,
+ db_printf);
break;
case o1:
db_printf("$1");
diff -r 92c4c6050b96 -r d8d263859a90 sys/arch/i386/i386/db_trace.c
--- a/sys/arch/i386/i386/db_trace.c Thu May 25 19:36:20 2000 +0000
+++ b/sys/arch/i386/i386/db_trace.c Thu May 25 19:57:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.25 1999/06/07 07:00:07 thorpej Exp $ */
+/* $NetBSD: db_trace.c,v 1.26 2000/05/25 19:57:33 jhawk Exp $ */
/*
* Mach Operating System
@@ -330,7 +330,7 @@
db_printf(",");
}
db_printf(") at ");
- db_printsym(callpc, DB_STGY_PROC);
+ db_printsym(callpc, DB_STGY_PROC, db_printf);
db_printf("\n");
if (lastframe == 0 && offset == 0 && !have_addr) {
@@ -370,7 +370,7 @@
}
if (count && is_trap != NONE) {
- db_printsym(callpc, DB_STGY_XTRN);
+ db_printsym(callpc, DB_STGY_XTRN, db_printf);
db_printf(":\n");
}
}
diff -r 92c4c6050b96 -r d8d263859a90 sys/arch/pc532/pc532/db_disasm.c
--- a/sys/arch/pc532/pc532/db_disasm.c Thu May 25 19:36:20 2000 +0000
+++ b/sys/arch/pc532/pc532/db_disasm.c Thu May 25 19:57:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.4 1997/03/20 12:00:37 matthias Exp $ */
+/* $NetBSD: db_disasm.c,v 1.5 2000/05/25 19:57:33 jhawk Exp $ */
/*
* Mach Operating System
@@ -997,20 +997,24 @@
break;
case AMODE_MREL:
- db_printsym((db_addr_t) operand->o_disp1, DB_STGY_ANY);
+ db_printsym((db_addr_t) operand->o_disp1, DB_STGY_ANY,
+ db_printf);
db_printf("(");
- db_printsym((db_addr_t) operand->o_disp0, DB_STGY_ANY);
+ db_printsym((db_addr_t) operand->o_disp0, DB_STGY_ANY,
+ db_printf);
db_printf("(%s))",regTable[operand->o_reg0].name);
break;
case AMODE_QUICK:
case AMODE_IMM:
- db_printsym((db_addr_t) operand->o_disp0, DB_STGY_ANY);
+ db_printsym((db_addr_t) operand->o_disp0, DB_STGY_ANY,
+ db_printf);
break;
case AMODE_ABS:
db_printf("@");
- db_printsym((db_addr_t) operand->o_disp0, DB_STGY_ANY);
+ db_printsym((db_addr_t) operand->o_disp0, DB_STGY_ANY,
+ db_printf);
break;
case AMODE_EXT:
@@ -1025,7 +1029,8 @@
case AMODE_RREL:
case AMODE_MSPC:
- db_printsym((db_addr_t) operand->o_disp0, DB_STGY_XTRN);
+ db_printsym((db_addr_t) operand->o_disp0, DB_STGY_XTRN,
+ db_printf);
db_printf("(%s)",regTable[operand->o_reg0].name);
break;
@@ -1156,7 +1161,7 @@
}
db_printsym((db_addr_t)
insn->i_opr[i].o_disp0 + value,
- DB_STGY_XTRN);
+ DB_STGY_XTRN, db_printf);
j++;
}
}
diff -r 92c4c6050b96 -r d8d263859a90 sys/arch/pc532/pc532/db_trace.c
--- a/sys/arch/pc532/pc532/db_trace.c Thu May 25 19:36:20 2000 +0000
+++ b/sys/arch/pc532/pc532/db_trace.c Thu May 25 19:57:30 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.6 1998/09/02 19:17:14 matthias Exp $ */
+/* $NetBSD: db_trace.c,v 1.7 2000/05/25 19:57:34 jhawk Exp $ */
/*
* Mach Operating System
Home |
Main Index |
Thread Index |
Old Index