Paging tests

mrgian · Jul 1, 2023 · a6ad846 · a6ad846
1 parent 9b2a49b
commit a6ad846
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/apps/hello/linker.ld b/apps/hello/linker.ld
@@ -1,7 +1,7 @@
 ENTRY(_start)
 
 SECTIONS {
-    . = 0x00500000;
+    . = 0x02000000;
 
     .start_marker :
     {

diff --git a/kernel/src/main.rs b/kernel/src/main.rs
@@ -20,6 +20,7 @@ use interrupts::idt::IDT;
 use shell::shell::SHELL;
 use syscalls::print::PRINTER;
 use memory::paging::PAGING;
+use memory::paging::TABLES;
 use memory::paging::PageTable;
 
 use multitasking::task::TASK_MANAGER;
@@ -50,6 +51,10 @@ pub extern "C" fn _start() -> ! {
     //setup paging
     unsafe {
         PAGING.identity();
+
+        TABLES[8].set(0x00a0_0000);
+        PAGING.set_table(8, &TABLES[8]);
+
         PAGING.enable();
     }
 

diff --git a/kernel/src/memory/paging.rs b/kernel/src/memory/paging.rs
@@ -33,10 +33,10 @@ impl PageDirectory {
         }
     }
 
-    //indentity page first 16MiB
+    //indentity page first 32MiB
     pub fn identity(&mut self) {
         unsafe {
-            for i in 0..4 {
+            for i in 0..8 {
                 TABLES[i].set((0x0040_0000 * i) as u32);
                 PAGING.set_table(i, &TABLES[i]);
             }

diff --git a/kernel/src/multitasking/task.rs b/kernel/src/multitasking/task.rs
@@ -241,7 +241,7 @@ fn task_a() {
     let mut a: u32 = 0;
     let mut b: u8 = 0;
     loop {
-        if a == 300_000_000 {
+        if a == 100_000_000 {
             libfelix::println!("Process A running. {}% complete.", b);
             a = 0;
             b += 1;
@@ -260,7 +260,7 @@ fn task_b() {
     let mut a: u32 = 0;
     let mut b: u8 = 0;
     loop {
-        if a == 300_000_000 {
+        if a == 100_000_000 {
             libfelix::println!("Process B running. {}% complete.", b);
             a = 0;
             b += 1;
@@ -279,7 +279,7 @@ fn task_c() {
     let mut a: u32 = 0;
     let mut b: u8 = 0;
     loop {
-        if a == 300_000_000 {
+        if a == 100_000_000 {
             libfelix::println!("Process C running. {}% complete.", b);
             a = 0;
             b += 1;

diff --git a/kernel/src/shell/shell.rs b/kernel/src/shell/shell.rs
@@ -4,7 +4,7 @@ use crate::filesystem::fat::FAT;
 use crate::syscalls::print::PRINTER;
 use crate::multitasking::task::TASK_MANAGER;
 
-const APP_TARGET: u32 = 0x0050_0000;
+const APP_TARGET: u32 = 0x00a0_0000;
 const APP_SIGNATURE: u32 = 0xB16B00B5;
 
 const HELP: &'static str = "Available commands: