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

diff --git a/kernel/arch/x86/descriptors.cc b/kernel/arch/x86/descriptors.cc
index 8619e1c..65b146e 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,
@@ -44,7 +44,7 @@ Descriptor x86_gdt[1024] = {
 		gran: 1,
 		base_high: 0
 	},
-	{   // 0x10: code
+	{   // 0x10: kernel code
 		limit_low: 0xffff,
 		base_low: 0,
 		base_mid: 0,
@@ -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: 0x7f,
+		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: 0x7f,
+		sw: 0,
+		reserved: 0,
+		opsize: 1,
+		gran: 1,
+		base_high: 0
+	},
 };
 
 struct X86DescriptorTablePointer {
@@ -152,7 +182,8 @@ static void set_int_gate(int num, void *addrptr, bool ints_off = false,
 }
 
 extern int x86_diverr, x86_debug, x86_breakpoint;
-extern int x86_gpf, x86_page_fault, x86_invalid_insn, x86_int99_entry;
+extern int x86_gpf, x86_page_fault, x86_invalid_insn;
+extern int x86_int98_entry, x86_int99_entry;
 extern void *x86_irqs[256];
 
 namespace Arch {
@@ -170,7 +201,8 @@ namespace Priv {
 		set_int_gate(6, &x86_invalid_insn);
 		set_int_gate(13, &x86_gpf);
 		set_int_gate(14, &x86_page_fault, true);
-		set_int_gate(0x99, &x86_int99_entry);
+		set_int_gate(0x98, &x86_int98_entry, false, true);
+		set_int_gate(0x99, &x86_int99_entry, false, true);
 		
 		for (int i = 0x20; i < 0x30; i++)
 			set_int_gate(i, x86_irqs[i], true);