--- Gnu-Mach/kern/exception.c	2020/09/02 04:42:42	1.1.1.4
+++ Gnu-Mach/kern/exception.c	2020/09/02 04:45:13	1.1.1.5
@@ -24,16 +24,15 @@
  * the rights to redistribute these changes.
  */
 
-#include <norma_ipc.h>
-#include <mach_kdb.h>
-
 #include <mach/boolean.h>
 #include <mach/kern_return.h>
 #include <mach/message.h>
 #include <mach/port.h>
 #include <mach/mig_errors.h>
+#include <machine/locore.h>
 #include <ipc/port.h>
 #include <ipc/ipc_entry.h>
+#include <ipc/ipc_notify.h>
 #include <ipc/ipc_object.h>
 #include <ipc/ipc_space.h>
 #include <ipc/ipc_port.h>
@@ -41,6 +40,7 @@
 #include <ipc/mach_msg.h>
 #include <ipc/ipc_machdep.h>
 #include <kern/counters.h>
+#include <kern/debug.h>
 #include <kern/ipc_tt.h>
 #include <kern/task.h>
 #include <kern/thread.h>
@@ -51,15 +51,15 @@
 
 
 
-extern void exception();
-extern void exception_try_task();
-extern void exception_no_server();
+extern void exception() __attribute__ ((noreturn));
+extern void exception_try_task() __attribute__ ((noreturn));
+extern void exception_no_server() __attribute__ ((noreturn));
 
-extern void exception_raise();
+extern void exception_raise() __attribute__ ((noreturn));
 extern kern_return_t exception_parse_reply();
-extern void exception_raise_continue();
-extern void exception_raise_continue_slow();
-extern void exception_raise_continue_fast();
+extern void exception_raise_continue() __attribute__ ((noreturn));
+extern void exception_raise_continue_slow() __attribute__ ((noreturn));
+extern void exception_raise_continue_fast() __attribute__ ((noreturn));
 
 #if	MACH_KDB
 extern void thread_kdb_return();
@@ -113,7 +113,6 @@ exception(_exception, code, subcode)
 		ith_unlock(self);
 		exception_try_task(_exception, code, subcode);
 		/*NOTREACHED*/
-		return;
 	}
 
 	ip_lock(exc_port);
@@ -122,7 +121,6 @@ exception(_exception, code, subcode)
 		ip_unlock(exc_port);
 		exception_try_task(_exception, code, subcode);
 		/*NOTREACHED*/
-		return;
 	}
 
 	/*
@@ -183,7 +181,6 @@ exception_try_task(_exception, code, sub
 		itk_unlock(task);
 		exception_no_server();
 		/*NOTREACHED*/
-		return;
 	}
 
 	ip_lock(exc_port);
@@ -192,7 +189,6 @@ exception_try_task(_exception, code, sub
 		ip_unlock(exc_port);
 		exception_no_server();
 		/*NOTREACHED*/
-		return;
 	}
 
 	/*
@@ -268,6 +264,7 @@ exception_no_server()
 
 	(void) task_terminate(self->task);
 	thread_halt_self();
+	panic("terminating the task didn't kill us");
 	/*NOTREACHED*/
 }
 
@@ -420,9 +417,6 @@ exception_raise(dest_port, thread_port,
 	}
 
 	if (!ip_active(dest_port) ||
-#if	NORMA_IPC
-	    IP_NORMA_IS_PROXY(dest_port) ||
-#endif	/* NORMA_IPC */
 	    (dest_port->ip_receiver == ipc_space_kernel)) {
 		imq_unlock(reply_mqueue);
 		ip_unlock(dest_port);
@@ -699,7 +693,7 @@ exception_raise(dest_port, thread_port,
 	ikm_check_initialized(kmsg, kmsg->ikm_size);
 	assert(kmsg->ikm_size == IKM_SAVED_KMSG_SIZE);
 
-	if (copyoutmsg((vm_offset_t) &kmsg->ikm_header, (vm_offset_t)receiver->ith_msg,
+	if (copyoutmsg(&kmsg->ikm_header, receiver->ith_msg,
 		       sizeof(struct mach_exception)) ||
 	    (ikm_cache() != IKM_NULL)) {
 		mr = ipc_kmsg_put(receiver->ith_msg, kmsg,
@@ -761,7 +755,6 @@ exception_raise(dest_port, thread_port,
 		ip_unlock(reply_port);
 		exception_raise_continue_slow(MACH_RCV_PORT_DIED, IKM_NULL, /*dummy*/0);
 		/*NOTREACHED*/
-		return;
 	}
 
 	imq_lock(reply_mqueue);
@@ -936,7 +929,6 @@ exception_raise_continue_slow(mr, kmsg,
 	    (mr == MACH_RCV_PORT_DIED)) {
 		thread_exception_return();
 		/*NOTREACHED*/
-		return;
 	}
 
 	if (self->ith_exc != KERN_SUCCESS) {
@@ -944,7 +936,6 @@ exception_raise_continue_slow(mr, kmsg,
 				   self->ith_exc_code,
 				   self->ith_exc_subcode);
 		/*NOTREACHED*/
-		return;
 	}
 
 	exception_no_server();
@@ -994,7 +985,6 @@ exception_raise_continue_fast(reply_port
 	if (kr == KERN_SUCCESS) {
 		thread_exception_return();
 		/*NOTREACHED*/
-		return; /* help for the compiler */
 	}
 
 	if (self->ith_exc != KERN_SUCCESS) {