used mode swap test worked on qemu/k210+rustsbi

wyfcyx · wyfcyx · commit 41b2e69ae42e · 2020-09-06T13:14:57.000+08:00
diff --git a/os/src/linker.ld b/os/src/linker.ld
@@ -2,7 +2,7 @@
 OUTPUT_ARCH(riscv)
 ENTRY(_start)
 
-BASE_ADDRESS = 0xffffffff80200000;
+BASE_ADDRESS = 0xffffffff80020000;
 
 SECTIONS
 {
diff --git a/os/src/main.rs b/os/src/main.rs
@@ -73,6 +73,7 @@ pub extern "C" fn rust_main(_hart_id: usize, dtb_pa: PhysicalAddress) -> ! {
     crate::board::device_init(dtb_pa);
     fs::init();
 
+    /*
     {
         let mut processor = PROCESSOR.lock();
         println!("get processor!");
@@ -83,6 +84,8 @@ pub extern "C" fn rust_main(_hart_id: usize, dtb_pa: PhysicalAddress) -> ! {
         processor.add_thread(thread);
         println!("thread has been added!");
     }
+     */
+
     /*
     PROCESSOR.lock().add_thread(create_kernel_thread(
         Process::new_kernel().unwrap(),
@@ -91,6 +94,8 @@ pub extern "C" fn rust_main(_hart_id: usize, dtb_pa: PhysicalAddress) -> ! {
     ));
      */
 
+    PROCESSOR.lock().add_thread(create_user_process("user_shell"));
+
     extern "C" {
         fn __restore(context: usize);
     }
diff --git a/os/src/memory/mapping/mapping.rs b/os/src/memory/mapping/mapping.rs
@@ -112,10 +112,8 @@ impl Mapping {
                         page_data
                     };
 
-                    println!("vpn = {}", vpn);
                     // 建立映射，先检查是否有配额来分配新的物理页面
                     if !self.mapped_pairs.full() {
-                        println!("not full, alloc a new frame");
                         // 有配额，分配新的物理页面
                         let mut frame = FRAME_ALLOCATOR.lock().alloc()?;
                         // 更新页表
@@ -125,7 +123,6 @@ impl Mapping {
                         // 保存
                         self.mapped_pairs.push(vpn, frame, entry);
                     } else {
-                        println!("full!");
                         // 配额用完，改为在置换文件中分配一个页面
                         let swap_page = SwapTracker::new()?;
                         // 更新页表
diff --git a/os/src/process/process.rs b/os/src/process/process.rs
@@ -69,7 +69,6 @@ impl Process {
             range.end += alloc_size;
         }
         // 分配物理页面，建立映射
-        println!("start running stack mapping!");
         memory_set.add_segment(
             Segment {
                 map_type: MapType::Framed,
diff --git a/os/src/process/thread.rs b/os/src/process/thread.rs
@@ -62,7 +62,6 @@ impl Thread {
     ) -> MemoryResult<Arc<Thread>> {
         // 让所属进程分配并映射一段空间，作为线程的栈
         let stack = process.alloc_page_range(STACK_SIZE, Flags::READABLE | Flags::WRITABLE)?;
-        println!("stack = {}, {}", stack.start, stack.end);
 
         // 构建线程的 Context
         let context = Context::new(stack.end.into(), entry_point, arguments, process.is_user);
diff --git a/user/src/bin/swap_test.rs b/user/src/bin/swap_test.rs
@@ -0,0 +1,17 @@
+#![no_std]
+#![no_main]
+#[macro_use]
+extern crate user_lib;
+
+static mut array: [usize; 256 * 1024] = [0usize; 256 * 1024];
+#[no_mangle]
+pub unsafe fn main()->usize{
+    for i in 0..array.len() {
+        array[i] = i;
+    }
+    for i in 0..array.len() {
+        assert_eq!(i, array[i]);
+    }
+    println!("\x1b[32mtest passed\x1b[0m");
+    0
+}

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`OUTPUT_ARCH(riscv)`
`3`	`3`	`ENTRY(_start)`
`4`	`4`
`5`		`-BASE_ADDRESS = 0xffffffff80200000;`
	`5`	`+BASE_ADDRESS = 0xffffffff80020000;`
`6`	`6`
`7`	`7`	`SECTIONS`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,6 @@ impl Process {`
`69`	`69`	`range.end += alloc_size;`
`70`	`70`	`}`
`71`	`71`	`// 分配物理页面，建立映射`
`72`		`- println!("start running stack mapping!");`
`73`	`72`	`memory_set.add_segment(`
`74`	`73`	`Segment {`
`75`	`74`	`map_type: MapType::Framed,`