Removed bits from kernel where pager utcb is set.

Pagers now set their own utcb explicitly via exchange_registers.
exregs accepts calls from active pagers for this purpose only.

src/generic/capability.c

@@ -61,10 +61,8 @@ struct capability *capability_find_by_rtype(struct cap_list *clist,
 {
 	struct capability *cap;
 
-	list_foreach_struct(cap, &clist->caps, list) {
+	list_foreach_struct(cap, &clist->caps, list)
 		if ((cap->type & CAP_RTYPE_MASK) == rtype)
 			return cap;
-	}
 	return 0;
 }
-

src/generic/container.c

@@ -23,7 +23,7 @@ int container_init(struct container *c)
 	init_ktcb_list(&c->ktcb_list);
 	init_mutex_queue_head(&c->mutex_queue_head);
 
-	/* Ini pager structs */
+	/* Init pager structs */
 	for (int i = 0; i < CONFIG_MAX_PAGERS_USED; i++)
 		cap_list_init(&c->pager[i].cap_list);
 
@@ -48,23 +48,23 @@ void kcont_insert_container(struct container *c,
 }
 
 /*
+ * FIXME: Remove completely. Need to be done in userspace.
  * This searches pager capabilities and if it has a virtual memory area
  * defined as a UTCB, uses the first entry as its utcb. If not, it is
  * not an error, perhaps another pager will map its utcb.
  */
-void task_setup_utcb(struct ktcb *task, struct pager *pager)
+void pager_init_utcb(struct ktcb *task, struct pager *pager)
 {
 	struct capability *cap;
 
 	/* Find a virtual memory capability with UTCB map permissions */
 	list_foreach_struct(cap, &pager->cap_list.caps, list) {
-		if (((cap->type & CAP_RTYPE_MASK) ==
-		     CAP_RTYPE_VIRTMEM) &&
-		    (cap->access & CAP_MAP_UTCB)) {
-			/* Use first address slot as pager's utcb */
-			task->utcb_address = __pfn_to_addr(cap->start);
-			return;
-		}
+		if (cap_rtype(cap) == CAP_RTYPE_VIRTMEM &&
+		    cap->access & CAP_MAP_UTCB) {
+ 			/* Use first address slot as pager's utcb */
+ 			task->utcb_address = __pfn_to_addr(cap->start);
+			break;
+ 		}
 	}
 }
 
@@ -146,7 +146,8 @@ int init_first_pager(struct pager *pager,
 
 	/* Initialize ktcb */
 	task_init_registers(task, pager->start_vma);
-	task_setup_utcb(task, pager);
+
+	pager_init_utcb(task, pager);
 
 	/* Allocate space structure */
 	if (!(space = alloc_space()))
@@ -215,7 +216,7 @@ int init_pager(struct pager *pager, struct container *cont)
 
 	task_init_registers(task, pager->start_vma);
 
-	task_setup_utcb(task, pager);
+	pager_init_utcb(task, pager);
 
 	task->space = address_space_create(0);
 

src/generic/scheduler.c

@@ -274,7 +274,7 @@ static inline void context_switch(struct ktcb *next)
 	arch_hardware_flush(TASK_PGD(next));
 
 	/* Update utcb region for next task */
-	task_update_utcb(cur, next);
+	task_update_utcb(next);
 
 	/* Switch context */
 	arch_switch(cur, next);

src/generic/tcb.c

@@ -156,10 +156,10 @@ unsigned int syscall_regs_offset = offsetof(struct ktcb, syscall_regs);
  * space as its context is loaded. The utcb region is a function of
  * this mapping and its offset that is reached via the KIP UTCB pointer
  */
-void task_update_utcb(struct ktcb *cur, struct ktcb *next)
+void task_update_utcb(struct ktcb *task)
 {
 	/* Update the KIP pointer */
-	kip.utcb = next->utcb_address;
+	kip.utcb = task->utcb_address;
 }
 
 /*