--- Gnu-Mach/kern/syscall_sw.c	2020/09/02 04:36:56	1.1.1.1
+++ Gnu-Mach/kern/syscall_sw.c	2020/09/02 04:45:11	1.1.1.3
@@ -27,18 +27,16 @@
  * the rights to redistribute these changes.
  */
 
-#include <mach_ipc_compat.h>
-#include <net_atm.h>
-
 #include <mach/port.h>
 #include <mach/kern_return.h>
+#include <kern/debug.h>
 #include <kern/syscall_sw.h>
 
 /* Include declarations of the trap functions. */
 #include <mach/mach_traps.h>
 #include <mach/message.h>
 #include <kern/syscall_subr.h>
-#include <chips/nw_mk.h>
+#include <ipc/mach_port.h>
 
 
 /*
@@ -62,13 +60,13 @@ int kern_invalid_debug = 0;
 
 mach_port_t	null_port()
 {
-	if (kern_invalid_debug) Debugger("null_port mach trap");
+	if (kern_invalid_debug) SoftDebugger("null_port mach trap");
 	return(MACH_PORT_NULL);
 }
 
 kern_return_t	kern_invalid()
 {
-	if (kern_invalid_debug) Debugger("kern_invalid mach trap");
+	if (kern_invalid_debug) SoftDebugger("kern_invalid mach trap");
 	return(KERN_INVALID_ARGUMENT);
 }
 
@@ -93,11 +91,6 @@ extern	kern_return_t	evc_wait_clear();
 extern	kern_return_t	syscall_device_write_request();
 extern	kern_return_t	syscall_device_writev_request();
 
-#ifdef FIPC 
-extern kern_return_t	syscall_fipc_send();
-extern kern_return_t	syscall_fipc_recv();
-#endif FIPC
-
 mach_trap_t	mach_trap_table[] = {
 	MACH_TRAP(kern_invalid, 0),		/* 0 */		/* Unix */
 	MACH_TRAP(kern_invalid, 0),		/* 1 */		/* Unix */
@@ -109,34 +102,19 @@ mach_trap_t	mach_trap_table[] = {
 	MACH_TRAP(kern_invalid, 0),		/* 7 */		/* Unix */
 	MACH_TRAP(kern_invalid, 0),		/* 8 */		/* Unix */
 	MACH_TRAP(kern_invalid, 0),		/* 9 */		/* Unix */
-
-#if	MACH_IPC_COMPAT
-	MACH_TRAP(task_self, 0),		/* 10 */	/* obsolete */
-	MACH_TRAP(thread_reply, 0),		/* 11 */	/* obsolete */
-	MACH_TRAP(task_notify, 0),		/* 12 */	/* obsolete */
-	MACH_TRAP(thread_self, 0),		/* 13 */	/* obsolete */
-#else	/* MACH_IPC_COMPAT */
 	MACH_TRAP(null_port, 0),		/* 10 */
 	MACH_TRAP(null_port, 0),		/* 11 */
 	MACH_TRAP(null_port, 0),		/* 12 */
 	MACH_TRAP(null_port, 0),		/* 13 */
-#endif	/* MACH_IPC_COMPAT */
 	MACH_TRAP(kern_invalid, 0),		/* 14 */
 	MACH_TRAP(kern_invalid, 0),		/* 15 */
 	MACH_TRAP(kern_invalid, 0),		/* 16 */
 	MACH_TRAP_STACK(evc_wait, 1),		/* 17 */
 	MACH_TRAP_STACK(evc_wait_clear, 1),	/* 18 */
 	MACH_TRAP(kern_invalid, 0),		/* 19 */
-
-#if	MACH_IPC_COMPAT
-	MACH_TRAP(msg_send_trap, 4),		/* 20 */	/* obsolete */
-	MACH_TRAP_STACK(msg_receive_trap, 5),	/* 21 */	/* obsolete */
-	MACH_TRAP_STACK(msg_rpc_trap, 6),	/* 22 */	/* obsolete */
-#else	/* MACH_IPC_COMPAT */
 	MACH_TRAP(kern_invalid, 0),		/* 20 */
 	MACH_TRAP(kern_invalid, 0),		/* 21 */
 	MACH_TRAP(kern_invalid, 0),		/* 22 */
-#endif	/* MACH_IPC_COMPAT */
 	MACH_TRAP(kern_invalid, 0),		/* 23 */
 	MACH_TRAP(kern_invalid, 0),		/* 24 */
 	MACH_TRAP_STACK(mach_msg_trap, 7),	/* 25 */
@@ -144,8 +122,12 @@ mach_trap_t	mach_trap_table[] = {
 	MACH_TRAP(mach_thread_self, 0),		/* 27 */
 	MACH_TRAP(mach_task_self, 0),		/* 28 */
 	MACH_TRAP(mach_host_self, 0),		/* 29 */
+#ifdef MACH_KDB
+	MACH_TRAP_STACK(mach_print, 1),		/* 30 */
+#else /* MACH_KDB */
+	MACH_TRAP_STACK(kern_invalid, 0),	/* 30 */
+#endif /* MACH_KDB */
 
-	MACH_TRAP(kern_invalid, 0),		/* 30 */
 	MACH_TRAP(kern_invalid, 0),		/* 31 */
 	MACH_TRAP(kern_invalid, 0),		/* 32 */
 	MACH_TRAP(kern_invalid, 0),		/* 33 emul: task_by_pid */
@@ -173,11 +155,7 @@ mach_trap_t	mach_trap_table[] = {
 	MACH_TRAP(kern_invalid, 0),		/* 52 emul: htg_syscall */
 	MACH_TRAP(kern_invalid, 0),	        /* 53 emul: set_ras_address */
 	MACH_TRAP(kern_invalid, 0),	        /* 54 */
-#if	MACH_IPC_COMPAT
-	MACH_TRAP(host_self, 0),		/* 55 */
-#else	/* MACH_IPC_COMPAT */
 	MACH_TRAP(null_port, 0),		/* 55 */
-#endif	/* MACH_IPC_COMPAT */
 	MACH_TRAP(null_port, 0),		/* 56 */
 	MACH_TRAP(kern_invalid, 0),		/* 57 */
 	MACH_TRAP(kern_invalid, 0),		/* 58 */
@@ -205,24 +183,6 @@ mach_trap_t	mach_trap_table[] = {
 	MACH_TRAP(kern_invalid, 0),		/* 78 */
 	MACH_TRAP(kern_invalid, 0),		/* 79 */
 
-#if	NET_ATM
-	MACH_TRAP(mk_update,3),                       /* 80 */
-	MACH_TRAP(mk_lookup,2),                       /* 81 */
-	MACH_TRAP_STACK(mk_endpoint_allocate,4),      /* 82 */
-	MACH_TRAP_STACK(mk_endpoint_deallocate,1),    /* 83 */
-	MACH_TRAP(mk_buffer_allocate,2),              /* 84 */
-	MACH_TRAP(mk_buffer_deallocate,2),            /* 85 */
-	MACH_TRAP_STACK(mk_connection_open,4),        /* 86 */
-	MACH_TRAP_STACK(mk_connection_accept,3),      /* 87 */
-	MACH_TRAP_STACK(mk_connection_close,1),       /* 88 */
-	MACH_TRAP_STACK(mk_multicast_add,4),          /* 89 */
-	MACH_TRAP_STACK(mk_multicast_drop,4),         /* 90 */
-	MACH_TRAP(mk_endpoint_status,3),              /* 91 */
-	MACH_TRAP_STACK(mk_send,3),                   /* 92 */
-	MACH_TRAP_STACK(mk_receive,2),                /* 93 */
-	MACH_TRAP_STACK(mk_rpc,4),                    /* 94 */
-	MACH_TRAP_STACK(mk_select,3),                 /* 95 */
-#else	/* NET_ATM */
 	MACH_TRAP(kern_invalid, 0),                   /* 80 */
 	MACH_TRAP(kern_invalid, 0),                   /* 81 */
 	MACH_TRAP(kern_invalid, 0),		      /* 82 */
@@ -239,15 +199,9 @@ mach_trap_t	mach_trap_table[] = {
 	MACH_TRAP(kern_invalid, 0),	              /* 93 */
 	MACH_TRAP(kern_invalid, 0),                   /* 94 */
 	MACH_TRAP(kern_invalid, 0),                   /* 95 */
-#endif	/* NET_ATM */
 
-#ifdef FIPC
-	MACH_TRAP(syscall_fipc_send, 4),		      /* 96 */
-	MACH_TRAP(syscall_fipc_recv, 5),		      /* 97 */
-#else
 	MACH_TRAP(kern_invalid, 0),		      /* 96 */
 	MACH_TRAP(kern_invalid, 0),		      /* 97 */
-#endif FIPC
 
 	MACH_TRAP(kern_invalid, 0),		      /* 98 */
 	MACH_TRAP(kern_invalid, 0),		      /* 99 */