kernel: add aero proc macros in prelude

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

Author: Andy-Python-Programmer

src/aero_kernel/src/cmdline.rs

@@ -117,7 +117,7 @@ pub fn get_raw_cmdline() -> &'static str {
 mod tests {
     use super::*;
 
-    #[aero_proc::test]
+    #[test]
     fn number_parser_test() {
         assert_eq!(parse_number("0xdeadbeef").unwrap(), 0xdeadbeef);
         assert_eq!(parse_number("0o546").unwrap(), 0o546);

src/aero_kernel/src/main.rs

@@ -49,6 +49,9 @@
 #![no_main]
 #![reexport_test_harness_main = "test_main"]
 
+#[macro_use]
+extern crate aero_proc;
+
 mod prelude {
     pub mod rust_2021 {
         // Since asm is used almost all over the kernel, its a better idea

src/aero_kernel/src/mem/paging/addr.rs

@@ -552,13 +552,13 @@ pub fn is_aligned(addr: u64, align: u64) -> bool {
 mod tests {
     use super::*;
 
-    #[aero_proc::test]
+    #[test]
     pub fn test_is_aligned() {
         assert!(is_aligned(0x1000, 0x1000));
         assert!(!is_aligned(69, 0x1000));
     }
 
-    #[aero_proc::test]
+    #[test]
     pub fn test_align_up() {
         // align 1
         assert_eq!(align_up(0, 1), 0);

src/aero_kernel/src/mem/paging/frame.rs

@@ -620,7 +620,7 @@ mod tests {
 
     use crate::mem::AddressSpace;
 
-    #[aero_proc::test]
+    #[test]
     fn vm_frame_ref_count() {
         let mut address_space = AddressSpace::this();
         let mut offset_table = address_space.offset_page_table();

src/aero_kernel/src/mem/paging/page.rs

@@ -437,7 +437,7 @@ impl<S: PageSize> fmt::Debug for PhysFrameRangeInclusive<S> {
 mod tests {
     use super::*;
 
-    #[aero_proc::test]
+    #[test]
     pub fn test_page_ranges() {
         let page_size = Size4KiB::SIZE;
         let number = 1000;

src/aero_kernel/src/syscall/fs.rs

@@ -31,7 +31,7 @@ use crate::userland::scheduler;
 use crate::fs::Path;
 use crate::utils::downcast;
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn write(fd: usize, buffer: &[u8]) -> Result<usize, AeroSyscallError> {
     let handle = scheduler::get_scheduler()
         .current_task()
@@ -49,7 +49,7 @@ pub fn write(fd: usize, buffer: &[u8]) -> Result<usize, AeroSyscallError> {
     }
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn read(fd: usize, buffer: &mut [u8]) -> Result<usize, AeroSyscallError> {
     let handle = scheduler::get_scheduler()
         .current_task()
@@ -67,7 +67,7 @@ pub fn read(fd: usize, buffer: &mut [u8]) -> Result<usize, AeroSyscallError> {
     }
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn open(_fd: usize, path: &Path, mode: usize) -> Result<usize, AeroSyscallError> {
     let mut flags = OpenFlags::from_bits(mode).ok_or(AeroSyscallError::EINVAL)?;
 
@@ -97,15 +97,15 @@ pub fn open(_fd: usize, path: &Path, mode: usize) -> Result<usize, AeroSyscallEr
         .open_file(inode, flags)?)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn dup(fd: usize, flags: usize) -> Result<usize, AeroSyscallError> {
     let task = scheduler::get_scheduler().current_task();
     let flags = OpenFlags::from_bits(flags).ok_or(AeroSyscallError::EINVAL)? & OpenFlags::O_CLOEXEC;
 
     task.file_table.duplicate(fd, DuplicateHint::Any, flags)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn dup2(fd: usize, new_fd: usize, flags: usize) -> Result<usize, AeroSyscallError> {
     let task = scheduler::get_scheduler().current_task();
     let flags = OpenFlags::from_bits(flags).ok_or(AeroSyscallError::EINVAL)? & OpenFlags::O_CLOEXEC;
@@ -114,7 +114,7 @@ pub fn dup2(fd: usize, new_fd: usize, flags: usize) -> Result<usize, AeroSyscall
         .duplicate(fd, DuplicateHint::Exact(new_fd), flags)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn getdents(fd: usize, buffer: &mut [u8]) -> Result<usize, AeroSyscallError> {
     let handle = scheduler::get_scheduler()
         .current_task()
@@ -125,7 +125,7 @@ pub fn getdents(fd: usize, buffer: &mut [u8]) -> Result<usize, AeroSyscallError>
     Ok(handle.get_dents(buffer)?)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn close(fd: usize) -> Result<usize, AeroSyscallError> {
     let res = scheduler::get_scheduler()
         .current_task()
@@ -140,7 +140,7 @@ pub fn close(fd: usize) -> Result<usize, AeroSyscallError> {
     }
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn chdir(path: &str) -> Result<usize, AeroSyscallError> {
     let inode = fs::lookup_path(Path::new(path))?;
 
@@ -153,7 +153,7 @@ pub fn chdir(path: &str) -> Result<usize, AeroSyscallError> {
     Ok(0x00)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn mkdirat(dfd: usize, path: &Path) -> Result<usize, AeroSyscallError> {
     // NOTE: If the pathname given in pathname is relative, then it is interpreted
     // relative to the directory referred to by the file descriptor (rather than relative
@@ -194,7 +194,7 @@ pub fn mkdirat(dfd: usize, path: &Path) -> Result<usize, AeroSyscallError> {
     Ok(0x00)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn rmdir(path: &str) -> Result<usize, AeroSyscallError> {
     let path = Path::new(path);
 
@@ -212,15 +212,15 @@ pub fn rmdir(path: &str) -> Result<usize, AeroSyscallError> {
     Ok(0x00)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn getcwd(buffer: &mut [u8]) -> Result<usize, AeroSyscallError> {
     let cwd = scheduler::get_scheduler().current_task().get_cwd();
 
     buffer[..cwd.len()].copy_from_slice(cwd.as_bytes());
     Ok(cwd.len())
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn ioctl(fd: usize, command: usize, argument: usize) -> Result<usize, AeroSyscallError> {
     let handle = scheduler::get_scheduler()
         .current_task()
@@ -231,7 +231,7 @@ pub fn ioctl(fd: usize, command: usize, argument: usize) -> Result<usize, AeroSy
     Ok(handle.inode().ioctl(command, argument)?)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn seek(fd: usize, offset: usize, whence: usize) -> Result<usize, AeroSyscallError> {
     let handle = scheduler::get_scheduler()
         .current_task()
@@ -242,7 +242,7 @@ pub fn seek(fd: usize, offset: usize, whence: usize) -> Result<usize, AeroSyscal
     Ok(handle.seek(offset as isize, aero_syscall::SeekWhence::from(whence))?)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn pipe(fds: &mut [usize; 2], flags: usize) -> Result<usize, AeroSyscallError> {
     let flags = OpenFlags::from_bits(flags).ok_or(AeroSyscallError::EINVAL)?;
     let pipe = Pipe::new();
@@ -274,7 +274,7 @@ pub fn pipe(fds: &mut [usize; 2], flags: usize) -> Result<usize, AeroSyscallErro
     Ok(0x00)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn unlink(fd: usize, path: &Path, flags: usize) -> Result<usize, AeroSyscallError> {
     // TODO: Make use of the open flags.
     let _flags = OpenFlags::from_bits(flags).ok_or(AeroSyscallError::EINVAL)?;
@@ -298,7 +298,7 @@ pub fn unlink(fd: usize, path: &Path, flags: usize) -> Result<usize, AeroSyscall
     Ok(0x00)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn access(
     fd: usize,
     path: &Path,
@@ -314,7 +314,7 @@ pub fn access(
     }
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn fcntl(fd: usize, command: usize, arg: usize) -> Result<usize, AeroSyscallError> {
     let handle = scheduler::get_scheduler()
         .current_task()
@@ -361,7 +361,7 @@ pub fn fcntl(fd: usize, command: usize, arg: usize) -> Result<usize, AeroSyscall
     }
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn fstat(fd: usize, stat: &mut Stat) -> Result<usize, AeroSyscallError> {
     let file = scheduler::get_scheduler()
         .current_task()
@@ -374,7 +374,7 @@ pub fn fstat(fd: usize, stat: &mut Stat) -> Result<usize, AeroSyscallError> {
     Ok(0)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn stat(path: &Path, stat: &mut Stat) -> Result<usize, AeroSyscallError> {
     let file = fs::lookup_path(path)?;
 
@@ -383,32 +383,31 @@ pub fn stat(path: &Path, stat: &mut Stat) -> Result<usize, AeroSyscallError> {
     Ok(0)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn read_link(path: &Path, _buffer: &mut [u8]) -> Result<usize, AeroSyscallError> {
     log::warn!("read_link: is a stub! (path={path:?})");
 
     Err(AeroSyscallError::EINVAL)
 }
 
 /// Returns a file descriptor referring to the new epoll instance.
-#[aero_proc::syscall]
+#[syscall]
 pub fn epoll_create(flags: usize) -> Result<usize, AeroSyscallError> {
     let _flags = EPollFlags::from_bits(flags).ok_or(AeroSyscallError::EINVAL)?;
 
     let epoll_file = EPoll::new();
     let entry = DirEntry::from_inode(epoll_file);
 
-    let current_task = scheduler::get_scheduler().current_task();
-
-    Ok(current_task
+    Ok(scheduler::get_scheduler()
+        .current_task()
         .file_table
         .open_file(entry, OpenFlags::O_RDWR)?)
 }
 
 /// Used to add, modify, or remove entries in the interest list of the
 /// epoll instance referred to by the file descriptor. It requests that
 /// the operation be performed for the target file descriptor.
-#[aero_proc::syscall]
+#[syscall]
 pub fn epoll_ctl(
     epfd: usize,
     mode: usize,
@@ -434,7 +433,7 @@ pub fn epoll_ctl(
     }
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn event_fd(_initval: usize, flags: usize) -> Result<usize, AeroSyscallError> {
     let flags = EventFdFlags::from_bits(flags).ok_or(AeroSyscallError::EINVAL)?;
     assert!(!flags.contains(EventFdFlags::SEMAPHORE)); // todo: implement event fd semaphore support.

src/aero_kernel/src/syscall/ipc.rs

@@ -61,7 +61,7 @@ fn handle_recieve(
     Ok(msg.data.len())
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn send(pid: usize, payload: &[u8]) -> Result<usize, AeroSyscallError> {
     let target = get_scheduler()
         .find_task(TaskId::new(pid))
@@ -82,7 +82,7 @@ pub fn send(pid: usize, payload: &[u8]) -> Result<usize, AeroSyscallError> {
     Ok(0)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn recv(
     pid_ptr: &mut usize,
     output: &mut [u8],
@@ -123,15 +123,15 @@ pub fn recv(
     }
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn discover_root() -> Result<usize, AeroSyscallError> {
     match IPC_ROOT_NODE.get() {
         Some(pid) => Ok(*pid),
         None => Err(AeroSyscallError::EINVAL),
     }
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn become_root() -> Result<usize, AeroSyscallError> {
     if IPC_ROOT_NODE.is_completed() {
         Err(AeroSyscallError::EINVAL)

src/aero_kernel/src/syscall/net.rs

@@ -20,7 +20,7 @@ fn socket_addr_from_addr<'sys>(address: VirtAddr) -> Result<SocketAddr<'sys>, Ae
 }
 
 /// Connects the socket to the specified address.
-#[aero_proc::syscall]
+#[syscall]
 pub fn connect(fd: usize, address: usize, length: usize) -> Result<usize, AeroSyscallError> {
     let address = socket_addr_from_addr(VirtAddr::new(address as u64))?;
     let file = scheduler::get_scheduler()
@@ -35,7 +35,7 @@ pub fn connect(fd: usize, address: usize, length: usize) -> Result<usize, AeroSy
 
 /// Marks the socket as a passive socket (i.e. as a socket that will be used to accept incoming
 /// connection requests).
-#[aero_proc::syscall]
+#[syscall]
 pub fn listen(fd: usize, backlog: usize) -> Result<usize, AeroSyscallError> {
     let file = scheduler::get_scheduler()
         .current_task()
@@ -47,7 +47,7 @@ pub fn listen(fd: usize, backlog: usize) -> Result<usize, AeroSyscallError> {
     Ok(0)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn socket(
     domain: usize,
     socket_type: usize,
@@ -73,7 +73,7 @@ pub fn socket(
     Ok(fd)
 }
 
-#[aero_proc::syscall]
+#[syscall]
 pub fn bind(fd: usize, address: usize, length: usize) -> Result<usize, AeroSyscallError> {
     let address = socket_addr_from_addr(VirtAddr::new(address as u64))?;