feat：较大的更新合并，主要是让原本实现好的loongarch可以顺利接入，并且让riscv也能顺利运行大多数测试

.gitignore

@@ -44,12 +44,12 @@ testsuits-for-oskernel/
 
 # Logs
 os/loongarch.log
-
+*.log
 # Local notes
 os/可能的改进.md
 
 # Local agent guidance
 **/AGENTS.md
-
+**/CLAUDE.md
 # Local planning/refactor notes
 docs/

data/loongarch_musl/etc/init.d/rcS

@@ -12,6 +12,7 @@ echo "--- Starting Minimal BusyBox System ---"
 /bin/mount -t sysfs none /sys
 # tmpfs/devtmpfs: 临时文件系统和设备文件
 /bin/mount -t tmpfs none /tmp
+/bin/mount -t tmpfs none /var/tmp
 # /dev: 设备节点
 # 说明：即使内核已经提前挂载 /dev，这里再次 mount 也不会影响后续流程；
 # 且内核对 mount("/dev") 做了特殊处理：会在挂载 tmpfs 后自动 init_dev() 重建设备节点。
@@ -95,15 +96,57 @@ mount_official_test_image_if_present() {
     return 1
 }
 
+stage_musl_tests_to_tmpfs() {
+    src="/tests/musl"
+    dst="/tmp/tests/musl"
+
+    [ -d "$src" ] || return 1
+
+    /bin/rm -rf "$dst"
+    /bin/mkdir -p "$dst" || return 1
+
+    echo "[Tests] staging non-LTP musl tests to $dst"
+    for entry in "$src"/*; do
+        [ -e "$entry" ] || continue
+
+        base="${entry##*/}"
+        case "$base" in
+            ltp|ltp_testcode.sh)
+                continue
+                ;;
+        esac
+
+        if ! /bin/cp -a "$entry" "$dst/"; then
+            echo "[Tests] failed to stage $entry"
+            /bin/rm -rf "$dst"
+            return 1
+        fi
+    done
+
+    return 0
+}
+
 run_musl_tests_if_present() {
     # 官方测试镜像挂载到 /tests 后，当前自动入口只跑 musl 分组；
     # glibc 分组保留在测试镜像中，后续需要时直接调整本脚本。
     mount_official_test_image_if_present || true
     [ -d /tests/musl ] || return 1
 
+    staged_musl_dir=""
+    if stage_musl_tests_to_tmpfs; then
+        staged_musl_dir="/tmp/tests/musl"
+    else
+        echo "[Tests] staging failed; falling back to /tests/musl"
+    fi
+
     ran=0
     echo "[Tests] detected whitelisted musl test scripts; running in rcS"
-    export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/tests/musl"
+    if [ -n "$staged_musl_dir" ]; then
+        export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$staged_musl_dir:/tests/musl"
+    else
+        export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/tests/musl"
+    fi
+    export TMPDIR="/tmp"
     export HOME="/"
 
     for name in \
@@ -113,6 +156,9 @@ run_musl_tests_if_present() {
         iperf_testcode.sh
     do
         f="/tests/musl/$name"
+        if [ -n "$staged_musl_dir" ] && [ "$name" != "ltp_testcode.sh" ] && [ -f "$staged_musl_dir/$name" ]; then
+            f="$staged_musl_dir/$name"
+        fi
         [ -f "$f" ] || continue
 
         dir="${f%/*}"

data/loongarch_musl/symlinks.manifest

@@ -90,6 +90,8 @@ bin/usleep	busybox
 bin/vi	busybox
 bin/watch	busybox
 bin/zcat	busybox
+lib/libc.so	/tests/musl/lib/libc.so
+lib64/ld-musl-loongarch-lp64d.so.1	../lib/libc.so
 linuxrc	bin/busybox
 sbin/acpid	../bin/busybox
 sbin/adjtimex	../bin/busybox

data/loongarch_musl/var/tmp/.gitkeep

@@ -0,0 +1 @@
+

data/risc-v_musl/etc/init.d/rcS

@@ -12,6 +12,7 @@ echo "--- Starting Minimal BusyBox System ---"
 /bin/mount -t sysfs none /sys
 # tmpfs/devtmpfs: 临时文件系统和设备文件
 /bin/mount -t tmpfs none /tmp
+/bin/mount -t tmpfs none /var/tmp
 # /dev: 设备节点
 # 说明：即使内核已经提前挂载 /dev，这里再次 mount 也不会影响后续流程；
 # 且内核对 mount("/dev") 做了特殊处理：会在挂载 tmpfs 后自动 init_dev() 重建设备节点。
@@ -95,23 +96,76 @@ mount_official_test_image_if_present() {
     return 1
 }
 
+stage_musl_tests_to_tmpfs() {
+    src="/tests/musl"
+    dst="/tmp/tests/musl"
+
+    [ -d "$src" ] || return 1
+
+    /bin/rm -rf "$dst"
+    /bin/mkdir -p "$dst" || return 1
+
+    echo "[Tests] staging non-LTP musl tests to $dst"
+    for entry in "$src"/*; do
+        [ -e "$entry" ] || continue
+
+        base="${entry##*/}"
+        case "$base" in
+            ltp|ltp_testcode.sh)
+                continue
+                ;;
+        esac
+
+        if ! /bin/cp -a "$entry" "$dst/"; then
+            echo "[Tests] failed to stage $entry"
+            /bin/rm -rf "$dst"
+            return 1
+        fi
+    done
+
+    return 0
+}
+
 run_musl_tests_if_present() {
     # 官方测试镜像挂载到 /tests 后，自动扫描并运行 musl 下的全部测试脚本；
     # glibc 分组保留在测试镜像中，后续需要时直接调整本脚本。
     mount_official_test_image_if_present || true
     [ -d /tests/musl ] || return 1
 
+    staged_musl_dir=""
+    if stage_musl_tests_to_tmpfs; then
+        staged_musl_dir="/tmp/tests/musl"
+    else
+        echo "[Tests] staging failed; falling back to /tests/musl"
+    fi
+
     ran=0
-    echo "[Tests] detected musl test scripts; running directly from /tests in rcS"
+    echo "[Tests] detected musl test scripts; running in rcS"
 
-    export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/tests/musl"
+    if [ -n "$staged_musl_dir" ]; then
+        export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$staged_musl_dir:/tests/musl"
+    else
+        export PATH="/bin:/sbin:/usr/bin:/usr/sbin:/tests/musl"
+    fi
+    export TMPDIR="/tmp"
     export HOME="/"
 
-    for f in /tests/musl/*_testcode.sh; do
-        [ -f "$f" ] || continue
+    for src_f in /tests/musl/*_testcode.sh; do
+        [ -f "$src_f" ] || continue
+
+        base="${src_f##*/}"
+        case "$base" in
+            unixbench_testcode.sh|lmbench_testcode.sh|libcbench_testcode.sh|libctest_testcode.sh)
+                echo "[Tests] skipping already-validated $src_f"
+                continue
+                ;;
+        esac
 
+        f="$src_f"
+        if [ -n "$staged_musl_dir" ] && [ "$base" != "ltp_testcode.sh" ] && [ -f "$staged_musl_dir/$base" ]; then
+            f="$staged_musl_dir/$base"
+        fi
         dir="${f%/*}"
-        base="${f##*/}"
         echo "[Tests] running $f"
         (
             cd "$dir" || exit 1
@@ -120,6 +174,10 @@ run_musl_tests_if_present() {
         )
         rc=$?
         echo "[Tests] finished $f (rc=$rc)"
+        case "$rc" in
+            0) ;;
+            *) echo "[Tests] ignoring failure from $f and continuing" ;;
+        esac
         ran=1
     done
     [ "$ran" -eq 1 ] || return 1

data/risc-v_musl/symlinks.manifest

@@ -91,6 +91,7 @@ bin/vi	busybox
 bin/watch	busybox
 bin/zcat	busybox
 lib/ld-musl-riscv64-sf.so.1	libc.so
+lib/ld-musl-riscv64.so.1	libc.so
 linuxrc	bin/busybox
 sbin/acpid	../bin/busybox
 sbin/adjtimex	../bin/busybox

data/risc-v_musl/var/tmp/.gitkeep

@@ -0,0 +1 @@
+

os/src/arch/loongarch/trap/sigreturn.S

@@ -7,6 +7,7 @@
 __sigreturn_trampoline:
     li.w   $a7, 139          # __NR_rt_sigreturn
     syscall 0
+    break 0                  # rt_sigreturn must not return
 
 .globl __sigreturn_trampoline_end
 __sigreturn_trampoline_end:

os/src/arch/loongarch/trap/trap_frame.rs

@@ -238,7 +238,8 @@ impl TrapFrame {
     /// 将 TrapFrame 转换为 MContextT
     pub fn to_mcontext(&self) -> MContextT {
         let mut gregs = [0u64; 32];
-        for i in 0..32 {
+        gregs[0] = self.era as u64;
+        for i in 1..32 {
             gregs[i] = self.regs[i] as u64;
         }
         MContextT {
@@ -255,7 +256,8 @@ impl TrapFrame {
 
     /// 从 MContextT 恢复 TrapFrame
     pub fn restore_from_mcontext(&mut self, mcontext: &MContextT) {
-        for i in 0..32 {
+        self.era = mcontext.gregs[0] as usize;
+        for i in 1..32 {
             self.regs[i] = mcontext.gregs[i] as usize;
         }
         self.fregs.copy_from_slice(&mcontext.fpregs[..32]);

os/src/arch/loongarch/trap/trap_handler.rs

@@ -258,6 +258,7 @@ fn handle_interrupt(estat: usize) {
 }
 
 fn user_panic(estat: usize, era: usize, trap_frame: &TrapFrame) {
+    let ecode = (estat >> 16) & 0x3f;
     let badv: usize;
     let badi: usize;
     unsafe {
@@ -268,9 +269,15 @@ fn user_panic(estat: usize, era: usize, trap_frame: &TrapFrame) {
     emergency_println!("   UNEXPECTED TRAP IN USER MODE (PLV>0)");
     emergency_println!("===============================================");
     emergency_println!("estat: {:#x}", estat);
+    emergency_println!("ecode: {:#x}", ecode);
     emergency_println!("era  : {:#x}", era);
     emergency_println!("badv : {:#x}", badv);
     emergency_println!("badi : {:#x}", badi);
+    emergency_println!(
+        "a7/sp: {:#x}/{:#x}",
+        trap_frame.regs[11],
+        trap_frame.regs[3]
+    );
     emergency_println!("regs : {:#x?}", trap_frame.regs);
     panic!(
         "Unexpected trap in user mode: estat={:#x}, era={:#x}, badv={:#x}, badi={:#x}",