feat: 支持动态链接

kernel/Cargo.toml

@@ -57,6 +57,7 @@ wait_queue_macros = { path = "crates/wait_queue_macros" }
 paste = "=1.0.14"
 slabmalloc = { path = "crates/rust-slabmalloc" }
 log = "0.4.21"
+xarray = "0.1.0"
 lru = "0.12.3"
 
 # target为x86_64时，使用下面的依赖
@@ -89,4 +90,4 @@ debug = true   # Controls whether the compiler passes `-g`
 
 # The release profile, used for `cargo build --release`
 [profile.release]
-debug = false
+debug = true

kernel/src/arch/riscv64/process/syscall.rs

@@ -79,14 +79,8 @@ impl Syscall {
         };
         let (user_sp, argv_ptr) = unsafe {
             param
-                .init_info()
-                .push_at(
-                    // address_space
-                    //     .write()
-                    //     .user_stack_mut()
-                    //     .expect("No user stack found"),
-                    &mut ustack_message,
-                )
+                .init_info_mut()
+                .push_at(&mut ustack_message)
                 .expect("Failed to push proc_init_info to user stack")
         };
         address_space.write().user_stack = Some(ustack_message);

kernel/src/arch/x86_64/process/syscall.rs

@@ -72,6 +72,10 @@ impl Syscall {
         param.init_info_mut().args = argv;
         param.init_info_mut().envs = envp;
 
+        // 生成16字节随机数
+        // TODO 暂时设为0
+        param.init_info_mut().rand_num = [0u8; 16];
+
         // 把proc_init_info写到用户栈上
         let mut ustack_message = unsafe {
             address_space
@@ -82,14 +86,8 @@ impl Syscall {
         };
         let (user_sp, argv_ptr) = unsafe {
             param
-                .init_info()
-                .push_at(
-                    // address_space
-                    //     .write()
-                    //     .user_stack_mut()
-                    //     .expect("No user stack found"),
-                    &mut ustack_message,
-                )
+                .init_info_mut()
+                .push_at(&mut ustack_message)
                 .expect("Failed to push proc_init_info to user stack")
         };
         address_space.write().user_stack = Some(ustack_message);

kernel/src/driver/video/mod.rs

@@ -9,7 +9,10 @@ use crate::{
         rwlock::{RwLock, RwLockReadGuard},
         spinlock::SpinLock,
     },
-    mm::{mmio_buddy::mmio_pool, page::EntryFlags},
+    mm::{
+        allocator::page_frame::PageFrameCount, kernel_mapper::KernelMapper, page::EntryFlags, mmio_buddy::mmio_pool
+        MemoryManagementArch,
+    },
     time::timer::{Timer, TimerFunction},
 };
 use alloc::{boxed::Box, sync::Arc};
@@ -99,8 +102,15 @@ impl VideoRefreshManager {
         }
         // 地址映射
         let paddr = bp.screen_info.lfb_base;
+        let count = PageFrameCount::new(
+            page_align_up(frame_buffer_info_guard.buf_size()) / MMArch::PAGE_SIZE,
+        );
         let page_flags: EntryFlags<MMArch> = EntryFlags::new().set_execute(true).set_write(true);
 
+        let mut kernel_mapper = KernelMapper::lock();
+        let mut kernel_mapper = kernel_mapper.as_mut();
+        assert!(kernel_mapper.is_some());
+        let mut vaddr = buf_vaddr;
         unsafe {
             mmio_guard
                 .map_phys_with_flags(paddr, page_align_up(buf_size), page_flags)

kernel/src/filesystem/vfs/file.rs

@@ -8,6 +8,7 @@ use alloc::{
 use kdepends::xarray::XArray;
 use log::error;
 use system_error::SystemError;
+use xarray::XArray;
 
 use super::{Dirent, FileType, IndexNode, InodeId, Metadata, SpecialNodeData};
 use crate::filesystem::eventfd::EventFdInode;