Enable paging

8 files changed, 44 insertions, 212 deletions

diff --git a/src/utils/8042.c b/src/utils/8042.c
deleted file mode 100644
index 1d22152..0000000
--- a/src/utils/8042.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "8042.h"
-#include "framebuffer.h"
-#include "asm.h"
-
-DEFINE_AZERTY;
-
-void _8042_keypress(){
-    u8 data;
-    do {
-        inb(0x64,data);
-    }
-    while((data&0x01) == 0);
-    inb(0x60,data);
-    if(data<0x80)
-        putchar(AZERTY[data]);
-}
diff --git a/src/utils/8042.h b/src/utils/8042.h
deleted file mode 100644
index 8efa8ce..0000000
--- a/src/utils/8042.h
+++ /dev/null
@@ -1,64 +0,0 @@
-#ifndef _8042_H
-#define _8042_H
-
-#include "types.h"
-
-void _8042_keypress();
-
-#define DEFINE_AZERTY char AZERTY[]={\
-    '\0',\
-    '\0',\
-    '&',\
-    '\0',\
-    '"',\
-    '\'',\
-    '(',\
-    '-',\
-    '\0',\
-    '_',/* 10 */\
-    '\0',\
-    '\0',\
-    ')',\
-    '=',\
-    '\0',\
-    '\t',\
-    'a',\
-    'z',\
-    'e',\
-    'r',\
-    't',\
-    'y',\
-    'u',\
-    'i',\
-    'o',\
-    'p',\
-    '^',\
-    '$',\
-    '\0',\
-    '\0',\
-    'q',/* 0x1E (30) */\
-    's',\
-    'd',\
-    'f',\
-    'g',\
-    'h',\
-    'j',\
-    'k',\
-    'l',\
-    'm',\
-    '\0',\
-    '\0',\
-    '\0',\
-    '*',\
-    'w',\
-    'x',\
-    'c',\
-    'v',\
-    'b',/* 0x30 (48) */\
-    'n',\
-    ',',\
-    ';',\
-    ':',\
-}
-
-#endif
\ No newline at end of file
diff --git a/src/utils/gdt.c b/src/utils/gdt.c
index c380283..8c1c70d 100644
--- a/src/utils/gdt.c
+++ b/src/utils/gdt.c
@@ -35,13 +35,13 @@ void gdt_memcpy(){
 
   // ----- User Segments
   GDT_ENTRY ucs_desc;
-  ucs_desc.base=0x300000;
+  ucs_desc.base=0; // With paging will take care of allocating the right address for each task
   ucs_desc.limit=0xFFFFF;
   ucs_desc.flags=GDT_SZ|GDT_GR;
   ucs_desc.access=GDT_PR|GDT_PRVL_3|GDT_S|GDT_EXEC|GDT_RW|GDT_DC;
   
   GDT_ENTRY uds_desc;
-  uds_desc.base=0x300000;
+  uds_desc.base=0;
   uds_desc.limit=0xFFFFF;
   uds_desc.flags=GDT_SZ|GDT_GR;
   uds_desc.access=GDT_PR|GDT_PRVL_3|GDT_S|GDT_RW;
diff --git a/src/utils/paging.c b/src/utils/paging.c
new file mode 100644
index 0000000..b1f462f
--- /dev/null
+++ b/src/utils/paging.c
@@ -0,0 +1,31 @@
+#include "paging.h"
+
+void paging_enable(){
+    int *page_dir=(int*)PAGING_DIR_LOCATION;
+    int *page_table=(int*)PAGING_TABLE_LOCATION;
+
+    // Init page directory
+    for(int i=0;i<1024;i++)
+        page_dir[i]=0;
+    page_dir[0]=(int)page_table;
+    page_dir[0] |=7; // Permissions
+
+    // Init page table 0
+    int addr_offset=0;
+    for(int i=0;i<1024;i++){
+        page_table[i]=addr_offset;
+        page_table[i]|=7; // Permission
+        addr_offset+=4096; // 4Ko pages
+    }
+
+    // Turns on paging
+    asm(
+        "movl %0, %%eax       \n\t"
+        "movl %%eax, %%cr3    \n\t" // Configure page table location
+        "movl %%cr0, %%eax    \n\t"
+        "orl %1, %%eax        \n\t"
+        "movl %%eax, %%cr0    \n\t" // Turn on paging
+        :: "i" (PAGING_DIR_LOCATION), "i" (PAGING_CR0_BIT)
+    );
+
+}
\ No newline at end of file
diff --git a/src/utils/paging.h b/src/utils/paging.h
new file mode 100644
index 0000000..3e6b3f8
--- /dev/null
+++ b/src/utils/paging.h
@@ -0,0 +1,10 @@
+#ifndef PAGING_H
+#define PAGING_H
+
+#define PAGING_CR0_BIT 0x80000000
+#define PAGING_DIR_LOCATION 0x1000
+#define PAGING_TABLE_LOCATION 0x5000
+
+void paging_enable();
+
+#endif
\ No newline at end of file
diff --git a/src/utils/pic.c b/src/utils/pic.c
deleted file mode 100644
index 7681a13..0000000
--- a/src/utils/pic.c
+++ /dev/null
@@ -1,105 +0,0 @@
-#include "pic.h"
-#include "asm.h"
-#include "mem.h"
-#include "syscall.h"
-
-struct IDT_REGISTER IDTR={
-    200*8,
-    0x0
-};
-
-/// Bridge between IDT and functions call
-asm (
-".macro  SAVE_REGS        \n\t"
-    "pushal               \n\t"
-    "push %ds             \n\t"
-    "push %es             \n\t"
-    "push %fs             \n\t"
-    "push %gs             \n\t"
-    "push %ebx            \n\t"
-    "mov $0x10,%bx        \n\t"
-    "mov %bx,%ds          \n\t"
-    "pop %ebx             \n\t"
-".endm                    \n\t"
-".macro  RESTORE_REGS     \n\t"
-    "pop %gs              \n\t"
-    "pop %fs              \n\t"
-    "pop %es              \n\t"
-    "pop %ds              \n\t"
-    "popal                \n\t"
-".endm                    \n\t"
-"PIC_IRQ_DEFAULT:         \n\t"
-    "SAVE_REGS            \n\t"
-    "movb $0x20, %al      \n\t"
-    "outb %al, $0x20      \n\t"
-    "RESTORE_REGS         \n\t"
-    "iret                 \n\t"
-"PIC_IRQ_PRINT:           \n\t"
-    "SAVE_REGS            \n\t"
-    "call _8042_keypress  \n\t"
-    "movb $0x20, %al      \n\t"
-    "outb %al, $0x20      \n\t"
-    "RESTORE_REGS         \n\t"
-    "iret                 \n\t"
-"PIC_IRQ_CLOCK:           \n\t"
-    "SAVE_REGS            \n\t"
-    "call clock           \n\t"
-    "movb $0x20, %al      \n\t"
-    "outb %al, $0x20      \n\t"
-    "RESTORE_REGS         \n\t"
-    "iret                 \n\t"
-"PIC_IRQ_SYSCALL:         \n\t"
-    "SAVE_REGS            \n\t"
-    "call syscall         \n\t"
-    "movb $0x20, %al      \n\t"
-    "outb %al, $0x20      \n\t"
-    "RESTORE_REGS         \n\t"
-    "iret                 \n\t"
-);
-
-extern u32 PIC_IRQ_DEFAULT,PIC_IRQ_PRINT,PIC_IRQ_CLOCK, PIC_IRQ_SYSCALL;
-
-void pic_enable_interrupt(){
-    // Map first default 32 entries 
-    for(int i=0;i<200;i++){
-        pic_add_idt_entry((IDT_ENTRY){0x08,(u32)&PIC_IRQ_DEFAULT,IDT_INT_GATE},i);
-        if(i==32)
-            pic_add_idt_entry((IDT_ENTRY){0x08,(u32)&PIC_IRQ_CLOCK,IDT_INT_GATE},i);
-        if(i==33)
-            pic_add_idt_entry((IDT_ENTRY){0x08,(u32)&PIC_IRQ_PRINT,IDT_INT_GATE},i);
-        if(i==48)
-            pic_add_idt_entry((IDT_ENTRY){0x08,(u32)&PIC_IRQ_SYSCALL,IDT_TRAP_GATE},i);
-    }
-
-    // Now configure 8952A
-
-    // ICW1: Initialisation
-    outbj(0x20,0x11); // Master
-    outbj(0xA0,0x11); // Slave
-
-    // ICW2: Map IRQ index to entry into the IDT
-    outbj(0x21,0x20); // Start interrupt at offset 0x20 in IDT (index 32)
-    outbj(0xA1,0x70); // Start interrupt at offset 0x50 in IDT (index 80)
-
-    // ICW3: Indicate the connection between master and slave
-    outbj(0x21,0x02); // Slave connected to pin 2
-    outbj(0xA1,0x01); // Indicate pin id to the slave (2-1)
-
-    // ICW4: Operating mode
-    outbj(0x21,0x01); // Default operating mode
-    outbj(0xA1,0x01); // Default operating mode
-
-    // OCW: Masking
-    outbj(0x21,0b11111100);
-
-
-    asm("lidtl (IDTR)");
-    asm("sti");
-}
-
-void pic_add_idt_entry(IDT_ENTRY entry, int id){
-    int descriptor[2];
-    descriptor[0]=entry.offset & 0xFFFF | entry.segment << 16;
-    descriptor[1]=entry.type & 0xFFFF | entry.offset & 0xFFFF0000;
-    memcpy((void*)descriptor, (void *)(IDTR.base+(id*8)),8);
-}
diff --git a/src/utils/pic.h b/src/utils/pic.h
deleted file mode 100644
index 5ee1ab2..0000000
--- a/src/utils/pic.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef PIC_H
-#define PIC_H
-
-#include "types.h"
-
-#define IDT_INT_GATE 0x8E00
-#define IDT_TRAP_GATE 0xEF00
-
-typedef struct IDT_ENTRY {
-    u16 segment;
-    u32 offset;
-    u16 type;
-} IDT_ENTRY;
-
-struct IDT_REGISTER {
-    u16 limit;
-    u32 base;
-} __attribute__((packed));
-
-void pic_enable_interrupt();
-void pic_add_idt_entry(IDT_ENTRY entry,int id);
-
-#endif
\ No newline at end of file
diff --git a/src/utils/syscall.c b/src/utils/syscall.c
index f3b14c4..300b7aa 100644
--- a/src/utils/syscall.c
+++ b/src/utils/syscall.c
@@ -5,11 +5,10 @@
 void syscall(){
     int call_number;
     asm("movl %%eax, %0":"=m"(call_number));
-    int user_ds=gdt_user_ds_base();
     if(call_number==1){
         int msg_addr;
         asm("movl %%ebx, %0":"=m"(msg_addr));
-        char *msg=(char*)user_ds+msg_addr;
+        char *msg=(char*)msg_addr;
         print(msg);
     }
     else{