--- Gnu-Mach/kern/host.c	2020/09/02 04:36:57	1.1
+++ Gnu-Mach/kern/host.c	2020/09/02 04:52:05	1.1.1.4
@@ -29,10 +29,10 @@
  *	Non-ipc host functions.
  */
 
-#include <cpus.h>
-#include <mach_host.h>
+#include <string.h>
 
 #include <kern/assert.h>
+#include <kern/debug.h>
 #include <kern/kalloc.h>
 #include <kern/host.h>
 #include <mach/host_info.h>
@@ -41,20 +41,18 @@
 #include <mach/port.h>
 #include <kern/processor.h>
 #include <kern/ipc_host.h>
-
+#include <kern/mach_clock.h>
 #include <mach/vm_param.h>
 
-
-
 host_data_t	realhost;
 
 kern_return_t host_processors(
-	host_t			host,
+	const host_t		host,
 	processor_array_t	*processor_list,
 	natural_t		*countp)
 {
-	register int		i;
-	register processor_t	*tp;
+	unsigned		i;
+	processor_t		*tp;
 	vm_offset_t		addr;
 	unsigned int		count;
 
@@ -97,12 +95,12 @@ kern_return_t host_processors(
 }
 
 kern_return_t	host_info(
-	host_t		host,
+	const host_t	host,
 	int		flavor,
 	host_info_t	info,
 	natural_t	*count)
 {
-	register integer_t	i, *slot_ptr;
+	integer_t	i, *slot_ptr;
 
 	if (host == HOST_NULL)
 		return KERN_INVALID_ARGUMENT;
@@ -111,7 +109,7 @@ kern_return_t	host_info(
 
 	case HOST_BASIC_INFO:
 	    {
-		register host_basic_info_t	basic_info;
+		host_basic_info_t	basic_info;
 
 		/*
 		 *	Basic information about this host.
@@ -154,8 +152,7 @@ kern_return_t	host_info(
 
 	case HOST_SCHED_INFO:
 	    {
-		register host_sched_info_t	sched_info;
-		extern int	tick;	/* microseconds per clock tick */
+		host_sched_info_t	sched_info;
 		extern int	min_quantum;
 					/* minimum quantum, in microseconds */
 
@@ -177,7 +174,7 @@ kern_return_t	host_info(
 
 	case HOST_LOAD_INFO:
 	    {
-		register host_load_info_t load_info;
+		host_load_info_t load_info;
 		extern long avenrun[3], mach_factor[3];
 
 		if (*count < HOST_LOAD_INFO_COUNT)
@@ -185,12 +182,12 @@ kern_return_t	host_info(
 
 		load_info = (host_load_info_t) info;
 
-		bcopy((char *) avenrun,
-		      (char *) load_info->avenrun,
-		      sizeof avenrun);
-		bcopy((char *) mach_factor,
-		      (char *) load_info->mach_factor,
-		      sizeof mach_factor);
+		memcpy(load_info->avenrun,
+		       avenrun,
+		       sizeof avenrun);
+		memcpy(load_info->mach_factor,
+		       mach_factor,
+		       sizeof mach_factor);
 
 		*count = HOST_LOAD_INFO_COUNT;
 		return KERN_SUCCESS;
@@ -207,7 +204,7 @@ kern_return_t	host_info(
  */
 
 kern_return_t host_kernel_version(
-	host_t			host,
+	const host_t		host,
 	kernel_version_t	out_version)
 {
 	extern char	version[];
@@ -228,7 +225,7 @@ kern_return_t host_kernel_version(
 #if	MACH_HOST
 kern_return_t
 host_processor_sets(
-	host_t				host,
+	const host_t			host,
 	processor_set_name_array_t	*pset_list,
 	natural_t			*count)
 {
@@ -305,7 +302,7 @@ host_processor_sets(
 			return KERN_RESOURCE_SHORTAGE;
 		}
 
-		bcopy((char *) addr, (char *) newaddr, size_needed);
+		memcpy((void *) newaddr, (void *) addr, size_needed);
 		kfree(addr, size);
 		psets = (processor_set_t *) newaddr;
 	}
@@ -327,7 +324,7 @@ host_processor_sets(
  */
 kern_return_t
 host_processor_sets(
-	host_t				host,
+	const host_t			host,
 	processor_set_name_array_t	*pset_list,
 	natural_t			*count)
 {
@@ -365,7 +362,7 @@ host_processor_sets(
  */
 kern_return_t
 host_processor_set_priv(
-	host_t		host,
+	const host_t	host,
 	processor_set_t	pset_name,
 	processor_set_t	*pset)
 {