run wasm tests

JonasKruckenberg · JonasKruckenberg · Jan 20, 2025 · Jan 17, 2025 · Jan 17, 2025 · Jan 17, 2025
commit b1ede09baa29ca1d33d074d040ac40b14b294176
diff --git a/kernel/fib_cpp.wat b/kernel/fib_cpp.wat
@@ -97,7 +97,7 @@
     local.get 21
     return)
   (table (;0;) 1 1 funcref)
-  (memory (;0;) 2)
+  (memory (;0;) 1)
   (global (;0;) (mut i32) (i32.const 66560))
   (export "memory" (memory 0))
   (export "fib" (func 0))

diff --git a/kernel/src/main.rs b/kernel/src/main.rs
@@ -60,7 +60,7 @@ pub const TRAP_STACK_SIZE_PAGES: usize = 64; // TODO find a lower more appropria
 /// doesn't cause startup slowdown & inefficient mapping, but large enough so we can bootstrap
 /// our own virtual memory subsystem. At that point we are no longer reliant on this initial heap
 /// size and can dynamically grow the heap as needed.
-pub const INITIAL_HEAP_SIZE_PAGES: usize = 4096; // 32 MiB
+pub const INITIAL_HEAP_SIZE_PAGES: usize = 4096 * 2; // 32 MiB
 
 pub type Result<T> = core::result::Result<T, Error>;
 
@@ -132,7 +132,7 @@ fn main(hartid: usize, boot_info: &'static BootInfo) -> ! {
         Instant::now().duration_since(Instant::ZERO),
         Instant::from_ticks(boot_info.boot_ticks).elapsed()
     );
-    // wasm::test();
+    wasm::test();
 
     // - [all][global] parse cmdline
     // - [all][global] `vm::init()` init virtual memory management

diff --git a/kernel/src/vm/address_space.rs b/kernel/src/vm/address_space.rs
@@ -38,10 +38,10 @@ pub enum AddressSpaceKind {
 /// Represents the address space of a process (or the kernel).
 pub struct AddressSpace {
     /// A binary search tree of regions that make up this address space.
-    pub(super) regions: wavltree::WAVLTree<AddressSpaceRegion>,
+    pub(crate) regions: wavltree::WAVLTree<AddressSpaceRegion>,
     /// The hardware address space backing this "logical" address space that changes need to be
     /// materialized into in order to take effect.
-    pub(super) arch: arch::AddressSpace,
+    pub arch: arch::AddressSpace,
     /// The maximum range this address space can encompass.
     ///
     /// This is used to check new mappings against and speed up page fault handling.

diff --git a/kernel/src/vm/mod.rs b/kernel/src/vm/mod.rs
@@ -36,6 +36,9 @@ use sync::{LazyLock, Mutex, OnceLock};
 pub use trap_handler::trap_handler;
 pub use user_mmap::UserMmap;
 use xmas_elf::program::Type;
+pub use vmo::Vmo;
+pub use frame_list::FrameList;
+pub use address_space::Batch;
 
 pub static KERNEL_ASPACE: OnceLock<Mutex<AddressSpace>> = OnceLock::new();
 static THE_ZERO_FRAME: LazyLock<Frame> = LazyLock::new(|| {
@@ -71,18 +74,7 @@ pub fn init(boot_info: &BootInfo, minfo: &MachineInfo) -> crate::Result<()> {
 
         Ok(Mutex::new(aspace))
     })?;
-
-    // let mut aspace = vm::AddressSpace::new_user(2, Some(ChaCha20Rng::from_seed(
-    //     minfo.rng_seed.unwrap()[0..32].try_into().unwrap(),
-    // ))).unwrap();
-    // unsafe { aspace.arch.activate(); }
-    // log::trace!("everything is fine?!");
-    //
-    // let layout = Layout::from_size_align(5 * arch::PAGE_SIZE, arch::PAGE_SIZE).unwrap();
-    // let vmo = Vmo::new_paged(iter::repeat_n(THE_ZERO_FRAME.clone(), 5));
-    // let range = aspace.map(layout, vmo, 0, Permissions::READ | Permissions::WRITE, None).unwrap().range;
-    // log::trace!("{region:?}");
-
+
     Ok(())
 }