--- Gnu-Mach/kern/ipc_kobject.c	2020/09/02 04:42:47	1.1.1.2
+++ Gnu-Mach/kern/ipc_kobject.c	2020/09/02 04:45:18	1.1.1.3
@@ -33,12 +33,8 @@
  *	Functions for letting a port represent a kernel object.
  */
 
-#include <mach_debug.h>
-#include <mach_ipc_test.h>
-#include <mach_machine_routines.h>
-#include <norma_task.h>
-#include <norma_vm.h>
-
+#include <kern/debug.h>
+#include <kern/printf.h>
 #include <mach/port.h>
 #include <mach/kern_return.h>
 #include <mach/message.h>
@@ -49,6 +45,9 @@
 #include <ipc/ipc_kmsg.h>
 #include <ipc/ipc_port.h>
 #include <ipc/ipc_thread.h>
+#include <vm/vm_object.h>
+#include <vm/memory_object_proxy.h>
+#include <device/ds_routines.h>
 
 #if	MACH_MACHINE_ROUTINES
 #include <machine/machine_routines.h>
@@ -152,17 +151,11 @@ ipc_kobject_server(request)
 				mach_host_server_routine(),
 				device_server_routine(),
 				device_pager_server_routine(),
-				mach4_server_routine();
+				mach4_server_routine(),
+				gnumach_server_routine();
 #if	MACH_DEBUG
 	extern mig_routine_t	mach_debug_server_routine();
 #endif
-#if	NORMA_TASK
-	extern mig_routine_t	mach_norma_server_routine();
-	extern mig_routine_t	norma_internal_server_routine();
-#endif
-#if	NORMA_VM
-	extern mig_routine_t	proxy_server_routine();
-#endif
 
 #if	MACH_MACHINE_ROUTINES
 	extern mig_routine_t	MACHINE_SERVER_ROUTINE();
@@ -177,28 +170,28 @@ ipc_kobject_server(request)
 #if	MACH_DEBUG
 	 || (routine = mach_debug_server_routine(&request->ikm_header)) != 0
 #endif	/* MACH_DEBUG */
-#if	NORMA_TASK
-	 || (routine = mach_norma_server_routine(&request->ikm_header)) != 0
-	 || (routine = norma_internal_server_routine(&request->ikm_header)) != 0
-#endif	/* NORMA_TASK */
-#if	NORMA_VM
-	 || (routine = proxy_server_routine(&request->ikm_header)) != 0
-#endif	/* NORMA_VM */
 	 || (routine = mach4_server_routine(&request->ikm_header)) != 0
+	 || (routine = gnumach_server_routine(&request->ikm_header)) != 0
 #if	MACH_MACHINE_ROUTINES
 	 || (routine = MACHINE_SERVER_ROUTINE(&request->ikm_header)) != 0
 #endif	/* MACH_MACHINE_ROUTINES */
 	) {
 	    (*routine)(&request->ikm_header, &reply->ikm_header);
-	}
-	else if (!ipc_kobject_notify(&request->ikm_header,&reply->ikm_header)){
+	    kernel_task->messages_received++;
+	} else {
+	    if (!ipc_kobject_notify(&request->ikm_header,
+		&reply->ikm_header)) {
 		((mig_reply_header_t *) &reply->ikm_header)->RetCode
 		    = MIG_BAD_ID;
 #if	MACH_IPC_TEST
 		printf("ipc_kobject_server: bogus kernel message, id=%d\n",
 		       request->ikm_header.msgh_id);
 #endif	/* MACH_IPC_TEST */
+	    } else {
+		kernel_task->messages_received++;
+	    }
 	}
+	kernel_task->messages_sent++;
     }
 	check_simple_locks();
 
@@ -334,7 +327,7 @@ ipc_kobject_destroy(
 
 	    default:
 #if	MACH_ASSERT
-		printf("ipc_kobject_destroy: port 0x%x, kobj 0x%x, type %d\n",
+		printf("ipc_kobject_destroy: port 0x%p, kobj 0x%lx, type %d\n",
 		       port, port->ip_kobject, ip_kotype(port));
 #endif	/* MACH_ASSERT */
 		break;
@@ -368,23 +361,12 @@ ipc_kobject_notify(request_header, reply
 		return FALSE;
 	}
 	switch (ip_kotype(port)) {
-#if	NORMA_VM
-		case IKOT_XMM_OBJECT:
-		return xmm_object_notify(request_header);
-
-		case IKOT_XMM_PAGER:
-		return xmm_pager_notify(request_header);
-
-		case IKOT_XMM_KERNEL:
-		return xmm_kernel_notify(request_header);
-
-		case IKOT_XMM_REPLY:
-		return xmm_reply_notify(request_header);
-#endif	/* NORMA_VM */
-
 		case IKOT_DEVICE:
 		return ds_notify(request_header);
 
+		case IKOT_PAGER_PROXY:
+		return memory_object_proxy_notify(request_header);
+
 		default:
 		return FALSE;
 	}