Merge pull request #9 from JensenWei007/main

feat(main): Adapt command line and autoboot, optimize Makefile

Author: luojia65

.github/workflows/test.yml

@@ -64,7 +64,8 @@ jobs:
           sudo apt install -y qemu-system-misc
 
       - name: Run QEMU
-        run: make virtiodisk > qemu.log
+        run: |
+          make qemu-run > qemu.log
 
       - name: Upload QEMU log
         uses: actions/upload-artifact@v4

.gitignore

@@ -32,3 +32,6 @@ myramdisk/
 *.bin
 *.img
 *.cpio
+
+edk2/
+mnt_fat32/

Makefile

@@ -4,7 +4,6 @@
 #     - `PLATFORM`: Target platform in the `platforms` directory
 #     - `SMP`: Number of CPUs
 #     - `LOG:` Logging level: warn, error, info, debug, trace
-#     - `MEDIUM:` Boot Medium Type: ramdisk-cpio, virtio-blk
 #     - `EXTRA_CONFIG`: Extra config specification file
 #     - `OUT_CONFIG`: Final config file that takes effect
 # * QEMU options:
@@ -17,15 +16,12 @@ PLATFORM ?=
 SMP ?= 1
 LOG ?= debug
 
-# 下面的目前还没用, 现在需要手动去cargo.toml中修改, 后面补上
-MEDIUM ?= ramdisk-cpio
-
 OUT_CONFIG ?= $(PWD)/.axconfig.toml
 EXTRA_CONFIG ?=
 
 # QEMU options
 DISK:= disk.img
-SBI:=rustsbi/target/riscv64imac-unknown-none-elf/release/rustsbi-prototyper-payload.elf
+SBI ?= rustsbi/target/riscv64gc-unknown-none-elf/release/rustsbi-prototyper-payload.elf
 RAMDISK_CPIO:=ramdisk.cpio
 
 export AX_CONFIG_PATH=$(OUT_CONFIG)
@@ -44,13 +40,10 @@ oldconfig: _axconfig-gen
 
 clean:
 	cargo clean
-	cd rustsbi && cargo clean
+	test -d "rustsbi" && cd rustsbi && cargo clean
 	rm -f $(OUT_CONFIG)
 
 build: clean defconfig all
 
-ramdiskcpio:
-	qemu-system-riscv64 -m 128M -serial mon:stdio -bios $(SBI) -nographic -machine virt -device loader,file=$(RAMDISK_CPIO),addr=0x84000000
-
-virtiodisk:
-	qemu-system-riscv64 -m 128M -serial mon:stdio -bios $(SBI) -nographic -machine virt -device virtio-blk-pci,drive=disk0 -drive id=disk0,if=none,format=raw,file=$(DISK)
+qemu-run:
+	qemu-system-riscv64 -m 128M -serial mon:stdio -bios $(SBI) -nographic -machine virt -nographic -machine virt -device virtio-blk-pci,drive=disk0 -drive id=disk0,if=none,format=raw,file=$(DISK)

scripts/make/build.mk

@@ -7,7 +7,6 @@ ROOT_DIR := $(abspath $(SCRIPT_DIR)/../..)
 ELF := $(ROOT_DIR)/target/$(TARGET)/release/arceboot
 BIN := $(ROOT_DIR)/target/$(TARGET)/release/arceboot.bin
 RUSTSBI_DIR := $(ROOT_DIR)/rustsbi
-SBI := $(RUSTSBI_DIR)/target/riscv64imac-unknown-none-elf/release/rustsbi-prototyper-payload.elf
 
 # 彩色打印
 define print_info

src/main.rs

@@ -9,6 +9,7 @@ mod log;
 mod medium;
 mod panic;
 mod runtime;
+mod shell;
 
 #[cfg_attr(not(test), unsafe(no_mangle))]
 pub extern "C" fn rust_main(_cpu_id: usize, _dtb: usize) -> ! {
@@ -36,7 +37,7 @@ pub extern "C" fn rust_main(_cpu_id: usize, _dtb: usize) -> ! {
     info!("Initialize platform devices...");
     axhal::platform_init();
 
-    #[cfg(any(feature = "fs", feature = "net", feature = "display"))]
+    #[cfg(any(feature = "fs", feature = "net"))]
     {
         #[allow(unused_variables)]
         let all_devices = axdriver::init_drivers();
@@ -48,16 +49,13 @@ pub extern "C" fn rust_main(_cpu_id: usize, _dtb: usize) -> ! {
 
         #[cfg(feature = "net")]
         axnet::init_network(all_devices.net);
-
-        #[cfg(feature = "display")]
-        axdisplay::init_display(all_devices.display);
     }
     ctor_bare::call_ctors();
 
     info!("current root dir: {}", crate::medium::current_dir().unwrap());
     info!("read test file context: {}", crate::medium::read_to_string("/test/arceboot.txt").unwrap());
 
-    crate::runtime::efi_runtime_init();
+    crate::shell::shell_main();
 
     info!("will shut down.");
 

src/shell/cmd.rs

@@ -0,0 +1,39 @@
+type CmdHandler = fn(&str);
+
+const CMD_TABLE: &[(&str, &str, CmdHandler)] = &[
+    ("help", "-- List the help for ArceBoot", do_help),
+    ("exit", "-- Exit ArceBoot", do_exit),
+];
+
+pub fn run_cmd(line: &[u8]) {
+    let line_str = unsafe { core::str::from_utf8_unchecked(line) };
+    let (cmd, args) = split_whitespace(line_str);
+    if !cmd.is_empty() {
+        for (name, _, func) in CMD_TABLE {
+            if cmd == *name {
+                func(args);
+                return;
+            }
+        }
+        axlog::ax_println!("{}: command not found", cmd);
+    }
+}
+
+fn split_whitespace(str: &str) -> (&str, &str) {
+    let str = str.trim();
+    str.find(char::is_whitespace)
+        .map_or((str, ""), |n| (&str[..n], str[n + 1..].trim()))
+}
+
+fn do_help(_args: &str) {
+    axlog::ax_println!("Available commands:");
+    for (name, desc, _) in CMD_TABLE {
+        axlog::ax_print!("  {}", name);
+        axlog::ax_println!("  {}", desc);
+    }
+}
+
+fn do_exit(_args: &str) {
+    axlog::ax_println!("======== ArceBoot will exit and shut down ========");
+    axhal::misc::terminate();
+}

src/shell/mod.rs

@@ -0,0 +1,90 @@
+use axio::{Read, Write};
+
+mod cmd;
+mod stdio;
+
+const LF: u8 = b'\n';
+const CR: u8 = b'\r';
+const DL: u8 = b'\x7f';
+const BS: u8 = b'\x08';
+const SPACE: u8 = b' ';
+
+const MAX_CMD_LEN: usize = 256;
+
+fn print_prompt() {
+    axlog::ax_print!("[Arceboot]: {}$ ", &crate::medium::current_dir().unwrap());
+}
+
+pub fn shell_main() {
+    let mut stdin = self::stdio::stdin();
+    let mut stdout = self::stdio::stdout();
+
+    let mut buf = [0; MAX_CMD_LEN];
+    let mut cursor = 0;
+
+    // Attempt to autoboot
+    const COUNTDOWN_MSG: &[u8] =
+        b"[Arceboot] Attempt to autoboot, print any key to stop it, will start autoboot in: ";
+    for i in (0..=5).rev() {
+        if stdin.read_nb(&mut buf[cursor..cursor + 1]).ok() == Some(1) {
+            break;
+        }
+        stdout.write_all(COUNTDOWN_MSG).unwrap();
+
+        let num_char = b'0' + i;
+        stdout.write_all(&[num_char, b' ']).unwrap();
+
+        axhal::time::busy_wait(core::time::Duration::new(1, 0));
+
+        if i > 0 {
+            stdout.write_all(&[CR]).unwrap();
+        }
+
+        if i == 0 {
+            autoboot();
+            // boot 完成后理论上不应该回到程序
+            return;
+        }
+    }
+    axlog::ax_println!();
+
+    // Cannot autoboot or cancel autoboot
+    self::cmd::run_cmd("help".as_bytes());
+    print_prompt();
+
+    loop {
+        if stdin.read(&mut buf[cursor..cursor + 1]).ok() != Some(1) {
+            continue;
+        }
+        if buf[cursor] == b'\x1b' {
+            buf[cursor] = b'^';
+        }
+        match buf[cursor] {
+            CR | LF => {
+                axlog::ax_println!();
+                if cursor > 0 {
+                    cmd::run_cmd(&buf[..cursor]);
+                    cursor = 0;
+                }
+                print_prompt();
+            }
+            BS | DL => {
+                if cursor > 0 {
+                    stdout.write_all(&[BS, SPACE, BS]).unwrap();
+                    cursor -= 1;
+                }
+            }
+            0..=31 => {}
+            c => {
+                if cursor < MAX_CMD_LEN - 1 {
+                    stdout.write_all(&[c]).unwrap();
+                    cursor += 1;
+                }
+            }
+        }
+    }
+}
+
+fn autoboot() {
+    crate::runtime::efi_runtime_init();
+}