finish arch

kernel/rustkernel/src/arch/mod.rs

@@ -1,5 +1,5 @@
 #[cfg(target_arch = "riscv64")]
-pub mod riscv;
+mod riscv;
 #[cfg(target_arch = "riscv64")]
 pub use riscv::hardware;
 
@@ -43,6 +43,11 @@ pub mod mem {
     }
 }
 
+pub mod virtual_memory {
+    #[cfg(target_arch = "riscv64")]
+    pub use super::riscv::virtual_memory::{kvminit as init, kvminithart as inithart, copyin, copyinstr, copyout, mappages, uvmalloc, uvmcopy, uvmcreate, uvmdealloc, uvmfree, uvmunmap};
+}
+
 pub mod power {
     #[cfg(target_arch = "riscv64")]
     pub use super::riscv::power::shutdown;

kernel/rustkernel/src/arch/riscv/mod.rs

@@ -7,8 +7,7 @@ pub mod plic;
 pub mod power;
 pub mod start;
 pub mod trap;
-
+pub mod virtual_memory;
-pub use mem::make_satp;
 
 /// Previous mode
 pub const MSTATUS_MPP_MASK: u64 = 3 << 11;

kernel/rustkernel/src/arch/riscv/virtual_memory.rs

@@ -1,3 +1,4 @@
+use super::{asm, mem::{make_satp, pte2pa}, plic::PLIC, power::QEMU_POWER};
 use crate::{
     arch::{
         self,
@@ -6,7 +7,6 @@ use crate::{
             round_down_page, round_up_page, Pagetable, PagetableEntry, KERNEL_BASE, PAGE_SIZE,
             PHYSICAL_END, PTE_R, PTE_U, PTE_V, PTE_W, PTE_X, TRAMPOLINE, VIRTUAL_MAX,
         },
-        riscv::{asm, make_satp, mem::pte2pa, plic::PLIC, power::QEMU_POWER},
     },
     mem::{
         kalloc::{kalloc, kfree},

kernel/rustkernel/src/fs/file.rs

@@ -3,7 +3,7 @@
 use crate::{
     fs::{log, stat::Stat},
     io::pipe::Pipe,
-    mem::virtual_memory::copyout,
+    arch::virtual_memory::copyout,
     proc::process::Process,
     sync::{sleeplock::Sleeplock, spinlock::Spinlock},
 };

kernel/rustkernel/src/io/pipe.rs

@@ -1,9 +1,7 @@
 use crate::{
     fs::file::{filealloc, fileclose, File, FileType},
-    mem::{
+    mem::kalloc::{kalloc, kfree},
-        kalloc::{kalloc, kfree},
+    arch::virtual_memory::{copyin, copyout},
-        virtual_memory::{copyin, copyout},
-    },
     proc::{process::Process, scheduler::wakeup},
     sync::spinlock::Spinlock,
 };

kernel/rustkernel/src/lib.rs

@@ -59,8 +59,8 @@ pub unsafe fn main() -> ! {
         console::consoleinit();
         mem::kalloc::kinit();
         println!("\nxv6 kernel is booting");
-        mem::virtual_memory::kvminit();
+        arch::virtual_memory::init();
-        mem::virtual_memory::kvminithart();
+        arch::virtual_memory::inithart();
         proc::process::procinit();
         arch::trap::inithart();
         arch::interrupt::init();
@@ -75,7 +75,7 @@ pub unsafe fn main() -> ! {
         while !STARTED {
             core::hint::spin_loop();
         }
-        mem::virtual_memory::kvminithart();
+        arch::virtual_memory::inithart();
         arch::trap::inithart();
         arch::interrupt::inithart();
     }

kernel/rustkernel/src/mem/mod.rs

@@ -1,5 +1,4 @@
 pub mod kalloc;
-pub mod virtual_memory;
 
 #[no_mangle]
 pub unsafe extern "C" fn memset(dst: *mut u8, data: i32, max_bytes: u32) -> *mut u8 {

kernel/rustkernel/src/proc/process.rs

@@ -10,6 +10,9 @@ use crate::{
     arch::{
         mem::{Pagetable, PAGE_SIZE, PTE_R, PTE_W, PTE_X, TRAMPOLINE, TRAPFRAME},
         trap::InterruptBlocker,
+        virtual_memory::{
+            copyout, mappages, uvmalloc, uvmcopy, uvmcreate, uvmdealloc, uvmfree, uvmunmap,
+        },
     },
     fs::{
         file::{fileclose, filedup, File, Inode},
@@ -19,9 +22,6 @@ use crate::{
     mem::{
         kalloc::{kalloc, kfree},
         memset,
-        virtual_memory::{
-            copyout, mappages, uvmalloc, uvmcopy, uvmcreate, uvmdealloc, uvmfree, uvmunmap,
-        },
     },
     sync::spinlock::Spinlock,
     uprintln,

kernel/rustkernel/src/syscall.rs

@@ -1,12 +1,11 @@
 use crate::{
-    arch::{clock::CLOCK_TICKS, power::shutdown},
+    arch::{clock::CLOCK_TICKS, power::shutdown, virtual_memory::{copyin, copyinstr}},
     fs::{
         self,
         file::{self, File},
         log::LogOperation,
         stat::KIND_DIR,
     },
-    mem::virtual_memory::{copyin, copyinstr},
     println,
     proc::process::Process,
     string::strlen,