submit

.cargo/linker-qemu.ld

@@ -40,9 +40,11 @@ SECTIONS
 
     .bss ALIGN(4K): {
         sbss = .;
+        .=ALIGN(4K);
         *(.bss.stack)
         *(.bss .bss.*)
         *(.sbss .sbss.*)
+        .a=ALIGN(4k);
         ebss = .;
     }
 

Cargo.toml

@@ -8,6 +8,7 @@ members = [
     "crates/timestamp",
     "crates/vfscore",
     "crates/cv1811-sd",
+    "crates/kcov",
 
     # modules
     "modules/logging",

Makefile

@@ -52,16 +52,16 @@ all:
 	cp -R cargo .cargo
 	RUST_BACKTRACE=1 LOG=$(LOG) cargo build $(RUST_BUILD_OPTIONS) --features "$(features)" --offline
 #	cp $(SBI) sbi-qemu
-#	cp $(KERNEL_ELF) kernel-qemu
-	rust-objcopy --binary-architecture=riscv64 $(KERNEL_ELF) --strip-all -O binary os.bin
+	cp $(KERNEL_ELF) kernel-qemu
+# rust-objcopy --binary-architecture=riscv64 $(KERNEL_ELF) --strip-all -O binary os.bin
 
 fs-img:
 	rm -f $(FS_IMG)
 	dd if=/dev/zero of=$(FS_IMG) bs=1M count=300
 	mkfs.vfat -F 32 $(FS_IMG)
 	sudo mount $(FS_IMG) mount/ -o uid=1000,gid=1000
 	rm -rf mount/*
-	-cp -rf tools/testcase-final2023/* mount/
+	-cp -rf tools/testcase-bench/* mount/
 	sudo umount $(FS_IMG)
 
 build:
@@ -99,7 +99,7 @@ debug: fs-img build
 clean:
 	rm -rf target/
 
-gdb:
+gdb:rust addr2line
 	riscv64-elf-gdb \
         -ex 'file $(KERNEL_ELF)' \
         -ex 'set arch riscv:rv64' \

arch/src/riscv64/boards/qemu.rs

@@ -6,6 +6,7 @@ pub fn init_device(hartid: usize, device_tree: usize) -> (usize, usize) {
     // 开启SUM位 让内核可以访问用户空间  踩坑：
     // only in qemu. eg: qemu is riscv 1.10  NOTE: k210 is riscv 1.9.1
     // in 1.10 is SUM but in 1.9.1 is PUM which is the opposite meaning with SUM
+
     unsafe {
         sstatus::set_sum();
     }

crates/vfscore/src/lib.rs

@@ -342,6 +342,10 @@ pub trait INodeInterface: DowncastSync + Send + Sync {
     fn poll(&self, _events: PollEvent) -> VfsResult<PollEvent> {
         Err(VfsError::NotSupported)
     }
+
+    fn after_mmap(&self, _addr: usize, _size: usize) -> VfsResult<()> {
+        Err(VfsError::NotSupported)
+    }
 }
 
 impl_downcast!(sync INodeInterface);