--- Gnu-Mach/include/mach_debug/mach_debug.defs	2020/09/02 04:36:57	1.1
+++ Gnu-Mach/include/mach_debug/mach_debug.defs	2020/09/02 04:50:18	1.1.1.5
@@ -1,25 +1,25 @@
-/* 
+/*
  * Mach Operating System
  * Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
  * All Rights Reserved.
- * 
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
- * 
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
+ *
  * Carnegie Mellon requests users of this software to return to
- * 
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
- * 
+ *
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
@@ -27,16 +27,10 @@
  *	Matchmaker definitions file for Mach kernel debugging interface.
  */
 
-#ifdef	MACH_KERNEL
-#include <mach_ipc_debug.h>
-#include <mach_vm_debug.h>
-#include <mach_kdb.h>
-#endif
-
 subsystem
 #if	KERNEL_SERVER
 	  KernelServer
-#endif	KERNEL_SERVER
+#endif	/* KERNEL_SERVER */
 		       mach_debug 3000;
 
 #include <mach/std_types.defs>
@@ -48,17 +42,7 @@ skip;	/* host_ipc_statistics_reset */
 skip;	/* host_callout_info */
 skip;	/* host_callout_statistics */
 skip;	/* host_callout_statistics_reset */
-
-/*
- *	Returns information about the memory allocation zones.
- */
-routine host_zone_info(
-		host		: host_t;
-	out	names		: zone_name_array_t,
-					CountInOut, Dealloc;
-	out	info		: zone_info_array_t,
-					CountInOut, Dealloc);
-
+skip;	/* host_zone_info */
 skip;	/* host_ipc_bucket_info */
 
 #if	!defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG
@@ -73,14 +57,7 @@ routine	mach_port_get_srights(
 		name		: mach_port_name_t;
 	out	srights		: mach_port_rights_t);
 
-/*
- *	Returns information about the global reverse hash table.
- */
-
-routine host_ipc_hash_info(
-		host		: host_t;
-	out	info		: hash_info_bucket_array_t,
-					CountInOut, Dealloc);
+skip;	/* host_ipc_hash_info */
 
 /*
  *	Returns information about the marequest hash table.
@@ -92,17 +69,7 @@ routine host_ipc_marequest_info(
 	out	info		: hash_info_bucket_array_t,
 					CountInOut, Dealloc);
 
-/*
- *	Returns information about an IPC space.
- */
-
-routine mach_port_space_info(
-		task		: ipc_space_t;
-	out	info		: ipc_info_space_t;
-	out	table_info	: ipc_info_name_array_t,
-					CountInOut, Dealloc;
-	out	tree_info	: ipc_info_tree_name_array_t,
-					CountInOut, Dealloc);
+skip;	/* mach_port_space_info */
 
 /*
  *	Returns information about the dead-name requests
@@ -115,13 +82,13 @@ routine mach_port_dnrequest_info(
 	out	total		: unsigned;	/* total size of table */
 	out	used		: unsigned);	/* amount used */
 
-#else	!defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG
+#else	/* !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG */
 skip;	/* mach_port_get_srights */
 skip;	/* host_ipc_hash_info */
 skip;	/* host_ipc_marequest_info */
 skip;	/* mach_port_space_info */
 skip;	/* mach_port_dnrequest_info */
-#endif	!defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG
+#endif	/* !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG */
 
 skip;	/* mach_vm_region_info */
 skip;	/* vm_mapped_pages_info */
@@ -164,9 +131,9 @@ routine host_virtual_physical_table_info
 	out	info		: hash_info_bucket_array_t,
 					CountInOut, Dealloc);
 
-#else	!defined(MACH_VM_DEBUG) || MACH_VM_DEBUG
+#else	/* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */
 skip;	/* host_virtual_physical_table_info */
-#endif	!defined(MACH_VM_DEBUG) || MACH_VM_DEBUG
+#endif	/* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */
 
 #if	!defined(MACH_KDB) || MACH_KDB
 /*
@@ -181,9 +148,9 @@ routine host_load_symbol_table(
 		name		: symtab_name_t;
 		symtab		: pointer_t);
 
-#else	!defined(MACH_KDB) || MACH_KDB
+#else	/* !defined(MACH_KDB) || MACH_KDB */
 skip;	/* host_load_symbol_table */
-#endif	!defined(MACH_KDB) || MACH_KDB
+#endif	/* !defined(MACH_KDB) || MACH_KDB */
 
 #if	!defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG
 
@@ -198,9 +165,9 @@ routine	mach_port_kernel_object(
 	out	object_type	: unsigned;
 	out	object_addr	: vm_offset_t);
 
-#else	!defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG
+#else	/* !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG */
 skip;	/* mach_port_kernel_object */
-#endif	!defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG
+#endif	/* !defined(MACH_IPC_DEBUG) || MACH_IPC_DEBUG */
 
 #if	!defined(MACH_VM_DEBUG) || MACH_VM_DEBUG
 
@@ -234,8 +201,16 @@ routine mach_vm_object_pages(
 	out	pages		: vm_page_info_array_t,
 					CountInOut, Dealloc);
 
-#else	!defined(MACH_VM_DEBUG) || MACH_VM_DEBUG
+#else	/* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */
 skip;	/* mach_vm_region_info */
 skip;	/* mach_vm_object_info */
 skip;	/* mach_vm_object_pages */
-#endif	!defined(MACH_VM_DEBUG) || MACH_VM_DEBUG
+#endif	/* !defined(MACH_VM_DEBUG) || MACH_VM_DEBUG */
+
+/*
+ *	Returns information about the memory allocation caches.
+ */
+routine host_slab_info(
+		host		: host_t;
+	out	info		: cache_info_array_t,
+					CountInOut, Dealloc);