# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1312786390 -10800
# Node ID 23abbeea4d5f72f2ce8632935f16b6db783ace2e
# Parent  fa65b4f453667af163c298f6af3ebf1d15cd960d
llalallalala

diff -r fa65b4f45366 -r 23abbeea4d5f src/proc.c
--- a/src/proc.c	Sun Aug 07 06:42:00 2011 +0300
+++ b/src/proc.c	Mon Aug 08 09:53:10 2011 +0300
@@ -53,22 +53,20 @@
 		panic("failed to allocate user stack page\n");
 	}
 	proc[1].ctx.stack_ptr = PAGE_TO_ADDR(stack_pg) + PGSIZE;
-
-	proc[1].stack_end = KMEM_START;
-	proc[1].stack_start = KMEM_START - PGSIZE;
+	proc[1].stack_start_pg = stack_pg;
 
 	/* create the virtual address space for this process */
-	proc[1].ctx.pgtbl_paddr = clone_vm();
+	/*proc[1].ctx.pgtbl_paddr = clone_vm();*/
 
 	/* we don't need the image and the stack in this address space */
-	unmap_page_range(img_start_pg, proc_size_pg);
+	/*unmap_page_range(img_start_pg, proc_size_pg);
 	pgfree(img_start_pg, proc_size_pg);
 
 	unmap_page(stack_pg);
-	pgfree(stack_pg, 1);
+	pgfree(stack_pg, 1);*/
 
 	/* add it to the scheduler queues */
-	add_proc(1, STATE_RUNNING);
+	add_proc(1, STATE_RUNNABLE);
 
 	/* switch to the initial process, this never returns */
 	context_switch(1);
diff -r fa65b4f45366 -r 23abbeea4d5f src/proc.h
--- a/src/proc.h	Sun Aug 07 06:42:00 2011 +0300
+++ b/src/proc.h	Mon Aug 08 09:53:10 2011 +0300
@@ -16,7 +16,7 @@
 };
 
 enum proc_state {
-	STATE_RUNNING,
+	STATE_RUNNABLE,
 	STATE_BLOCKED,
 	STATE_ZOMBIE
 };
diff -r fa65b4f45366 -r 23abbeea4d5f src/sched.c
--- a/src/sched.c	Sun Aug 07 06:42:00 2011 +0300
+++ b/src/sched.c	Mon Aug 08 09:53:10 2011 +0300
@@ -62,7 +62,7 @@
 
 	proc = get_process(pid);
 
-	q = state == STATE_RUNNING ? &runq : &waitq;
+	q = state == STATE_RUNNABLE ? &runq : &waitq;
 
 	ins_back(q, proc);
 	proc->state = state;
@@ -76,7 +76,7 @@
 	int istate;
 	struct process *proc = get_process(pid);
 
-	if(proc->state != STATE_RUNNING) {
+	if(proc->state != STATE_RUNNABLE) {
 		printf("block_proc: process %d not running\n", pid);
 		return -1;
 	}
@@ -107,7 +107,7 @@
 
 	remove(&waitq, proc);
 	ins_back(&runq, proc);
-	proc->state = STATE_RUNNING;
+	proc->state = STATE_RUNNABLE;
 
 	set_intr_state(istate);
 	return 0;