diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-02-27 13:08:08 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-02-27 13:08:08 +0000 |
| commit | b2f97f2ae592bb15002759d8300624750ab10eff (patch) | |
| tree | 516aba0f8239ca6eb161284d94ceaf4b10b74d6d /sys/arch/sh | |
| parent | 8115b491c372ec13e6406e31e006f1924e62218b (diff) | |
Rename kdb_trap() into db_ktrap().
The goal is to include it in the list of functions that must not be
instrumented. All ddb(8) functions should be in this list and have
their names start with 'db_'.
ok visa@, deraadt@
Diffstat (limited to 'sys/arch/sh')
| -rw-r--r-- | sys/arch/sh/include/db_machdep.h | 4 | ||||
| -rw-r--r-- | sys/arch/sh/sh/db_interface.c | 4 | ||||
| -rw-r--r-- | sys/arch/sh/sh/trap.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/sh/include/db_machdep.h b/sys/arch/sh/include/db_machdep.h index 60f8d39e80a..f8aed1ace73 100644 --- a/sys/arch/sh/include/db_machdep.h +++ b/sys/arch/sh/include/db_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: db_machdep.h,v 1.6 2014/03/16 20:31:46 guenther Exp $ */ +/* $OpenBSD: db_machdep.h,v 1.7 2016/02/27 13:08:07 mpi Exp $ */ /* $NetBSD: db_machdep.h,v 1.12 2006/05/10 06:24:03 skrll Exp $ */ /* @@ -57,7 +57,7 @@ extern db_regs_t ddb_regs; /* register state */ #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); diff --git a/sys/arch/sh/sh/db_interface.c b/sys/arch/sh/sh/db_interface.c index 116f31f6240..0a16ef3cb95 100644 --- a/sys/arch/sh/sh/db_interface.c +++ b/sys/arch/sh/sh/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.5 2014/12/03 20:09:32 krw Exp $ */ +/* $OpenBSD: db_interface.c,v 1.6 2016/02/27 13:08:07 mpi Exp $ */ /* $NetBSD: db_interface.c,v 1.37 2006/09/06 00:11:49 uwe Exp $ */ /*- @@ -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; diff --git a/sys/arch/sh/sh/trap.c b/sys/arch/sh/sh/trap.c index 649b1bbb0e8..5d468051b2f 100644 --- a/sys/arch/sh/sh/trap.c +++ b/sys/arch/sh/sh/trap.c @@ -1,4 +1,4 @@ -/* $OpenBSD: trap.c,v 1.34 2015/09/10 17:32:19 miod Exp $ */ +/* $OpenBSD: trap.c,v 1.35 2016/02/27 13:08:07 mpi Exp $ */ /* $NetBSD: exception.c,v 1.32 2006/09/04 23:57:52 uwe Exp $ */ /* $NetBSD: syscall.c,v 1.6 2006/03/07 07:21:50 thorpej Exp $ */ @@ -178,7 +178,7 @@ general_exception(struct proc *p, struct trapframe *tf, uint32_t va) 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 trapframe *tf, uint32_t va) /* 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 |