Merge DDBCTF into DDB.

7 files changed, 9 insertions, 19 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) {
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index bc01cc9b7dc..bbac53bcb02 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,11 +1,10 @@
-#	$OpenBSD: GENERIC,v 1.245 2017/07/30 18:16:14 florian Exp $
+#	$OpenBSD: GENERIC,v 1.246 2017/08/11 20:50:15 mpi Exp $
 #
 #	Machine-independent option; used by all architectures for their
 #	GENERIC kernel
 
 option		DDB		# in-kernel debugger
 #option		DDBPROF		# ddb(4) based profiling
-#option		DDBCTF		# DDB support for CTF
 #option		DDB_SAFE_CONSOLE # allow break into ddb during boot
 #makeoptions	DEBUG=""	# do not compile full symbol table
 #makeoptions	PROF="-pg"	# build profiled kernel
diff --git a/sys/conf/files b/sys/conf/files
index 56f13e402a5..8aafd6cc06c 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.650 2017/07/31 16:47:03 florian Exp $
+#	$OpenBSD: files,v 1.651 2017/08/11 20:50:15 mpi Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -598,7 +598,7 @@ file 	net/if_pppoe.c			pppoe	needs-flag
 file ddb/db_access.c			ddb
 file ddb/db_break.c			ddb
 file ddb/db_command.c			ddb
-file ddb/db_ctf.c			ddb & ddbctf
+file ddb/db_ctf.c			ddb
 file ddb/db_dwarf.c			ddb
 file ddb/db_elf.c			ddb
 file ddb/db_examine.c			ddb
diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index 94bb0a837e2..bccdf1d5a8d 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_command.c,v 1.73 2017/08/10 19:39:38 mpi Exp $	*/
+/*	$OpenBSD: db_command.c,v 1.74 2017/08/11 20:50:15 mpi Exp $	*/
 /*	$NetBSD: db_command.c,v 1.20 1996/03/30 22:30:05 christos Exp $	*/
 
 /*
@@ -617,12 +617,8 @@ struct db_command db_command_table[] = {
   /* this must be the first entry, if it exists */
 	{ "machine",    NULL,                   0,     		NULL},
 #endif
-#ifdef DDBCTF
 	{ "print",	db_ctf_pprint_cmd,	CS_OWN,		NULL },
 	{ "p",		db_ctf_pprint_cmd,	CS_OWN,		NULL },
-#else
-	{ "print",	db_print_cmd,		0,		NULL },
-#endif
 	{ "examine",	db_examine_cmd,		CS_SET_DOT, 	NULL },
 	{ "x",		db_examine_cmd,		CS_SET_DOT, 	NULL },
 	{ "search",	db_search_cmd,		CS_OWN|CS_SET_DOT, NULL },
diff --git a/sys/ddb/db_sym.h b/sys/ddb/db_sym.h
index 50a5b2f4b24..65d54ca0447 100644
--- a/sys/ddb/db_sym.h
+++ b/sys/ddb/db_sym.h
@@ -93,11 +93,9 @@ void db_elf_sym_forall(db_forall_func_t db_forall_func, void *);
 bool db_dwarf_line_at_pc(const char *, size_t, uintptr_t,
     const char **, const char **, int *);
 
-#ifdef DDBCTF
 struct ctf_type;
 
 int			 db_ctf_func_numargs(Elf_Sym *);
 const struct ctf_type	*db_ctf_type_by_name(char *);
-#endif
 
 #endif /* _DDB_DB_SYM_H_ */
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 83550d8c55c..d53b5e34b96 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: init_main.c,v 1.269 2017/04/28 13:50:55 mpi Exp $	*/
+/*	$OpenBSD: init_main.c,v 1.270 2017/08/11 20:50:15 mpi Exp $	*/
 /*	$NetBSD: init_main.c,v 1.84.4.1 1996/06/02 09:08:06 mrg Exp $	*/
 
 /*
@@ -548,7 +548,7 @@ main(void *framep)
 
 	config_process_deferred_mountroot();
 
-#ifdef DDBCTF
+#ifdef DDB
 	db_ctf_init();
 #endif