X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=kernel%2Farch%2Fx86%2Fthread.cc;h=f969a96b9adfea44e79a8c33b80d7fcbdc3275bd;hp=b530d7c3d0e7d354c9df4c7b5b6e305c6a9b6650;hb=1ac390fe1e18444008857b056c947710be9621a8;hpb=77bf9a95a836b14a243953e1fbd28c7c1106c59a

diff --git a/kernel/arch/x86/thread.cc b/kernel/arch/x86/thread.cc
index b530d7c..f969a96 100644
--- a/kernel/arch/x86/thread.cc
+++ b/kernel/arch/x86/thread.cc
@@ -15,9 +15,10 @@
 #include <kern/thread.h>
 #include <kern/mem.h>
 #include <kern/pagetable.h>
+#include <kern/process.h>
 
 namespace Arch {
-	void set_aspace(Mem::AddrSpace *aspace)
+	void set_aspace(Mem::ProcAddrSpace *aspace)
 	{
 		u32 cr3 = Mem::kvirt_to_phys(aspace->page_table->toplevel);
 		asm volatile("movl %0, %%cr3" : : "r" (cr3) : "memory");
@@ -27,13 +28,13 @@ namespace Arch {
 	{
 		u32 dummy1, dummy2;
 		
-		if (dest->addr_space) {
-			assert(dest->addr_space == dest->active_addr_space);
+		if (dest->aspace) {
+			assert(dest->aspace == dest->active_aspace);
 		
-			if (dest->addr_space != src->active_addr_space)
-				set_aspace(dest->addr_space);
+			if (dest->aspace != src->active_aspace)
+				set_aspace(dest->aspace);
 		} else {
-			dest->active_addr_space = src->active_addr_space;
+			dest->active_aspace = src->active_aspace;
 		}
 		
 		Priv::tss.esp0 = reinterpret_cast<u32>(dest);
@@ -50,4 +51,17 @@ namespace Arch {
 		             "0" (&src->arch.esp), "1" (&dest->arch.esp) :
 		             "ebx", "edx", "esi", "edi", "memory");
 	}
+
+	void ArchThread::init(void *entry, void *arg1, void *arg2)
+	{
+		void **stack = reinterpret_cast<void **>(this);
+		
+		*--stack = arg2;
+		*--stack = arg1;
+		*--stack = entry;
+		
+		esp = stack;
+		ebp = 0;
+		jump_to_init = 1;
+	}
 }