refactor: update arceos

Author: AsakuraMizu

Cargo.lock

@@ -15,6 +15,7 @@ repository = "https://github.com/arceos-org/starry-next"
 
 [workspace.dependencies]
 axfeat = { git = "https://github.com/oscomp/arceos.git", features = [
+    "fp-simd",
     "fs",
     "irq",
     "multitask",
@@ -35,8 +36,8 @@ axruntime = { git = "https://github.com/oscomp/arceos.git" }
 axsync = { git = "https://github.com/oscomp/arceos.git" }
 axtask = { git = "https://github.com/oscomp/arceos.git" }
 
-axprocess = { git = "https://github.com/Starry-OS/axprocess.git" }
-axsignal = { git = "https://github.com/Starry-OS/axsignal.git", rev = "b5b6089" }
+axprocess = { git = "https://github.com/Starry-Mix-THU/axprocess.git", rev = "1666809" }
+axsignal = { git = "https://github.com/Starry-Mix-THU/axsignal.git", rev = "dd359f6" }
 
 axerrno = "0.1"
 bitflags = "2.6"
@@ -49,7 +50,7 @@ linux-raw-sys = { version = "0.9.3", default-features = false, features = [
     "prctl",
     "system",
 ] }
-memory_addr = "0.3"
+memory_addr = "0.4"
 spin = "0.9"
 
 starry-core = { path = "./core" }
@@ -64,6 +65,7 @@ homepage.workspace = true
 repository.workspace = true
 
 [features]
+defplat = ["axfeat/defplat"]
 lwext4_rs = ["axfeat/lwext4_rs"]
 
 [dependencies]
@@ -90,5 +92,4 @@ shlex = { version = "1.3.0", default-features = false }
 syscalls = { git = "https://github.com/jasonwhite/syscalls.git", rev = "92624de", default-features = false }
 
 [patch.crates-io]
-page_table_multiarch = { git = "https://github.com/Mivik/page_table_multiarch.git", rev = "19ededd" }
-page_table_entry = { git = "https://github.com/Mivik/page_table_multiarch.git", rev = "19ededd" }
+axcpu = { git = "https://github.com/Starry-Mix-THU/axcpu.git", rev = "4d95bb0" }

Cargo.toml

@@ -3,13 +3,11 @@ AX_TESTCASE ?= nimbos
 ARCH ?= x86_64
 LOG ?= off
 AX_TESTCASES_LIST=$(shell cat ./apps/$(AX_TESTCASE)/testcase_list | tr '\n' ',')
-FEATURES ?= fp_simd
 
 export NO_AXSTD := y
 export AX_LIB := axfeat
 
 RUSTDOCFLAGS := -Z unstable-options --enable-index-page -D rustdoc::broken_intra_doc_links -D missing-docs
-EXTRA_CONFIG ?= $(PWD)/configs/$(ARCH).toml
 ifneq ($(filter $(MAKECMDGOALS),doc),) # make doc
     export RUSTDOCFLAGS
 else ifeq ($(filter $(MAKECMDGOALS),clean user_apps ax_root),) # Not make clean, user_apps, ax_root
@@ -24,15 +22,11 @@ OUT_BIN := $(DIR)_$(ARCH)-qemu-virt.bin
 ifeq ($(ARCH), x86_64)
   TARGET := x86_64-unknown-none
 else ifeq ($(ARCH), aarch64)
-  ifeq ($(findstring fp_simd,$(FEATURES)),)
-    TARGET := aarch64-unknown-none-softfloat
-  else
-    TARGET := aarch64-unknown-none
-  endif
+  TARGET := aarch64-unknown-none-softfloat
 else ifeq ($(ARCH), riscv64)
   TARGET := riscv64gc-unknown-none-elf
 else ifeq ($(ARCH), loongarch64)
-  TARGET := loongarch64-unknown-none
+  TARGET := loongarch64-unknown-none-softfloat
 else
   $(error ARCH must be one of x86_64, aarch64, riscv64, loongarch64)
 endif
@@ -43,7 +37,7 @@ all: oscomp_build
 
 # export dummy config for clippy
 clippy: defconfig
-	@AX_CONFIG_PATH=$(PWD)/.axconfig.toml cargo clippy --target $(TARGET) --all-features -- -D warnings -A clippy::new_without_default	
+	@cargo clippy --target $(TARGET) --all-features -- -D warnings -A clippy::new_without_default	
 
 ax_root:
 	@./scripts/set_ax_root.sh $(AX_ROOT)
@@ -62,7 +56,7 @@ test: defconfig
 	@./scripts/app_test.sh
 
 defconfig build run justrun debug disasm: ax_root
-	@make -C $(AX_ROOT) A=$(PWD) EXTRA_CONFIG=$(EXTRA_CONFIG) $@
+	@make -C $(AX_ROOT) A=$(PWD) $@
 
 clean: ax_root
 	@make -C $(AX_ROOT) A=$(PWD) ARCH=$(ARCH) clean
@@ -72,6 +66,6 @@ clean: ax_root
 	@cargo clean
 
 doc: defconfig
-	@AX_CONFIG_PATH=$(PWD)/.axconfig.toml cargo doc --no-deps --all-features --workspace
+	@cargo doc --no-deps --all-features --workspace
 
 .PHONY: all ax_root build run justrun debug disasm clean test_build

Makefile

@@ -6,7 +6,8 @@ pub fn sys_brk(addr: usize) -> LinuxResult<isize> {
     let process_data = task.task_ext().process_data();
     let mut return_val: isize = process_data.get_heap_top() as isize;
     let heap_bottom = process_data.get_heap_bottom() as usize;
-    if addr != 0 && addr >= heap_bottom && addr <= heap_bottom + axconfig::plat::USER_HEAP_SIZE {
+    if addr != 0 && addr >= heap_bottom && addr <= heap_bottom + starry_core::config::USER_HEAP_SIZE
+    {
         process_data.set_heap_top(addr);
         return_val = addr as isize;
     }

api/src/imp/mm/brk.rs

@@ -168,7 +168,7 @@ pub fn sys_munmap(addr: usize, length: usize) -> LinuxResult<isize> {
     let length = align_up_4k(length);
     let start_addr = VirtAddr::from(addr);
     aspace.unmap(start_addr, length)?;
-    axhal::arch::flush_tlb(None);
+    axhal::asm::flush_tlb(None);
     Ok(0)
 }
 

api/src/imp/mm/mmap.rs

@@ -2,7 +2,7 @@ use core::{mem, time::Duration};
 
 use alloc::sync::Arc;
 use axerrno::{LinuxError, LinuxResult};
-use axhal::arch::TrapFrame;
+use axhal::context::TrapFrame;
 use axprocess::{Pid, Thread};
 use axsignal::{SignalInfo, SignalSet, SignalStack, Signo};
 use axtask::{TaskExtRef, current};

api/src/imp/signal.rs

@@ -1,7 +1,7 @@
 use alloc::sync::Arc;
 use axerrno::{LinuxError, LinuxResult};
 use axfs::{CURRENT_DIR, CURRENT_DIR_PATH};
-use axhal::arch::{TrapFrame, UspaceContext};
+use axhal::context::{TrapFrame, UspaceContext};
 use axprocess::Pid;
 use axsignal::Signo;
 use axsync::Mutex;

api/src/imp/task/clone.rs

@@ -2,7 +2,7 @@ use core::ffi::c_char;
 
 use alloc::{string::ToString, vec::Vec};
 use axerrno::{LinuxError, LinuxResult};
-use axhal::arch::TrapFrame;
+use axhal::context::TrapFrame;
 use axtask::{TaskExtRef, current};
 use starry_core::mm::{load_user_app, map_trampoline};
 
@@ -44,7 +44,7 @@ pub fn sys_execve(
     let mut aspace = curr_ext.process_data().aspace.lock();
     aspace.unmap_user_areas()?;
     map_trampoline(&mut aspace)?;
-    axhal::arch::flush_tlb(None);
+    axhal::asm::flush_tlb(None);
 
     let (entry_point, user_stack_base) =
         load_user_app(&mut aspace, &args, &envs).map_err(|_| {

api/src/imp/task/execve.rs

@@ -54,7 +54,7 @@ pub fn sys_set_tid_address(clear_child_tid: usize) -> LinuxResult<isize> {
 
 #[cfg(target_arch = "x86_64")]
 pub fn sys_arch_prctl(
-    tf: &mut axhal::arch::TrapFrame,
+    tf: &mut axhal::context::TrapFrame,
     code: i32,
     addr: usize,
 ) -> LinuxResult<isize> {

api/src/imp/task/thread.rs

@@ -3,7 +3,7 @@ use core::{alloc::Layout, ffi::c_char, mem::transmute, ptr, slice, str};
 use axerrno::{LinuxError, LinuxResult};
 use axhal::paging::MappingFlags;
 use axtask::{TaskExtRef, current};
-use memory_addr::{MemoryAddr, PAGE_SIZE_4K, VirtAddr, VirtAddrRange};
+use memory_addr::{MemoryAddr, PAGE_SIZE_4K, VirtAddr};
 use starry_core::mm::access_user_memory;
 
 fn check_region(start: VirtAddr, layout: Layout, access_flags: MappingFlags) -> LinuxResult<()> {
@@ -15,10 +15,7 @@ fn check_region(start: VirtAddr, layout: Layout, access_flags: MappingFlags) ->
     let task = current();
     let mut aspace = task.task_ext().process_data().aspace.lock();
 
-    if !aspace.check_region_access(
-        VirtAddrRange::from_start_size(start, layout.size()),
-        access_flags,
-    ) {
+    if !aspace.can_access_range(start, layout.size(), access_flags) {
         return Err(LinuxError::EFAULT);
     }
 
@@ -60,10 +57,7 @@ fn check_null_terminated<T: PartialEq + Default>(
                 // allocated yet.
                 let task = current();
                 let aspace = task.task_ext().process_data().aspace.lock();
-                if !aspace.check_region_access(
-                    VirtAddrRange::from_start_size(page, PAGE_SIZE_4K),
-                    access_flags,
-                ) {
+                if !aspace.can_access_range(page, PAGE_SIZE_4K, access_flags) {
                     return Err(LinuxError::EFAULT);
                 }