Merge pull request rustsbi#44 from YdrMaster/main

fix: 改正软中断测试

Author: luojia65

bench-kernel/build.rs

@@ -4,6 +4,7 @@ fn main() {
     let ld = PathBuf::from(env::var_os("OUT_DIR").unwrap()).join("linker.ld");
     fs::write(&ld, LINKER).unwrap();
     println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-env-changed=LOG");
     println!("cargo:rustc-link-arg=-T{}", ld.display());
 }
 
@@ -14,29 +15,25 @@ MEMORY {
     DRAM : ORIGIN = 0x80200000, LENGTH = 64M
 }
 SECTIONS {
-    .text : ALIGN(4) {
+    .text : {
         *(.text.entry)
         *(.text .text.*)
     } > DRAM
-    .rodata : ALIGN(8) {
-        srodata = .;
+    .rodata : {
         *(.rodata .rodata.*)
         *(.srodata .srodata.*)
-        . = ALIGN(8);
-        erodata = .;
     } > DRAM
-    .data : ALIGN(8) {
-        sdata = .;
+    .data : {
         *(.data .data.*)
         *(.sdata .sdata.*)
-        . = ALIGN(8);
-        edata = .;
     } > DRAM
-    .bss (NOLOAD) : ALIGN(8) {
+    .bss (NOLOAD) : {
         *(.bss.uninit)
+        . = ALIGN(8);
         sbss = .;
         *(.bss .bss.*)
         *(.sbss .sbss.*)
+        . = ALIGN(8);
         ebss = .;
     } > DRAM
     /DISCARD/ : {

bench-kernel/src/main.rs

@@ -47,7 +47,7 @@ extern "C" fn rust_main(hartid: usize, _dtb_pa: usize) -> ! {
     // 测试调用延迟
     let t0 = time::read();
 
-    for _ in 0..0xffff {
+    for _ in 0..0x20000 {
         let _ = sbi_rt::get_marchid();
     }
 
@@ -56,21 +56,25 @@ extern "C" fn rust_main(hartid: usize, _dtb_pa: usize) -> ! {
     // 测试中断响应延迟
     let t0 = time::read();
 
-    for _ in 0..0xffff {
+    for _ in 0..0x20000 {
         unsafe {
             core::arch::asm!(
                 "   la   {0}, 1f
                     csrw stvec, {0}
+                    mv   a0, a2
+                    mv   a1, zero
                     ecall
                     wfi
                 .align 2
-                1:
+                1:  csrrci zero, sip, 1 << 1
+
                 ",
                 out(reg) _,
                 in("a7") 0x735049,
                 in("a6") 0,
-                in("a0") 1 << hartid,
+                in("a0") 0,
                 in("a1") 0,
+                in("a2") 1 << hartid,
                 options(nomem),
             );
         }

rustsbi-qemu/build.rs

@@ -4,6 +4,7 @@ fn main() {
     let ld = &PathBuf::from(env::var_os("OUT_DIR").unwrap()).join("linker.ld");
     fs::write(ld, LINKER).unwrap();
     println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-env-changed=LOG");
     println!("cargo:rustc-link-arg=-T{}", ld.display());
 }
 

rustsbi-qemu/src/trap_vec.rs

@@ -53,10 +53,11 @@ unsafe extern "C" fn mtimer() {
         // mscratch: S sp
         "   csrrw sp, mscratch, sp",
         // 保护
-        "   sd    ra, -1*8(sp)
-            sd    a0, -2*8(sp)
-            sd    a1, -3*8(sp)
-            sd    a2, -4*8(sp)
+        "   addi  sp, sp, -4*8
+            sd    ra, 0*8(sp)
+            sd    a0, 1*8(sp)
+            sd    a1, 2*8(sp)
+            sd    a2, 3*8(sp)
         ",
         // 清除 mtimecmp
         "   la    a0, {clint_ptr}
@@ -70,10 +71,11 @@ unsafe extern "C" fn mtimer() {
             csrrs zero, mip, a0
         ",
         // 恢复
-        "   ld    ra, -1*8(sp)
-            ld    a0, -2*8(sp)
-            ld    a1, -3*8(sp)
-            ld    a2, -4*8(sp)
+        "   ld    ra, 0*8(sp)
+            ld    a0, 1*8(sp)
+            ld    a1, 2*8(sp)
+            ld    a2, 3*8(sp)
+            addi  sp, sp,  4*8
         ",
         // 换栈：
         // sp      : S sp
@@ -103,9 +105,10 @@ unsafe extern "C" fn msoft() {
         // mscratch: S sp
         "   csrrw sp, mscratch, sp",
         // 保护
-        "   sd   ra, -1*8(sp)
-            sd   a0, -2*8(sp)
-            sd   a1, -3*8(sp)
+        "   addi sp, sp, -3*8
+            sd   ra, 0*8(sp)
+            sd   a0, 1*8(sp)
+            sd   a1, 2*8(sp)
         ",
         // 清除 msip 设置 ssip
         "   la   a0, {clint_ptr}
@@ -115,9 +118,10 @@ unsafe extern "C" fn msoft() {
             csrrsi zero, mip, 1 << 1
         ",
         // 恢复
-        "   ld   ra, -1*8(sp)
-            ld   a0, -2*8(sp)
-            ld   a1, -3*8(sp)
+        "   ld   ra, 0*8(sp)
+            ld   a0, 1*8(sp)
+            ld   a1, 2*8(sp)
+            addi sp, sp,  3*8
         ",
         // 换栈：
         // sp      : S sp

test-kernel/build.rs

@@ -4,6 +4,7 @@ fn main() {
     let ld = PathBuf::from(env::var_os("OUT_DIR").unwrap()).join("linker.ld");
     fs::write(&ld, LINKER).unwrap();
     println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-env-changed=LOG");
     println!("cargo:rustc-link-arg=-T{}", ld.display());
 }
 
@@ -14,29 +15,25 @@ MEMORY {
     DRAM : ORIGIN = 0x80200000, LENGTH = 64M
 }
 SECTIONS {
-    .text : ALIGN(4) {
+    .text : {
         *(.text.entry)
         *(.text .text.*)
     } > DRAM
-    .rodata : ALIGN(8) {
-        srodata = .;
+    .rodata : {
         *(.rodata .rodata.*)
         *(.srodata .srodata.*)
-        . = ALIGN(8);
-        erodata = .;
     } > DRAM
-    .data : ALIGN(8) {
-        sdata = .;
+    .data : {
         *(.data .data.*)
         *(.sdata .sdata.*)
-        . = ALIGN(8);
-        edata = .;
     } > DRAM
-    .bss (NOLOAD) : ALIGN(8) {
+    .bss (NOLOAD) : {
         *(.bss.uninit)
+        . = ALIGN(8);
         sbss = .;
         *(.bss .bss.*)
         *(.sbss .sbss.*)
+        . = ALIGN(8);
         ebss = .;
     } > DRAM
     /DISCARD/ : {