--- Gnu-Mach/kern/processor.c	2020/09/02 04:42:42	1.1.1.2
+++ Gnu-Mach/kern/processor.c	2020/09/02 04:51:56	1.1.1.6
@@ -27,17 +27,18 @@
  *	processor.c: processor and processor_set manipulation routines.
  */
 
-#include <cpus.h>
-#include <mach_fixpri.h>
-#include <mach_host.h>
+#include <string.h>
 
 #include <mach/boolean.h>
 #include <mach/policy.h>
 #include <mach/processor_info.h>
 #include <mach/vm_param.h>
 #include <kern/cpu_number.h>
+#include <kern/debug.h>
+#include <kern/kalloc.h>
 #include <kern/lock.h>
 #include <kern/host.h>
+#include <kern/ipc_tt.h>
 #include <kern/processor.h>
 #include <kern/sched.h>
 #include <kern/task.h>
@@ -46,8 +47,8 @@
 #include <ipc/ipc_port.h>
 
 #if	MACH_HOST
-#include <kern/zalloc.h>
-zone_t	pset_zone;
+#include <kern/slab.h>
+struct kmem_cache pset_cache;
 #endif	/* MACH_HOST */
 
 
@@ -65,18 +66,11 @@ processor_t	master_processor;
 processor_t	processor_ptr[NCPUS];
 
 /*
- * Forward declarations.
- */
-void quantum_set(processor_set_t);
-void pset_init(processor_set_t);
-void processor_init(processor_t, int);
-
-/*
  *	Bootstrap the processor/pset system so the scheduler can run.
  */
 void pset_sys_bootstrap(void)
 {
-	register int	i;
+	int	i;
 
 	pset_init(&default_pset);
 	default_pset.empty = FALSE;
@@ -108,14 +102,14 @@ void pset_sys_bootstrap(void)
  */
 void pset_sys_init(void)
 {
-	register int	i;
-	register processor_t	processor;
+	int		i;
+	processor_t	processor;
 
 	/*
-	 * Allocate the zone for processor sets.
+	 * Allocate the cache for processor sets.
 	 */
-	pset_zone = zinit(sizeof(struct processor_set), 128*PAGE_SIZE,
-		PAGE_SIZE, 0, "processor sets");
+	kmem_cache_init(&pset_cache, "processor_set",
+			sizeof(struct processor_set), 0, NULL, 0);
 
 	/*
 	 * Give each processor a control port.
@@ -137,7 +131,7 @@ void pset_sys_init(void)
  */
 
 void pset_init(
-	register processor_set_t	pset)
+	processor_set_t	pset)
 {
 	int	i;
 
@@ -188,7 +182,7 @@ void pset_init(
  */
 
 void processor_init(
-	register processor_t pr,
+	processor_t 	pr,
 	int		slot_num)
 {
 	int	i;
@@ -394,7 +388,7 @@ void pset_deallocate(
 	/*
 	 *	That's it, free data structure.
 	 */
-	zfree(pset_zone, (vm_offset_t)pset);
+	kmem_cache_free(&pset_cache, (vm_offset_t)pset);
 #endif	/* MACH_HOST */
 }
 
@@ -413,14 +407,14 @@ void pset_reference(
 
 kern_return_t
 processor_info(
-	register processor_t	processor,
+	processor_t		processor,
 	int			flavor,
 	host_t			*host,
 	processor_info_t	info,
 	natural_t		*count)
 {
-	register int	slot_num, state;
-	register processor_basic_info_t		basic_info;
+	int				slot_num, state;
+	processor_basic_info_t		basic_info;
 
 	if (processor == PROCESSOR_NULL)
 		return KERN_INVALID_ARGUMENT;
@@ -502,7 +496,7 @@ void quantum_set(
 	processor_set_t	pset)
 {
 #if	NCPUS > 1
-	register int	i,ncpus;
+	int	i, ncpus;
 
 	ncpus = pset->processor_count;
 
@@ -538,7 +532,7 @@ processor_set_create(
 	if (host == HOST_NULL)
 		return KERN_INVALID_ARGUMENT;
 
-	pset = (processor_set_t) zalloc(pset_zone);
+	pset = (processor_set_t) kmem_cache_alloc(&pset_cache);
 	pset_init(pset);
 	pset_reference(pset);	/* for new_set out argument */
 	pset_reference(pset);	/* for new_name out argument */
@@ -566,8 +560,8 @@ processor_set_create(
 kern_return_t processor_set_destroy(
 	processor_set_t pset)
 {
-	register queue_entry_t	elem;
-	register queue_head_t	*list;
+	queue_entry_t	elem;
+	queue_head_t	*list;
 
 	if (pset == PROCESSOR_SET_NULL || pset == &default_pset)
 		return KERN_INVALID_ARGUMENT;
@@ -646,18 +640,12 @@ processor_set_create(
 	processor_set_t *new_set,
 	processor_set_t *new_name)
 {
-#ifdef	lint
-	host++; new_set++; new_name++;
-#endif	/* lint */
 	return KERN_FAILURE;
 }
 
 kern_return_t processor_set_destroy(
 	processor_set_t pset)
 {
-#ifdef	lint
-	pset++;
-#endif	/* lint */
 	return KERN_FAILURE;
 }
 
@@ -669,6 +657,8 @@ processor_get_assignment(
 	processor_set_t	*pset)
 {
     	int state;
+	if (processor == PROCESSOR_NULL)
+		return KERN_INVALID_ARGUMENT;
 
 	state = processor->state;
 	if (state == PROCESSOR_SHUTDOWN || state == PROCESSOR_OFF_LINE)
@@ -691,7 +681,7 @@ processor_set_info(
 		return KERN_INVALID_ARGUMENT;
 
 	if (flavor == PROCESSOR_SET_BASIC_INFO) {
-		register processor_set_basic_info_t	basic_info;
+		processor_set_basic_info_t	basic_info;
 
 		if (*count < PROCESSOR_SET_BASIC_INFO_COUNT)
 			return KERN_FAILURE;
@@ -711,7 +701,7 @@ processor_set_info(
 		return KERN_SUCCESS;
 	}
 	else if (flavor == PROCESSOR_SET_SCHED_INFO) {
-		register processor_set_sched_info_t	sched_info;
+		processor_set_sched_info_t	sched_info;
 
 		if (*count < PROCESSOR_SET_SCHED_INFO_COUNT)
 			return KERN_FAILURE;
@@ -756,8 +746,8 @@ processor_set_max_priority(
 	pset->max_priority = max_priority;
 
 	if (change_threads) {
-	    register queue_head_t *list;
-	    register thread_t	thread;
+	    queue_head_t *list;
+	    thread_t	thread;
 
 	    list = &pset->threads;
 	    queue_iterate(list, thread, thread_t, pset_threads) {
@@ -827,8 +817,8 @@ processor_set_policy_disable(
 	    pset->policies &= ~policy;
 
 	    if (change_threads) {
-		register queue_head_t	*list;
-		register thread_t	thread;
+		queue_head_t	*list;
+		thread_t	thread;
 
 		list = &pset->threads;
 		queue_iterate(list, thread, thread_t, pset_threads) {
@@ -859,7 +849,7 @@ processor_set_things(
 	int		type)
 {
 	unsigned int actual;	/* this many things */
-	int i;
+	unsigned i;
 
 	vm_size_t size, size_needed;
 	vm_offset_t addr;
@@ -975,7 +965,7 @@ processor_set_things(
 				return KERN_RESOURCE_SHORTAGE;
 			}
 
-			bcopy((char *) addr, (char *) newaddr, size_needed);
+			memcpy((void *) newaddr, (void *) addr, size_needed);
 			kfree(addr, size);
 			addr = newaddr;
 		}