diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-02-28 11:56:41 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2016-02-28 11:56:41 +0000 |
| commit | d71624cd3c18dd1d4ac8d3ecf81ee9945712ba0b (patch) | |
| tree | 23d43e4f42d2b69ebce2a9281c2714d6be07bf2e | |
| parent | 9ad564563ebc703e8b33e3f25553861c9c3e7087 (diff) | |
Rename ddb_trap_glue() to db_trap_glue().
Let's keep the 'db_' prefix for all ddb(4) functions that should not be
instrumented.
| -rw-r--r-- | sys/arch/macppc/macppc/db_interface.c | 6 | ||||
| -rw-r--r-- | sys/arch/macppc/macppc/locore.S | 4 | ||||
| -rw-r--r-- | sys/arch/socppc/socppc/db_interface.c | 6 | ||||
| -rw-r--r-- | sys/arch/socppc/socppc/locore.S | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/sys/arch/macppc/macppc/db_interface.c b/sys/arch/macppc/macppc/db_interface.c index 4cb81797ad2..86ec76cd859 100644 --- a/sys/arch/macppc/macppc/db_interface.c +++ b/sys/arch/macppc/macppc/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.10 2015/02/06 10:54:08 mpi Exp $ */ +/* $OpenBSD: db_interface.c,v 1.11 2016/02/28 11:56:40 mpi Exp $ */ /* $NetBSD: db_interface.c,v 1.12 2001/07/22 11:29:46 wiz Exp $ */ /* @@ -62,7 +62,7 @@ void db_ddbproc_cmd(db_expr_t, int, db_expr_t, char *); int db_active = 0; -int ddb_trap_glue(struct trapframe *frame); /* called from locore */ +int db_trap_glue(struct trapframe *frame); /* called from locore */ void Debugger() @@ -71,7 +71,7 @@ Debugger() } int -ddb_trap_glue(struct trapframe *frame) +db_trap_glue(struct trapframe *frame) { int s; diff --git a/sys/arch/macppc/macppc/locore.S b/sys/arch/macppc/macppc/locore.S index e7a47119d7d..a8c8017aee6 100644 --- a/sys/arch/macppc/macppc/locore.S +++ b/sys/arch/macppc/macppc/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.51 2015/11/15 17:10:53 miod Exp $ */ +/* $OpenBSD: locore.S,v 1.52 2016/02/28 11:56:40 mpi Exp $ */ /* $NetBSD: locore.S,v 1.2 1996/10/16 19:33:09 ws Exp $ */ /* @@ -1291,7 +1291,7 @@ ddbtrap: FRAME_SETUP(CI_DDBSAVE) /* Call C trap code: */ addi %r3,%r1,8 - bl _C_LABEL(ddb_trap_glue) + bl _C_LABEL(db_trap_glue) or. %r3,%r3,%r3 bne ddbleave /* This wasn't for DDB, so switch to real trap: */ diff --git a/sys/arch/socppc/socppc/db_interface.c b/sys/arch/socppc/socppc/db_interface.c index 02a44a53a76..927a88b24ef 100644 --- a/sys/arch/socppc/socppc/db_interface.c +++ b/sys/arch/socppc/socppc/db_interface.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_interface.c,v 1.1 2008/05/10 12:02:21 kettenis Exp $ */ +/* $OpenBSD: db_interface.c,v 1.2 2016/02/28 11:56:40 mpi Exp $ */ /* $NetBSD: db_interface.c,v 1.12 2001/07/22 11:29:46 wiz Exp $ */ #include <sys/param.h> @@ -10,7 +10,7 @@ #include <machine/db_machdep.h> #include <ddb/db_extern.h> -int ddb_trap_glue(struct trapframe *frame); /* called from locore */ +int db_trap_glue(struct trapframe *frame); /* called from locore */ void Debugger() @@ -19,7 +19,7 @@ Debugger() } int -ddb_trap_glue(struct trapframe *frame) +db_trap_glue(struct trapframe *frame) { if (!(frame->srr1 & PSL_PR) && (frame->exc == EXC_TRC diff --git a/sys/arch/socppc/socppc/locore.S b/sys/arch/socppc/socppc/locore.S index 6eac80e12fb..5dcdcc66b75 100644 --- a/sys/arch/socppc/socppc/locore.S +++ b/sys/arch/socppc/socppc/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.18 2015/11/15 17:10:53 miod Exp $ */ +/* $OpenBSD: locore.S,v 1.19 2016/02/28 11:56:40 mpi Exp $ */ /* $NetBSD: locore.S,v 1.2 1996/10/16 19:33:09 ws Exp $ */ /* @@ -1310,7 +1310,7 @@ ddbtrap: FRAME_SETUP(CI_DDBSAVE) /* Call C trap code: */ addi %r3,%r1,8 - bl _C_LABEL(ddb_trap_glue) + bl _C_LABEL(db_trap_glue) or. %r3,%r3,%r3 bne ddbleave /* This wasn't for DDB, so switch to real trap: */ |