I'm currently working on a kernel subsystem to dynamically instrument
kernel functions. For that I'm heavily using ddb(4) code.
Now I would like to prevent ddb(4) functions to be instrumented or
depend on instrumented functions. So I'm slowly making an audit to
reduce the amount of external functions used by ddb(4). In the end
I'd like to blacklist all functions whose name starts with "db_".
Since kdb_trap() is part of these functions I'd like to rename it.
ok?
Index: alpha/include/db_machdep.h
===================================================================
RCS file: /cvs/src/sys/arch/alpha/include/db_machdep.h,v
retrieving revision 1.23
diff -u -p -r1.23 db_machdep.h
--- alpha/include/db_machdep.h 16 Mar 2014 20:31:45 -0000 1.23
+++ alpha/include/db_machdep.h 26 Feb 2016 15:35:17 -0000
@@ -83,7 +83,7 @@ u_long db_register_value(db_regs_t *, in
int db_valid_breakpoint(db_addr_t);
int ddb_trap(unsigned long, unsigned long, unsigned long,
unsigned long, struct trapframe *);
-int kdb_trap(int, int, db_regs_t *);
+int db_ktrap(int, int, db_regs_t *);
db_addr_t next_instr_address(db_addr_t, int);
#if 1
Index: amd64/amd64/db_interface.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/db_interface.c,v
retrieving revision 1.23
diff -u -p -r1.23 db_interface.c
--- amd64/amd64/db_interface.c 18 May 2015 19:59:27 -0000 1.23
+++ amd64/amd64/db_interface.c 26 Feb 2016 15:35:17 -0000
@@ -80,7 +80,7 @@ long db_switch_to_cpu;
int db_active;
db_regs_t ddb_regs;
-void kdbprinttrap(int, int);
+void db_printtrap(int, int);
#ifdef MULTIPROCESSOR
void db_cpuinfo_cmd(db_expr_t, int, db_expr_t, char *);
void db_startproc_cmd(db_expr_t, int, db_expr_t, char *);
@@ -92,7 +92,7 @@ void db_ddbproc_cmd(db_expr_t, int, db_e
* Print trap reason.
*/
void
-kdbprinttrap(int type, int code)
+db_printtrap(int type, int code)
{
db_printf("kernel: ");
if (type >= trap_types || type < 0)
@@ -103,10 +103,10 @@ kdbprinttrap(int type, int code)
}
/*
- * kdb_trap - field a TRACE or BPT trap
+ * db_trap - field a TRACE or BPT trap
*/
int
-kdb_trap(int type, int code, db_regs_t *regs)
+db_ktrap(int type, int code, db_regs_t *regs)
{
int s;
@@ -124,7 +124,7 @@ kdb_trap(int type, int code, db_regs_t *
if (!db_panic)
return (0);
- kdbprinttrap(type, code);
+ db_printtrap(type, code);
if (db_recover != 0) {
db_error("Faulted in DDB; continuing...\n");
/*NOTREACHED*/
Index: amd64/amd64/trap.c
===================================================================
RCS file: /cvs/src/sys/arch/amd64/amd64/trap.c,v
retrieving revision 1.48
diff -u -p -r1.48 trap.c
--- amd64/amd64/trap.c 1 Sep 2015 08:11:02 -0000 1.48
+++ amd64/amd64/trap.c 26 Feb 2016 15:35:17 -0000
@@ -195,7 +195,7 @@ trap(struct trapframe *frame)
}
#endif
#ifdef DDB
- if (kdb_trap(type, 0, frame))
+ if (db_ktrap(type, 0, frame))
return;
#endif
if (frame->tf_trapno < trap_types)
@@ -433,7 +433,7 @@ faultcommon:
return;
#endif
#ifdef DDB
- if (kdb_trap(type, 0, frame))
+ if (db_ktrap(type, 0, frame))
return;
#endif
#endif /* KGDB || DDB */
Index: amd64/include/db_machdep.h
===================================================================
RCS file: /cvs/src/sys/arch/amd64/include/db_machdep.h,v
retrieving revision 1.12
diff -u -p -r1.12 db_machdep.h
--- amd64/include/db_machdep.h 16 Mar 2014 20:31:45 -0000 1.12
+++ amd64/include/db_machdep.h 26 Feb 2016 15:35:17 -0000
@@ -85,7 +85,7 @@ typedef long kgdb_reg_t;
/* macro for checking if a thread has used floating-point */
-int kdb_trap(int, int, db_regs_t *);
+int db_ktrap(int, int, db_regs_t *);
void db_machine_init(void);
int db_enter_ddb(void);
Index: arm/arm/db_interface.c
===================================================================
RCS file: /cvs/src/sys/arch/arm/arm/db_interface.c,v
retrieving revision 1.9
diff -u -p -r1.9 db_interface.c
--- arm/arm/db_interface.c 16 Nov 2014 12:30:56 -0000 1.9
+++ arm/arm/db_interface.c 26 Feb 2016 15:35:18 -0000
@@ -123,10 +123,10 @@ db_access_irq_sp(struct db_variable *vp,
#ifdef DDB
/*
- * kdb_trap - field a TRACE or BPT trap
+ * db_ktrap - field a TRACE or BPT trap
*/
int
-kdb_trap(int type, db_regs_t *regs)
+db_ktrap(int type, db_regs_t *regs)
{
int s;
@@ -359,10 +359,10 @@ db_trapper(u_int addr, u_int inst, trapf
if (fault_code == 0) {
if ((inst & ~INSN_COND_MASK) == (BKPT_INST & ~INSN_COND_MASK)) {
- kdb_trap(T_BREAKPOINT, frame);
+ db_ktrap(T_BREAKPOINT, frame);
frame->tf_pc += INSN_SIZE;
} else
- kdb_trap(-1, frame);
+ db_ktrap(-1, frame);
} else
return (1);
return (0);
Index: arm/arm/fault.c
===================================================================
RCS file: /cvs/src/sys/arch/arm/arm/fault.c,v
retrieving revision 1.19
diff -u -p -r1.19 fault.c
--- arm/arm/fault.c 31 Jan 2016 00:14:50 -0000 1.19
+++ arm/arm/fault.c 26 Feb 2016 15:35:18 -0000
@@ -100,7 +100,7 @@
#include <sys/kgdb.h>
#endif
#if !defined(DDB)
-#define kdb_trap kgdb_trap
+#define db_ktrap kgdb_trap
#endif
#endif
@@ -496,7 +496,7 @@ dab_fatal(trapframe_t *tf, u_int fsr, u_
printf(", pc =%08lx\n\n", tf->tf_pc);
#if defined(DDB) || defined(KGDB)
- kdb_trap(T_FAULT, tf);
+ db_ktrap(T_FAULT, tf);
#endif
panic("Fatal abort");
/*NOTREACHED*/
Index: arm/include/db_machdep.h
===================================================================
RCS file: /cvs/src/sys/arch/arm/include/db_machdep.h,v
retrieving revision 1.9
diff -u -p -r1.9 db_machdep.h
--- arm/include/db_machdep.h 16 Mar 2014 20:31:46 -0000 1.9
+++ arm/include/db_machdep.h 26 Feb 2016 15:35:18 -0000
@@ -95,7 +95,7 @@ extern db_regs_t ddb_regs; /* register
#define SOFTWARE_SSTEP
db_addr_t db_branch_taken(u_int inst, db_addr_t pc, db_regs_t *regs);
-int kdb_trap (int, db_regs_t *);
+int db_ktrap (int, db_regs_t *);
void db_machine_init (void);
#define branch_taken(ins, pc, fun, regs) \
Index: hppa/hppa/db_interface.c
===================================================================
RCS file: /cvs/src/sys/arch/hppa/hppa/db_interface.c,v
retrieving revision 1.35
diff -u -p -r1.35 db_interface.c
--- hppa/hppa/db_interface.c 13 Jul 2014 12:11:01 -0000 1.35
+++ hppa/hppa/db_interface.c 26 Feb 2016 15:35:18 -0000
@@ -179,10 +179,10 @@ kdbprinttrap(type, code)
}
/*
- * kdb_trap - field a BPT trap
+ * db_ktrap - field a BPT trap
*/
int
-kdb_trap(type, code, regs)
+db_ktrap(type, code, regs)
int type, code;
db_regs_t *regs;
{
Index: hppa/hppa/trap.c
===================================================================
RCS file: /cvs/src/sys/arch/hppa/hppa/trap.c,v
retrieving revision 1.138
diff -u -p -r1.138 trap.c
--- hppa/hppa/trap.c 16 Nov 2014 12:30:57 -0000 1.138
+++ hppa/hppa/trap.c 26 Feb 2016 15:35:18 -0000
@@ -245,7 +245,7 @@ trap(int type, struct trapframe *frame)
case T_DBREAK:
dead_end:
#ifdef DDB
- if (kdb_trap(type, va, frame)) {
+ if (db_ktrap(type, va, frame)) {
if (type == T_IBREAK) {
/* skip break instruction */
frame->tf_iioq_head = frame->tf_iioq_tail;
@@ -620,7 +620,7 @@ datalign_user:
/* FALLTHROUGH to unimplemented */
default:
#ifdef TRAPDEBUG
- if (kdb_trap(type, va, frame))
+ if (db_ktrap(type, va, frame))
return;
#endif
panic("trap: unimplemented \'%s\' (%d)", tts, trapnum);
Index: hppa/include/db_machdep.h
===================================================================
RCS file: /cvs/src/sys/arch/hppa/include/db_machdep.h,v
retrieving revision 1.18
diff -u -p -r1.18 db_machdep.h
--- hppa/include/db_machdep.h 16 Mar 2014 20:31:46 -0000 1.18
+++ hppa/include/db_machdep.h 26 Feb 2016 15:35:18 -0000
@@ -89,6 +89,6 @@ branch_taken1(int ins, db_addr_t pc, db_
#endif
int db_valid_breakpoint(db_addr_t);
-int kdb_trap(int, int, db_regs_t *);
+int db_ktrap(int, int, db_regs_t *);
#endif /* _MACHINE_DB_MACHDEP_H_ */
Index: hppa64/hppa64/db_interface.c
===================================================================
RCS file: /cvs/src/sys/arch/hppa64/hppa64/db_interface.c,v
retrieving revision 1.4
diff -u -p -r1.4 db_interface.c
--- hppa64/hppa64/db_interface.c 13 Jul 2014 12:11:01 -0000 1.4
+++ hppa64/hppa64/db_interface.c 26 Feb 2016 15:35:18 -0000
@@ -156,10 +156,10 @@ kdbprinttrap(int type, int code)
}
/*
- * kdb_trap - field a BPT trap
+ * db_ktrap - field a BPT trap
*/
int
-kdb_trap(int type, int code, db_regs_t *regs)
+db_ktrap(int type, int code, db_regs_t *regs)
{
extern label_t *db_recover;
int s;
Index: hppa64/hppa64/trap.c
===================================================================
RCS file: /cvs/src/sys/arch/hppa64/hppa64/trap.c,v
retrieving revision 1.41
diff -u -p -r1.41 trap.c
--- hppa64/hppa64/trap.c 16 Nov 2014 12:30:57 -0000 1.41
+++ hppa64/hppa64/trap.c 26 Feb 2016 15:35:18 -0000
@@ -240,7 +240,7 @@ trap(int type, struct trapframe *frame)
case T_DBREAK:
dead_end:
#ifdef DDB
- if (kdb_trap (type, va, frame)) {
+ if (db_ktrap (type, va, frame)) {
if (type == T_IBREAK) {
/* skip break instruction */
frame->tf_iioq[0] = frame->tf_iioq[1];
@@ -505,7 +505,7 @@ trap(int type, struct trapframe *frame)
/* FALLTHROUGH to unimplemented */
default:
#ifdef TRAPDEBUG
- if (kdb_trap(type, va, frame))
+ if (db_ktrap(type, va, frame))
return;
#endif
panic("trap: unimplemented \'%s\' (%d)", tts, trapnum);
Index: hppa64/include/db_machdep.h
===================================================================
RCS file: /cvs/src/sys/arch/hppa64/include/db_machdep.h,v
retrieving revision 1.4
diff -u -p -r1.4 db_machdep.h
--- hppa64/include/db_machdep.h 16 Mar 2014 20:31:46 -0000 1.4
+++ hppa64/include/db_machdep.h 26 Feb 2016 15:35:18 -0000
@@ -87,6 +87,6 @@ branch_taken1(int ins, db_addr_t pc, db_
#endif
int db_valid_breakpoint(db_addr_t);
-int kdb_trap(int, int, db_regs_t *);
+int db_ktrap(int, int, db_regs_t *);
#endif /* _MACHINE_DB_MACHDEP_H_ */
Index: i386/i386/db_interface.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/i386/db_interface.c,v
retrieving revision 1.31
diff -u -p -r1.31 db_interface.c
--- i386/i386/db_interface.c 14 Sep 2014 14:17:23 -0000 1.31
+++ i386/i386/db_interface.c 26 Feb 2016 15:35:18 -0000
@@ -98,10 +98,10 @@ kdbprinttrap(int type, int code)
}
/*
- * kdb_trap - field a TRACE or BPT trap
+ * db_ktrap - field a TRACE or BPT trap
*/
int
-kdb_trap(int type, int code, db_regs_t *regs)
+db_ktrap(int type, int code, db_regs_t *regs)
{
int s;
Index: i386/i386/trap.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/i386/trap.c,v
retrieving revision 1.123
diff -u -p -r1.123 trap.c
--- i386/i386/trap.c 28 Jun 2015 01:11:27 -0000 1.123
+++ i386/i386/trap.c 26 Feb 2016 15:35:18 -0000
@@ -186,7 +186,7 @@ trap(struct trapframe *frame)
#endif
#ifdef DDB
- if (kdb_trap(type, 0, frame))
+ if (db_ktrap(type, 0, frame))
return;
#endif
if (frame->tf_trapno < trap_types)
@@ -498,7 +498,7 @@ trap(struct trapframe *frame)
return;
#endif
#ifdef DDB
- if (kdb_trap(type, 0, frame))
+ if (db_ktrap(type, 0, frame))
return;
#endif
#endif /* DDB || KGDB */
Index: i386/include/db_machdep.h
===================================================================
RCS file: /cvs/src/sys/arch/i386/include/db_machdep.h,v
retrieving revision 1.23
diff -u -p -r1.23 db_machdep.h
--- i386/include/db_machdep.h 16 Mar 2014 20:31:46 -0000 1.23
+++ i386/include/db_machdep.h 26 Feb 2016 15:35:18 -0000
@@ -84,7 +84,7 @@ typedef long kgdb_reg_t;
/* macro for checking if a thread has used floating-point */
-int kdb_trap(int, int, db_regs_t *);
+int db_ktrap(int, int, db_regs_t *);
void db_machine_init(void);
int db_enter_ddb(void);
Index: mips64/mips64/db_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/mips64/mips64/db_machdep.c,v
retrieving revision 1.43
diff -u -p -r1.43 db_machdep.c
--- mips64/mips64/db_machdep.c 8 Feb 2015 00:30:20 -0000 1.43
+++ mips64/mips64/db_machdep.c 26 Feb 2016 15:35:18 -0000
@@ -62,7 +62,7 @@ void kdbpoke(vaddr_t, uint32_t);
void kdbpoked(vaddr_t, uint64_t);
void kdbpokew(vaddr_t, uint16_t);
void kdbpokeb(vaddr_t, uint8_t);
-int kdb_trap(int, struct trap_frame *);
+int db_ktrap(int, struct trap_frame *);
void db_print_tlb(uint, uint64_t);
void db_trap_trace_cmd(db_expr_t, int, db_expr_t, char *);
@@ -130,7 +130,7 @@ struct db_variable *db_eregs = db_regs +
extern label_t *db_recover;
int
-kdb_trap(int type, struct trap_frame *fp)
+db_ktrap(int type, struct trap_frame *fp)
{
switch(type) {
case T_BREAK: /* breakpoint */
Index: mips64/mips64/trap.c
===================================================================
RCS file: /cvs/src/sys/arch/mips64/mips64/trap.c,v
retrieving revision 1.113
diff -u -p -r1.113 trap.c
--- mips64/mips64/trap.c 1 Feb 2016 16:15:18 -0000 1.113
+++ mips64/mips64/trap.c 26 Feb 2016 15:35:18 -0000
@@ -127,7 +127,7 @@ uint64_t kdbpeekd(vaddr_t);
#endif /* DDB || DEBUG */
#if defined(DDB)
-extern int kdb_trap(int, db_regs_t *);
+extern int db_ktrap(int, db_regs_t *);
#endif
void ast(void);
@@ -537,7 +537,7 @@ fault_common_no_miss:
case T_BREAK:
#ifdef DDB
- kdb_trap(type, trapframe);
+ db_ktrap(type, trapframe);
#endif
/* Reenable interrupts if necessary */
if (trapframe->sr & SR_INT_ENAB) {
@@ -788,7 +788,7 @@ fault_common_no_miss:
(void *)trapframe->badvaddr);
#ifdef DDB
stacktrace(!USERMODE(trapframe->sr) ? trapframe :
p->p_md.md_regs);
- kdb_trap(type, trapframe);
+ db_ktrap(type, trapframe);
#endif
panic("trap");
}
Index: sgi/sgi/ip27_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/sgi/ip27_machdep.c,v
retrieving revision 1.71
diff -u -p -r1.71 ip27_machdep.c
--- sgi/sgi/ip27_machdep.c 2 Jan 2016 05:49:36 -0000 1.71
+++ sgi/sgi/ip27_machdep.c 26 Feb 2016 15:35:18 -0000
@@ -1019,7 +1019,7 @@ ip27_nmi(void *arg)
vaddr_t regs_offs;
register_t *regs, epc;
struct trap_frame nmi_frame;
- extern int kdb_trap(int, struct trap_frame *);
+ extern int db_ktrap(int, struct trap_frame *);
/*
* Build a ddb frame from the registers saved in the NMI KREGS
@@ -1050,7 +1050,7 @@ ip27_nmi(void *arg)
(void *)nmi_frame.pc, (void *)nmi_frame.ra, nmi_frame.sr,
(void *)epc);
#ifdef DDB
- (void)kdb_trap(-1, &nmi_frame);
+ (void)db_ktrap(-1, &nmi_frame);
#endif
panic("NMI");
/* NOTREACHED */
Index: sgi/sgi/ip30_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/sgi/sgi/ip30_machdep.c,v
retrieving revision 1.63
diff -u -p -r1.63 ip30_machdep.c
--- sgi/sgi/ip30_machdep.c 6 Dec 2014 23:20:17 -0000 1.63
+++ sgi/sgi/ip30_machdep.c 26 Feb 2016 15:35:18 -0000
@@ -436,7 +436,7 @@ ip30_get_ncpusfound(void)
void
ip30_nmi_handler()
{
- extern int kdb_trap(int, struct trap_frame *);
+ extern int db_ktrap(int, struct trap_frame *);
extern void stacktrace(struct trap_frame *);
struct trap_frame *fr0;
int s;
@@ -474,7 +474,7 @@ ip30_nmi_handler()
stacktrace(fr1);
#endif
- kdb_trap(-1, fr0);
+ db_ktrap(-1, fr0);
splx(s);
panic("NMI");
Index: sh/include/db_machdep.h
===================================================================
RCS file: /cvs/src/sys/arch/sh/include/db_machdep.h,v
retrieving revision 1.6
diff -u -p -r1.6 db_machdep.h
--- sh/include/db_machdep.h 16 Mar 2014 20:31:46 -0000 1.6
+++ sh/include/db_machdep.h 26 Feb 2016 15:35:18 -0000
@@ -57,7 +57,7 @@ extern db_regs_t ddb_regs; /* register s
#define IS_BREAKPOINT_TRAP(type, code) ((type) == EXPEVT_TRAPA)
#define IS_WATCHPOINT_TRAP(type, code) (0) /* XXX (msaitoh) */
-int kdb_trap(int, int, db_regs_t *);
+int db_ktrap(int, int, db_regs_t *);
void db_machine_init (void);
boolean_t inst_call(int);
boolean_t inst_return(int);
Index: sh/sh/db_interface.c
===================================================================
RCS file: /cvs/src/sys/arch/sh/sh/db_interface.c,v
retrieving revision 1.5
diff -u -p -r1.5 db_interface.c
--- sh/sh/db_interface.c 3 Dec 2014 20:09:32 -0000 1.5
+++ sh/sh/db_interface.c 26 Feb 2016 15:35:18 -0000
@@ -108,7 +108,7 @@ kdb_printtrap(u_int type, int code)
}
int
-kdb_trap(int type, int code, db_regs_t *regs)
+db_ktrap(int type, int code, db_regs_t *regs)
{
extern label_t *db_recover;
int s;
Index: sh/sh/trap.c
===================================================================
RCS file: /cvs/src/sys/arch/sh/sh/trap.c,v
retrieving revision 1.34
diff -u -p -r1.34 trap.c
--- sh/sh/trap.c 10 Sep 2015 17:32:19 -0000 1.34
+++ sh/sh/trap.c 26 Feb 2016 15:35:18 -0000
@@ -178,7 +178,7 @@ general_exception(struct proc *p, struct
switch (expevt) {
case EXPEVT_BREAK:
#ifdef DDB
- if (kdb_trap(EXPEVT_BREAK, 0, tf))
+ if (db_ktrap(EXPEVT_BREAK, 0, tf))
return;
else
#endif
@@ -189,7 +189,7 @@ general_exception(struct proc *p, struct
/* Check for ddb request */
tra = _reg_read_4(SH_(TRA));
if (tra == (_SH_TRA_BREAK << 2) &&
- kdb_trap(expevt, tra, tf))
+ db_ktrap(expevt, tra, tf))
return;
else
#endif
Index: sparc/include/db_machdep.h
===================================================================
RCS file: /cvs/src/sys/arch/sparc/include/db_machdep.h,v
retrieving revision 1.16
diff -u -p -r1.16 db_machdep.h
--- sparc/include/db_machdep.h 16 Mar 2014 20:31:46 -0000 1.16
+++ sparc/include/db_machdep.h 26 Feb 2016 15:35:18 -0000
@@ -82,7 +82,7 @@ extern db_regs_t ddb_regs; /* register s
#define DB_MACHINE_COMMANDS
void db_machine_init(void);
-int kdb_trap(int, struct trapframe *);
+int db_ktrap(int, struct trapframe *);
/*
* KGDB definitions
Index: sparc/sparc/db_interface.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc/sparc/db_interface.c,v
retrieving revision 1.15
diff -u -p -r1.15 db_interface.c
--- sparc/sparc/db_interface.c 18 Mar 2015 20:49:10 -0000 1.15
+++ sparc/sparc/db_interface.c 26 Feb 2016 15:35:18 -0000
@@ -173,15 +173,15 @@ kdb_kbd_trap(tf)
{
if (db_active == 0 && (boothowto & RB_KDB)) {
printf("\n\nkernel: keyboard interrupt\n");
- kdb_trap(-1, tf);
+ db_ktrap(-1, tf);
}
}
/*
- * kdb_trap - field a TRACE or BPT trap
+ * db_ktrap - field a TRACE or BPT trap
*/
int
-kdb_trap(type, tf)
+db_ktrap(type, tf)
int type;
struct trapframe *tf;
{
Index: sparc/sparc/trap.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc/sparc/trap.c,v
retrieving revision 1.72
diff -u -p -r1.72 trap.c
--- sparc/sparc/trap.c 6 Nov 2015 06:33:26 -0000 1.72
+++ sparc/sparc/trap.c 26 Feb 2016 15:35:18 -0000
@@ -244,7 +244,7 @@ trap(type, psr, pc, tf)
#ifdef DDB
if (type == T_BREAKPOINT) {
write_all_windows();
- if (kdb_trap(type, tf)) {
+ if (db_ktrap(type, tf)) {
return;
}
}
Index: sparc64/include/db_machdep.h
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/include/db_machdep.h,v
retrieving revision 1.15
diff -u -p -r1.15 db_machdep.h
--- sparc64/include/db_machdep.h 28 Aug 2015 23:28:39 -0000 1.15
+++ sparc64/include/db_machdep.h 26 Feb 2016 15:35:18 -0000
@@ -132,7 +132,7 @@ void db_machine_init(void);
#define DB_MACHINE_COMMANDS
void db_machine_init(void);
-int kdb_trap(int, struct trapframe64 *);
+int db_ktrap(int, struct trapframe64 *);
int db_enter_ddb(void);
void db_startcpu(struct cpu_info *);
Index: sparc64/sparc64/db_interface.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/sparc64/db_interface.c,v
retrieving revision 1.39
diff -u -p -r1.39 db_interface.c
--- sparc64/sparc64/db_interface.c 28 Aug 2015 23:28:39 -0000 1.39
+++ sparc64/sparc64/db_interface.c 26 Feb 2016 15:35:18 -0000
@@ -256,15 +256,15 @@ kdb_kbd_trap(tf)
{
if (db_active == 0 /* && (boothowto & RB_KDB) */) {
printf("\n\nkernel: keyboard interrupt tf=%p\n", tf);
- kdb_trap(-1, tf);
+ db_ktrap(-1, tf);
}
}
/*
- * kdb_trap - field a TRACE or BPT trap
+ * db_ktrap - field a TRACE or BPT trap
*/
int
-kdb_trap(type, tf)
+db_ktrap(type, tf)
int type;
register struct trapframe64 *tf;
{
Index: sparc64/sparc64/trap.c
===================================================================
RCS file: /cvs/src/sys/arch/sparc64/sparc64/trap.c,v
retrieving revision 1.87
diff -u -p -r1.87 trap.c
--- sparc64/sparc64/trap.c 6 Nov 2015 06:33:26 -0000 1.87
+++ sparc64/sparc64/trap.c 26 Feb 2016 15:35:18 -0000
@@ -371,13 +371,13 @@ trap(tf, type, pc, tstate)
#ifdef DDB
if (type == T_BREAKPOINT) {
write_all_windows();
- if (kdb_trap(type, tf)) {
+ if (db_ktrap(type, tf)) {
/* ADVANCE; */
return;
}
}
if (type == T_PA_WATCHPT || type == T_VA_WATCHPT) {
- if (kdb_trap(type, tf)) {
+ if (db_ktrap(type, tf)) {
/* DDB must turn off watchpoints or something */
return;
}
Index: vax/include/db_machdep.h
===================================================================
RCS file: /cvs/src/sys/arch/vax/include/db_machdep.h,v
retrieving revision 1.17
diff -u -p -r1.17 db_machdep.h
--- vax/include/db_machdep.h 16 Mar 2014 20:31:46 -0000 1.17
+++ vax/include/db_machdep.h 26 Feb 2016 15:35:18 -0000
@@ -71,6 +71,6 @@ extern db_regs_t ddb_regs; /* register s
#define inst_call(ins) (((ins)&0xff) == I_CALL)
/* Prototypes */
-void kdb_trap(struct trapframe *);
+void db_ktrap(struct trapframe *);
#endif /* _MACHINE_DB_MACHDEP_H_ */
Index: vax/vax/db_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/vax/vax/db_machdep.c,v
retrieving revision 1.19
diff -u -p -r1.19 db_machdep.c
--- vax/vax/db_machdep.c 13 Jul 2014 12:11:01 -0000 1.19
+++ vax/vax/db_machdep.c 26 Feb 2016 15:35:18 -0000
@@ -98,7 +98,7 @@ typedef struct __vax_frame {
* contain the registers when panic was called. (easy to debug).
*/
void
-kdb_trap(frame)
+db_ktrap(frame)
struct trapframe *frame;
{
int s;
Index: vax/vax/trap.c
===================================================================
RCS file: /cvs/src/sys/arch/vax/vax/trap.c,v
retrieving revision 1.56
diff -u -p -r1.56 trap.c
--- vax/vax/trap.c 13 Sep 2015 12:30:52 -0000 1.56
+++ vax/vax/trap.c 26 Feb 2016 15:35:18 -0000
@@ -126,7 +126,7 @@ fram:
default:
#ifdef DDB
- kdb_trap(frame);
+ db_ktrap(frame);
#endif
printf("Trap: type %x, code %x, pc %x, psl %x\n",
(u_int)frame->trap, (u_int)frame->code,
@@ -262,7 +262,7 @@ if(faultdebug)printf("trap accflt type %
case T_KDBTRAP:
case T_KDBTRAP|T_USER:
case T_TRCTRAP:
- kdb_trap(frame);
+ db_ktrap(frame);
return;
#endif
}
