diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-08-11 20:50:16 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2017-08-11 20:50:16 +0000 |
| commit | b4b728921807aedab6e41cd0ad9af1d4093aaeca (patch) | |
| tree | 65a6fe7f240dcda33cf2c90b05aab26d574a50ad /sys/arch | |
| parent | 6b6b7207939c6ee0212c889d185c8f8773656f84 (diff) | |
Merge DDBCTF into DDB.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/amd64/db_trace.c | 5 | ||||
| -rw-r--r-- | sys/arch/i386/i386/db_trace.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sys/arch/amd64/amd64/db_trace.c b/sys/arch/amd64/amd64/db_trace.c index 7779183bdfd..5fcbf7b4362 100644 --- a/sys/arch/amd64/amd64/db_trace.c +++ b/sys/arch/amd64/amd64/db_trace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trace.c,v 1.32 2017/07/05 10:48:41 mpi Exp $ */ +/* $OpenBSD: db_trace.c,v 1.33 2017/08/11 20:50:15 mpi Exp $ */ /* $NetBSD: db_trace.c,v 1.1 2003/04/26 18:39:27 fvdl Exp $ */ /* @@ -86,12 +86,11 @@ void db_nextframe(struct callframe **, db_addr_t *, long *, int, int db_numargs(struct callframe *fp, Elf_Sym *sym) { -#ifdef DDBCTF int args; if ((args = db_ctf_func_numargs(sym)) != -1) return args; -#endif /* DDBCTF */ + return 6; } diff --git a/sys/arch/i386/i386/db_trace.c b/sys/arch/i386/i386/db_trace.c index 7f5b5af1727..f65102128a2 100644 --- a/sys/arch/i386/i386/db_trace.c +++ b/sys/arch/i386/i386/db_trace.c @@ -1,4 +1,4 @@ -/* $OpenBSD: db_trace.c,v 1.28 2017/05/30 15:39:04 mpi Exp $ */ +/* $OpenBSD: db_trace.c,v 1.29 2017/08/11 20:50:15 mpi Exp $ */ /* $NetBSD: db_trace.c,v 1.18 1996/05/03 19:42:01 christos Exp $ */ /* @@ -89,10 +89,8 @@ db_numargs(struct callframe *fp, Elf_Sym *sym) int args; extern char etext[]; -#ifdef DDBCTF if ((args = db_ctf_func_numargs(sym)) != -1) return args; -#endif /* DDBCTF */ argp = (int *)db_get_value((int)&fp->f_retaddr, 4, FALSE); if (argp < (int *)VM_MIN_KERNEL_ADDRESS || argp > (int *)etext) { |