X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Farch%2Fx86%2Fdescriptors.cc;h=35e11f974e14dc8e8f21fe3b9091e83b4764f78d;hb=188a395421d2ed7038735d0e3cac37255cf45755;hp=e281895386764fec8f8481a58c5d455bfca38421;hpb=0601614ebbcc48b961a2f0613281e6e629af29b1;p=polintos%2Fscott%2Fpriv.git

diff --git a/kernel/arch/x86/descriptors.cc b/kernel/arch/x86/descriptors.cc
index e281895..35e11f9 100644
--- a/kernel/arch/x86/descriptors.cc
+++ b/kernel/arch/x86/descriptors.cc
@@ -29,7 +29,7 @@ using Arch::Priv::tss;
 
 Descriptor x86_gdt[1024] = {
 	{}, // The first entry is reserved for the NULL selector.
-	{   // 0x08: data
+	{   // 0x08: kernel data
 		limit_low: 0xffff,
 		base_low: 0,
 		base_mid: 0,
@@ -37,14 +37,14 @@ Descriptor x86_gdt[1024] = {
 		user: 1,
 		dpl: 0,
 		present: 1,
-		limit_high: 0xff,
+		limit_high: 0xf,
 		sw: 0,
 		reserved: 0,
 		opsize: 1,
 		gran: 1,
 		base_high: 0
 	},
-	{   // 0x10: code
+	{   // 0x10: kernel code
 		limit_low: 0xffff,
 		base_low: 0,
 		base_mid: 0,
@@ -52,7 +52,7 @@ Descriptor x86_gdt[1024] = {
 		user: 1,
 		dpl: 0,
 		present: 1,
-		limit_high: 0xff,
+		limit_high: 0xf,
 		sw: 0,
 		reserved: 0,
 		opsize: 1,
@@ -73,7 +73,37 @@ Descriptor x86_gdt[1024] = {
 		opsize: 0,
 		gran: 0,
 		base_high: 0
-	}
+	},
+	{   // 0x23: user data
+		limit_low: 0xffff,
+		base_low: 0,
+		base_mid: 0,
+		type: 2, // data segment, writable
+		user: 1,
+		dpl: 3,
+		present: 1,
+		limit_high: 0x7,
+		sw: 0,
+		reserved: 0,
+		opsize: 1,
+		gran: 1,
+		base_high: 0
+	},
+	{   // 0x2b: code
+		limit_low: 0xffff,
+		base_low: 0,
+		base_mid: 0,
+		type: 10, // code segment, readable
+		user: 1,
+		dpl: 3,
+		present: 1,
+		limit_high: 0x7,
+		sw: 0,
+		reserved: 0,
+		opsize: 1,
+		gran: 1,
+		base_high: 0
+	},
 };
 
 struct X86DescriptorTablePointer {