Moved tss.h to include/ and fixed TSS address

MarcinWieczorek · Sep 1, 2018 · 6648f12 · 6648f12
1 parent 317aab1
commit 6648f12
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/kernel/tss.h → include/kernel/tss/tss.h b/kernel/tss.h → include/kernel/tss/tss.h
@@ -3,7 +3,7 @@
 
 #include <stdint.h>
 
-#define TSS_ADDRESS (void *) 0xC24
+#define TSS_ADDRESS (void *) 0xC2C
 
 struct tss_entry_struct {
    uint32_t prev_tss;   // The previous TSS - if we used hardware task switching this would form a linked list.

diff --git a/kernel/kernel.c b/kernel/kernel.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 
 #include <kernel/idt.h>
-#include <kernel/tss.h>
+#include <kernel/tss/tss.h>
 
 #include <drivers/screen.h>
 

diff --git a/kernel/tss.c → kernel/tss/tss.c b/kernel/tss.c → kernel/tss/tss.c
@@ -1,6 +1,7 @@
-#include <kernel/tss.h>
 #include <string.h>
 
+#include <kernel/tss/tss.h>
+
 tss_entry_t tss_entry;
 
 void tss_write(gdt_entry_bits *g) {
@@ -25,8 +26,11 @@ void tss_write(gdt_entry_bits *g) {
 
    memset(&tss_entry, 0, sizeof(tss_entry));
 
+   tss_entry.esp0 = 0x8ffa0; // Set the kernel stack pointer.
+   /* tss_entry.esp0 = 0x40000; // Set the kernel stack pointer. */
+   /* __asm__("movl %%esp, %0" */
+   /*         : "=a" (tss_entry.esp0)); */
    tss_entry.ss0  = 0x13;   // Set the kernel stack segment.
-   tss_entry.esp0 = 0x452B; // Set the kernel stack pointer.
 }
 
 void tss_install() {

diff --git a/kernel/tss_flush.asm → kernel/tss/tss_flush.asm b/kernel/tss_flush.asm → kernel/tss/tss_flush.asm