Fix disablePaging() and loadPageTable() functions.

The-HaribOS-Organization · Dec 30, 2023 · 621d809 · 621d809
1 parent 3642454
commit 621d809
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/include/memory/page_table.h b/include/memory/page_table.h
@@ -20,16 +20,16 @@ struct page_entry_t {
     UINT32 address : 20;
 } __attribute__((packed));
 
-inline disablePaging() {
+inline void disablePaging() {
 
     UINT32 cr0;
     __asm__ volatile("mov %%cr0, %0" : "=r"(cr0));
 
-    cr0 ~= 0x80000000;
+    cr0 ^= 0x80000000;
     __asm__ volatile("mov %0, %%cr0" :: "r"(cr0));
 }
 
-inline enablePaging() {
+inline void enablePaging() {
 
     UINT32 cr0;
     __asm__ volatile("mov %%cr0, %0" : "=r"(cr0));

diff --git a/src/memory/page_table.c b/src/memory/page_table.c
@@ -23,5 +23,5 @@ void loadPageTable() {
     fillTable();
 
     page_directory[0] = ((UINT32)page_table) | 3;
-    __asm__ volatile ("mov %0, %%cr3" :: "r"&page_directory);
+    __asm__ volatile ("mov %0, %%cr3" :: "r"(&page_directory));
 }