fix: rename arch to polyhal

Author: yfblock

Cargo.lock

@@ -11,13 +11,13 @@ MOUNT_IMG_PATH = "mount.img"
 target = "riscv64gc-unknown-none-elf"
  [bin.riscv64-qemu.configs]
  driver = "kvirtio,kgoldfish-rtc,ns16550a"
+ root_fs = "ext4"
 
 # build for x86_64-qemu
 [bin.x86_64-qemu]
 target = "x86_64-unknown-none"
  [bin.x86_64-qemu.configs]
  driver = "kvirtio,kgoldfish-rtc,ns16550a"
- root_fs = "ext4"
 
 # build for aarch64-qemu
 [bin.aarch64-qemu]

byteos.toml

@@ -19,7 +19,7 @@ logging = { git = "https://github.com/Byte-OS/logging.git", features = []}
 log = "0.4"
 devices = { git = "https://github.com/Byte-OS/devices.git" }
 hal = { git = "https://github.com/Byte-OS/hal.git" }
-arch = { git = "https://github.com/Byte-OS/arch.git" }
+polyhal = { git = "https://github.com/Byte-OS/polyhal.git" }
 fs = { git = "https://github.com/Byte-OS/fs.git" }
 fdt = "0.1.5"
 executor = { git = "https://github.com/Byte-OS/executor.git" }

kernel/Cargo.toml

@@ -29,9 +29,9 @@ mod syscall;
 mod tasks;
 mod user;
 
-use arch::addr::{PhysPage, VirtPage};
-use arch::multicore::MultiCore;
-use arch::{
+use polyhal::addr::{PhysPage, VirtPage};
+use polyhal::multicore::MultiCore;
+use polyhal::{
  disable_irq, enable_irq, get_mem_areas, PageAlloc, TrapFrame, TrapFrameArgs, TrapType,
  VIRT_ADDR_START,
 };
@@ -61,7 +61,7 @@ impl PageAlloc for PageAllocImpl {
  }
 }
 
-#[arch::arch_interrupt]
+#[polyhal::arch_interrupt]
 /// Handle kernel interrupt
 fn kernel_interrupt(cx_ref: &mut TrapFrame, trap_type: TrapType) {
  match trap_type {
@@ -135,7 +135,7 @@ fn kernel_interrupt(cx_ref: &mut TrapFrame, trap_type: TrapType) {
 }
 
 /// The kernel entry
-#[arch::arch_entry]
+#[polyhal::arch_entry]
 fn main(hart_id: usize) {
  disable_irq();
  if hart_id == 0 {
@@ -152,7 +152,7 @@ fn main(hart_id: usize) {
  // initialize logging module
  logging::init(option_env!("LOG"));
 
- arch::init(&PageAllocImpl);
+ polyhal::init(&PageAllocImpl);
  get_mem_areas().into_iter().for_each(|(start, size)| {
  frame_allocator::add_frame_map(start, start + size);
  });
@@ -166,7 +166,7 @@ fn main(hart_id: usize) {
 
  devices::prepare_drivers();
 
- if let Some(fdt) = arch::get_fdt() {
+ if let Some(fdt) = polyhal::get_fdt() {
  for node in fdt.all_nodes() {
  devices::try_to_add_device(&node);
  }

kernel/src/main.rs

@@ -1,4 +1,4 @@
-use arch::{hart_id, shutdown};
+use polyhal::{hart_id, shutdown};
 // use backtrace::backtrace;
 use core::panic::PanicInfo;
 

kernel/src/panic.rs

@@ -1,7 +1,7 @@
 use core::{cmp, net::SocketAddrV4};
 
 use alloc::{sync::Arc, vec::Vec};
-use arch::debug::DebugConsole;
+use polyhal::debug::DebugConsole;
 use fs::INodeInterface;
 use lose_net_stack::net_trait::SocketInterface;
 use sync::Mutex;

kernel/src/socket.rs

@@ -4,9 +4,9 @@
 use core::fmt::{Debug, Display};
 use core::marker::PhantomData;
 
-use arch::addr::VirtAddr;
-use arch::pagetable::MappingFlags;
-use arch::TrapFrame;
+use polyhal::addr::VirtAddr;
+use polyhal::pagetable::MappingFlags;
+use polyhal::TrapFrame;
 use bitflags::bitflags;
 use cfg_if::cfg_if;
 use fs::VfsError;

kernel/src/syscall/consts.rs

@@ -5,7 +5,7 @@ use num_traits::FromPrimitive;
 use vfscore::FileType;
 
 use alloc::sync::Arc;
-use arch::addr::VirtAddr;
+use polyhal::addr::VirtAddr;
 use bit_field::BitArray;
 use executor::yield_now;
 use fs::pipe::create_pipe;

kernel/src/syscall/fd.rs

@@ -1,8 +1,8 @@
 use core::ops::Add;
 
-use arch::addr::{VirtAddr, VirtPage};
-use arch::PAGE_SIZE;
-use arch::USER_VADDR_END;
+use polyhal::addr::{VirtAddr, VirtPage};
+use polyhal::PAGE_SIZE;
+use polyhal::USER_VADDR_END;
 use frame_allocator::ceil_div;
 use log::debug;
 

kernel/src/syscall/mm.rs

@@ -2,8 +2,8 @@ use core::ops::Add;
 
 use crate::tasks::{MapedSharedMemory, SharedMemory, SHARED_MEMORY};
 use alloc::{sync::Arc, vec::Vec};
-use arch::addr::{VirtAddr, VirtPage};
-use arch::{pagetable::MappingFlags, PAGE_SIZE};
+use polyhal::addr::{VirtAddr, VirtPage};
+use polyhal::{pagetable::MappingFlags, PAGE_SIZE};
 use frame_allocator::{ceil_div, frame_alloc_much, FrameTracker};
 use log::debug;