--- Gnu-Mach/ddb/db_command.c	2020/09/02 04:43:19	1.1.1.2
+++ Gnu-Mach/ddb/db_command.c	2020/09/02 04:45:52	1.1.1.3
@@ -28,31 +28,40 @@
  *	Date:	7/90
  */
 
-#include "mach_kdb.h"
 #if MACH_KDB
 
 /*
  * Command dispatcher.
  */
-#include <cpus.h>
-#include <norma_ipc.h>
-#include <norma_vm.h>
 
+#include <string.h>
 #include <mach/boolean.h>
-#include <kern/strings.h>
 #include <machine/db_machdep.h>
 
 #include <ddb/db_lex.h>
 #include <ddb/db_output.h>
 #include <ddb/db_command.h>
 #include <ddb/db_task_thread.h>
+#include <ddb/db_macro.h>
+#include <ddb/db_expr.h>
+#include <ddb/db_examine.h>
+#include <ddb/db_print.h>
+#include <ddb/db_break.h>
+#include <ddb/db_watch.h>
+#include <ddb/db_variables.h>
+#include <ddb/db_write_cmd.h>
+#include <ddb/db_run.h>
+#include <ddb/db_cond.h>
 
 #include <machine/setjmp.h>
+#include <kern/debug.h>
 #include <kern/thread.h>
 #include <ipc/ipc_pset.h> /* 4proto */
 #include <ipc/ipc_port.h> /* 4proto */
 
-
+#include <vm/vm_print.h>
+#include <ipc/ipc_print.h>
+#include <kern/lock.h>
 
 /*
  * Exported global variables
@@ -296,38 +305,9 @@ db_command_list(last_cmdp, cmd_table)
 	} while (db_read_token() == tSEMI_COLON && db_cmd_loop_done == 0);
 }
 
-/*
- * 'show' commands
- */
-extern void	db_listbreak_cmd();
-extern void	db_listwatch_cmd();
-extern void	db_show_regs(), db_show_one_thread(), db_show_one_task();
-extern void	db_show_all_threads();
-extern void	db_show_macro();
-extern void	vm_map_print(), vm_object_print(), vm_page_print();
-extern void	vm_map_copy_print();
-extern void	ipc_port_print(), ipc_pset_print(), db_show_all_slocks();
-extern void	ipc_kmsg_print(), ipc_msg_print();
-extern void	db_show_port_id();
-void		db_show_help();
-#if	NORMA_IPC
-extern void	netipc_packet_print(), netipc_pcs_print(), db_show_all_uids();
-extern void	db_show_all_proxies(), db_show_all_principals();
-extern void	db_show_all_uids_verbose();
-#endif	/* NORMA_IPC */
-#if	NORMA_VM
-extern void	xmm_obj_print(), xmm_reply_print();
-#endif	/* NORMA_VM */
-
 struct db_command db_show_all_cmds[] = {
 	{ "threads",	db_show_all_threads,	0,	0 },
 	{ "slocks",	db_show_all_slocks,	0,	0 },
-#if	NORMA_IPC
-	{ "uids",	db_show_all_uids,	0,	0 },
-	{ "proxies",	db_show_all_proxies,	0,	0 },
-	{ "principals",	db_show_all_principals,	0,	0 },
-	{ "vuids",	db_show_all_uids_verbose, 0,	0 },
-#endif	/* NORMA_IPC */
 	{ (char *)0 }
 };
 
@@ -348,29 +328,11 @@ struct db_command db_show_cmds[] = {
 	{ "kmsg",	ipc_kmsg_print,		0,	0 },
 	{ "msg",	ipc_msg_print,		0,	0 },
 	{ "ipc_port",	db_show_port_id,	0,	0 },
-#if	NORMA_IPC
-	{ "packet",	netipc_packet_print,	0,	0 },
-	{ "pcs",	netipc_pcs_print,	0,	0 },
-#endif	/* NORMA_IPC */
-#if	NORMA_VM
-	{ "xmm_obj",	xmm_obj_print,		0,	0 },
-	{ "xmm_reply",	xmm_reply_print,	0,	0 },
-#endif	/* NORMA_VM */
 	{ (char *)0, }
 };
 
-extern void	db_print_cmd(), db_examine_cmd(), db_set_cmd();
-extern void	db_examine_forward(), db_examine_backward();
-extern void	db_search_cmd();
-extern void	db_write_cmd();
-extern void	db_delete_cmd(), db_breakpoint_cmd();
-extern void	db_deletewatch_cmd(), db_watchpoint_cmd();
-extern void	db_single_step_cmd(), db_trace_until_call_cmd(),
-		db_trace_until_matching_cmd(), db_continue_cmd();
-extern void	db_stack_trace_cmd(), db_cond_cmd();
 void		db_help_cmd();
-void		db_def_macro_cmd(), db_del_macro_cmd();
-void		db_fncall();
+extern void	db_stack_trace_cmd();
 extern void	db_reset_cpu();
 
 struct db_command db_command_table[] = {
@@ -441,15 +403,12 @@ db_help_cmd()
 int	(*ddb_display)();
 
 void
-db_command_loop()
+db_command_loop(void)
 {
 	jmp_buf_t db_jmpbuf;
 	jmp_buf_t *prev = db_recover;
 	extern int db_output_line;
 	extern int db_macro_level;
-#if	NORMA_IPC
-	extern int _node_self;	/* node_self() may not be callable yet */
-#endif	/* NORMA_IPC */
 
 	/*
 	 * Initialize 'prev' and 'next' to dot.
@@ -468,9 +427,6 @@ db_command_loop()
 		db_printf("\n");
 	    db_output_line = 0;
 	    db_printf("db%s", (db_default_thread)? "t": "");
-#if	NORMA_IPC
-	    db_printf("%d", _node_self);
-#endif
 #if	NCPUS > 1
 	    db_printf("{%d}", cpu_number());
 #endif
@@ -501,10 +457,6 @@ db_exec_cmd_nest(cmd, size)
 	return(db_cmd_loop_done == 0);
 }
 
-#ifdef __GNUC__
-extern __volatile__ void _longjmp();
-#endif
-
 void db_error(s)
 	char *s;
 {