Merge pull request #17 from Arceos-monolithic/zlm_1_2

Zlm 第一阶段任务二（王之栋）

apps/c/arch_prctl/arch_prctl_test.c

@@ -0,0 +1,31 @@
+#include <stdio.h>
+#include <stdint.h>
+#include <sys/prctl.h>
+#include <asm/prctl.h>
+#include <stdlib.h>
+#include <sys/mman.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+int main() {
+    //获取当前 FS 寄存器的值
+    unsigned long* current_fs_value = 0;
+    if (arch_prctl(ARCH_GET_FS, &current_fs_value) != 0) {
+        perror("arch_prctl(ARCH_GET_FS)");
+        return 1;
+    }
+    printf("Current FS value set: 0x%lx\n", current_fs_value);
+
+    // 设置新的 FS 寄存器的值
+    unsigned long new_fs_value = current_fs_value;
+    if (arch_prctl(ARCH_SET_FS, new_fs_value) != 0) {
+        perror("arch_prctl(ARCH_SET_FS)");
+        return 1;
+    }
+
+    printf("New FS value set: 0x%lx\n", new_fs_value);
+
+    return 0;
+}

apps/c/futex/futex.c

@@ -0,0 +1,15 @@
+#include <unistd.h>
+#include <sys/syscall.h>
+#include <linux/futex.h>
+
+int main() {
+    int futex_var = 0;
+
+    // 创建一个 futex，初始值为 0
+    int *futex_ptr = &futex_var;
+
+    // 唤醒等待在 futex 上的线程（私有唤醒）
+    syscall(SYS_futex, futex_ptr, FUTEX_WAKE_PRIVATE, 1, NULL, NULL, 0);
+
+    return 0;
+}

ulib/axstarry/syscall_entry/src/test.rs

@@ -313,6 +313,7 @@ pub const OSTRAIN_TESTCASES: &[&str] = &[
 pub const SDCARD_TESTCASES: &[&str] = &[
     // "busybox sh",
     "./MediaServer -h",
+    // "./arch_prctl",
     // "busybox sh ./test_all.sh",
     // "./riscv64-linux-musl-native/bin/riscv64-linux-musl-gcc ./hello.c -static",
     // "./a.out",

ulib/axstarry/syscall_task/src/imp/task.rs

@@ -417,7 +417,7 @@ pub fn syscall_setsid() -> SyscallResult {
 
 /// arch_prc
 #[cfg(target_arch = "x86_64")]
-pub fn syscall_arch_prctl(code: usize, addr: usize) -> SyscallResult {
+pub fn syscall_arch_prctl(code: usize, addr: *mut usize) -> SyscallResult {
     /*
     #define ARCH_SET_GS			0x1001
     #define ARCH_SET_FS			0x1002
@@ -428,15 +428,22 @@ pub fn syscall_arch_prctl(code: usize, addr: usize) -> SyscallResult {
         0x1002 => {
             #[cfg(target_arch = "x86_64")]
             unsafe {
-                axhal::arch::write_thread_pointer(addr);
+                axhal::arch::write_thread_pointer(*addr as usize);
                 // *(read_thread_pointer() as *mut usize) = addr;
             }
             Ok(0)
         }
-        0x1001 | 0x1003 | 0x1004 => todo!(),
+        0x1003 => {
+            #[cfg(target_arch = "x86_64")]
+            unsafe {
+                *addr = *(axhal::arch::read_thread_pointer() as *mut usize);
+            }
+            Ok(0)
+        }
+        0x1001 | 0x1004 => todo!(),
         _ => Err(SyscallError::EINVAL)
     }
-    // Ok(0)
+    //Ok(0)
 }
 
 pub fn syscall_fork() -> SyscallResult {

ulib/axstarry/syscall_task/src/lib.rs

@@ -130,7 +130,7 @@ pub fn task_syscall(syscall_id: task_syscall_id::TaskSyscallId, args: [usize; 6]
         SOCKETPAIR => Err(SyscallError::EAFNOSUPPORT),
         // syscall below just for x86_64 
         #[cfg(target_arch = "x86_64")]
-        ARCH_PRCTL => syscall_arch_prctl(args[0], args[1]),
+        ARCH_PRCTL => syscall_arch_prctl(args[0], args[1] as *mut usize),
         #[cfg(target_arch = "x86_64")]
         FORK => syscall_fork(),
         #[cfg(target_arch = "x86_64")]