update

[polintos/scott/priv.git] / kernel / arch / x86 / descriptors.cc

diff --git a/kernel/arch/x86/descriptors.cc b/kernel/arch/x86/descriptors.cc
index 9a8d0ce630509f31f84a8cb5b917ca2d522e9e68..65b146e00c715567f9d6ef6466dec0474ce0c9b5 100644 (file)
--- a/kernel/arch/x86/descriptors.cc
+++ b/kernel/arch/x86/descriptors.cc
@@ -2,23 +2,15 @@
 //
 // This software is copyright (c) 2006 Scott Wood <scott@buserror.net>.
 // 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal with
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-// of the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following condition:
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors or contributors be held liable for any damages
+// arising from the use of this software.
 // 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-// CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
-// SOFTWARE.
+// Permission is hereby granted to everyone, free of charge, to use, copy,
+// modify, prepare derivative works of, publish, distribute, perform,
+// sublicense, and/or sell copies of the Software, provided that the above
+// copyright notice and disclaimer of warranty be included in all copies or
+// substantial portions of this software.
 
 #include <kern/types.h>
 #include <arch/addrs.h>
@@ -37,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,
@@ -52,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,
@@ -81,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 {
@@ -160,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 {
@@ -178,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);