4 files changed, 32 insertions, 6 deletions

diff --git a/src/core/asm.hpp b/src/core/asm.hpp
index 8a931f6..a1d7437 100644
--- a/src/core/asm.hpp
+++ b/src/core/asm.hpp
@@ -21,3 +21,6 @@
 
 #define inb(port,dst) \
     asm volatile ("inb %%dx, %%al": "=a" (dst) : "d" (port))
+
+#define lpml4(pml4) \
+    asm volatile ("mov %0, %%rax; mov %%rax, %%cr3":: "r" (pml4))
diff --git a/src/core/gdt.S b/src/core/gdt.S
index f928b3f..c32db59 100644
--- a/src/core/gdt.S
+++ b/src/core/gdt.S
@@ -1,4 +1,5 @@
 .code64
+.global gdt64_tss
 
 gdt64:
     gdt64_null:
@@ -15,6 +16,22 @@ gdt64:
     .byte 0
     .byte 0b10010010
     .word 0
+    gdt64_cs_user:
+    .long 0
+    .byte 0
+    .byte 0b11111100
+    .byte 0b00100000
+    .byte 0
+    gdt64_ds_user:
+    .long 0
+    .byte 0
+    .byte 0b11110010
+    .word 0
+    gdt64_tss:
+    .long 0
+    .long 0
+    .long 0
+    .long 0
 gdtr:
     .word . - gdt64 - 1
     .quad gdt64
diff --git a/src/core/paging.cc b/src/core/paging.cc
index b12fb4c..bad776f 100644
--- a/src/core/paging.cc
+++ b/src/core/paging.cc
@@ -1,4 +1,5 @@
 #include "paging.hpp"
+#include "core/asm.hpp"
 #include "core/types.hpp"
 #include "libs/stdio.hpp"
 #include "libs/string.hpp"
@@ -47,10 +48,7 @@ void paging_enable() {
     
     // Load new pml4
     u64 kpage_phy=((u64)kpages[0]-kvar_kernel_vma);
-    asm volatile(
-        "mov %0, %%rax        \n\t"
-        "mov %%rax, %%cr3     \n\t"
-        :: "r" (kpage_phy));
+    lpml4(kpage_phy);
 }
 
 u64* paging_allocate_contiguous(int npages){
@@ -187,6 +185,13 @@ void paging_allocate_addr(u64* pml4_table, u64 virt, u64 phy, u16 options, char
 
 u64* paging_create_task(int npages){
     u64 *pml4=PAGE_ALLOCATE();
-   // paging_allocate_addr(pml4, 0, (u64)PAGE_ALLOCATE(), PAGING_OPT_P|PAGING_OPT_RW, 0);
+
+    for(int i=0;i<npages;i++)
+        paging_allocate_addr(pml4, 0, (u64)PAGE_ALLOCATE(), PAGING_OPT_P|PAGING_OPT_RW, 0);
+
+    // Enable kernel access
+    u16 pml4_entry=kvar_kernel_vma>>39&0x1FF;
+    pml4[pml4_entry]=kpages[0][pml4_entry];
+
     return pml4;
 }
\ No newline at end of file
diff --git a/src/core/paging.hpp b/src/core/paging.hpp
index 641821f..caaaf9e 100644
--- a/src/core/paging.hpp
+++ b/src/core/paging.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "core/types.hpp"
+#include "types.hpp"
+#include "asm.hpp"
 
 /**
  * Current number of page (from the beginning of the ram) used by the kernel that