arch_prctl: move arch_prctl to arch/syscall.rs

Signed-off-by: Andy-Python-Programmer <[email protected]>

Author: Andy-Python-Programmer

src/aero_kernel/src/arch/x86_64/syscall.rs

@@ -1,6 +1,9 @@
+use aero_syscall::AeroSyscallError;
 use raw_cpuid::CpuId;
 
 use crate::arch::gdt::GdtEntryType;
+use crate::mem::paging::VirtAddr;
+use crate::userland::scheduler;
 use crate::utils::io;
 
 use super::interrupts::InterruptStack;
@@ -9,30 +12,78 @@ extern "C" {
     fn x86_64_syscall_handler();
 }
 
+const ARCH_SET_GS: usize = 0x1001;
+const ARCH_SET_FS: usize = 0x1002;
+const ARCH_GET_FS: usize = 0x1003;
+const ARCH_GET_GS: usize = 0x1004;
+
+fn arch_prctl(command: usize, address: usize) -> Result<usize, AeroSyscallError> {
+    match command {
+        ARCH_SET_FS => unsafe {
+            scheduler::get_scheduler()
+                .current_task()
+                .arch_task_mut()
+                .set_fs_base(VirtAddr::new(address as u64));
+
+            Ok(0x00)
+        },
+
+        ARCH_GET_FS => Ok(scheduler::get_scheduler()
+            .current_task()
+            .arch_task()
+            .get_fs_base()
+            .as_u64() as usize),
+
+        ARCH_SET_GS => unsafe {
+            scheduler::get_scheduler()
+                .current_task()
+                .arch_task_mut()
+                .set_gs_base(VirtAddr::new(address as u64));
+
+            Ok(0x00)
+        },
+
+        ARCH_GET_GS => Ok(scheduler::get_scheduler()
+            .current_task()
+            .arch_task()
+            .get_gs_base()
+            .as_u64() as usize),
+
+        _ => Err(AeroSyscallError::EINVAL),
+    }
+}
+
 #[no_mangle]
 extern "C" fn x86_64_do_syscall(stack: &mut InterruptStack) {
-    let syscall_number = stack.scratch.rax as usize;
+    let syscall_number = stack.scratch.rax as usize; // syscall number
+    let a = stack.scratch.rdi as usize; // argument 1
+    let b = stack.scratch.rsi as usize; // argument 2
+    let c = stack.scratch.rdx as usize; // argument 3
+    let d = stack.scratch.r10 as usize; // argument 4
+    let e = stack.scratch.r8 as usize; // argument 5
+    let f = stack.scratch.r9 as usize; // argument 6
 
     match syscall_number {
-        aero_syscall::prelude::SYS_EXIT => {}
+        // handle arch-specific syscalls (`sigreturn` and `arch_prctl`):
         aero_syscall::prelude::SYS_SIGRETURN => {
             let result = super::signals::sigreturn(stack);
             stack.scratch.rax = result as u64;
             return;
         }
 
+        aero_syscall::prelude::SYS_ARCH_PRCTL => {
+            let result = self::arch_prctl(a, b);
+            let result_usize = aero_syscall::syscall_result_as_usize(result);
+
+            stack.scratch.rax = result_usize as _;
+            return;
+        }
+
+        aero_syscall::prelude::SYS_EXIT => {}
         _ => unsafe { super::interrupts::enable_interrupts() },
     }
 
-    let result_usize = crate::syscall::generic_do_syscall(
-        syscall_number,
-        stack.scratch.rdi as usize, // argument 1
-        stack.scratch.rsi as usize, // argument 2
-        stack.scratch.rdx as usize, // argument 3
-        stack.scratch.r10 as usize, // argument 4
-        stack.scratch.r8 as usize,  // argument 5
-        stack.scratch.r9 as usize,  // argument 6
-    );
+    let result_usize = crate::syscall::generic_do_syscall(syscall_number, a, b, c, d, e, f);
 
     super::signals::syscall_check_signals(result_usize as isize, stack);
     stack.scratch.rax = result_usize as _;

src/aero_kernel/src/syscall/mod.rs

@@ -56,6 +56,20 @@
 //! | 32     | access                  |
 //! | 33     | pipe                    |
 //! | 34     | unlink                  |
+//! | 35     | gethostname             |
+//! | 36     | sethostname             |
+//! | 37     | info                    |
+//! | 38     | clone                   |
+//! | 39     | sigreturn               |
+//! | 40     | sigaction               |
+//! | 41     | sigprocmask             |
+//! | 42     | dup                     |
+//! | 43     | fcntl                   |
+//! | 44     | dup2                    |
+//! | 45     | ipc_send                |
+//! | 46     | ipc_recv                |
+//! | 47     | ipc_discover_root       |
+//! | 48     | ipc_become_root         |
 
 use core::mem::MaybeUninit;
 
@@ -139,7 +153,6 @@ pub fn generic_do_syscall(
         SYS_SHUTDOWN => process::shutdown(),
         SYS_FORK => process::fork(),
         SYS_MMAP => process::mmap(b, c, d, e, f, g),
-        SYS_ARCH_PRCTL => process::arch_prctl(b, c),
         SYS_MUNMAP => process::munmap(b, c),
         SYS_EXEC => process::exec(b, c, d, e, f, g),
         SYS_LOG => process::log(b, c),

src/aero_kernel/src/syscall/process.rs

@@ -52,47 +52,6 @@ pub fn exit(status: usize) -> ! {
     }
 }
 
-const ARCH_SET_GS: usize = 0x1001;
-const ARCH_SET_FS: usize = 0x1002;
-const ARCH_GET_FS: usize = 0x1003;
-const ARCH_GET_GS: usize = 0x1004;
-
-pub fn arch_prctl(command: usize, address: usize) -> Result<usize, AeroSyscallError> {
-    match command {
-        ARCH_SET_FS => unsafe {
-            scheduler::get_scheduler()
-                .current_task()
-                .arch_task_mut()
-                .set_fs_base(VirtAddr::new(address as u64));
-
-            Ok(0x00)
-        },
-
-        ARCH_GET_FS => Ok(scheduler::get_scheduler()
-            .current_task()
-            .arch_task()
-            .get_fs_base()
-            .as_u64() as usize),
-
-        ARCH_SET_GS => unsafe {
-            scheduler::get_scheduler()
-                .current_task()
-                .arch_task_mut()
-                .set_gs_base(VirtAddr::new(address as u64));
-
-            Ok(0x00)
-        },
-
-        ARCH_GET_GS => Ok(scheduler::get_scheduler()
-            .current_task()
-            .arch_task()
-            .get_gs_base()
-            .as_u64() as usize),
-
-        _ => Err(AeroSyscallError::EINVAL),
-    }
-}
-
 pub fn uname(buffer: usize) -> Result<usize, AeroSyscallError> {
     fn init_array(fixed: &mut [u8; 65], init: &'static str) {
         let init_bytes = init.as_bytes();