merge & publish v0.4.6

Author: chyyuu-tsinghua-cs

.axconfig.toml

@@ -1,9 +1,9 @@
 # Architecture identifier.
-arch = "riscv64" # str
-# Platform package.
-package = "axplat-riscv64-qemu-virt" # str
+arch = "x86_64" # str
+# Platform Package.
+package = "axplat-x86-pc" # str
 # Platform identifier.
-platform = "riscv64-qemu-virt" # str
+platform = "x86-pc" # str
 # Stack size of each task.
 task-stack-size = 0x40000 # uint
 # Number of timer ticks per second (Hz). A timer tick may contain several timer
@@ -15,67 +15,27 @@ ticks-per-sec = 100 # uint
 #
 [devices]
 # IPI interrupt num
-ipi-irq = "0x8000_0000_0000_0001" # uint
+ipi-irq = 0xf3 # uint
 # MMIO ranges with format (`base_paddr`, `size`).
 mmio-ranges = [
-    [0x0010_1000, 0x1000],
-    [0x0c00_0000, 0x21_0000],
-    [0x1000_0000, 0x1000],
-    [0x1000_1000, 0x8000],
-    [0x3000_0000, 0x1000_0000],
-    [0x4000_0000, 0x4000_0000]
+    [0xb000_0000, 0x1000_0000],
+    [0xfe00_0000, 0xc0_0000],
+    [0xfec0_0000, 0x1000],
+    [0xfed0_0000, 0x1000],
+    [0xfee0_0000, 0x1000]
 ] # [(uint, uint)]
-# End PCI bus number (`bus-range` property in device tree).
+# End PCI bus number.
 pci-bus-end = 0xff # uint
-# Base physical address of the PCIe ECAM space.
-pci-ecam-base = 0x3000_0000 # uint
-# PCI device memory ranges (`ranges` property in device tree).
-pci-ranges = [
-    [0x0300_0000, 0x1_0000],
-    [0x4000_0000, 0x4000_0000],
-    [0x4_0000_0000, 0x4_0000_0000]
-] # [(uint, uint)]
-# plic@c000000 {
-#     phandle = <0x03>;
-#     riscv,ndev = <0x5f>;
-#     reg = <0x00 0xc000000 0x00 0x600000>;
-#     interrupts-extended = <0x02 0x0b 0x02 0x09>;
-#     interrupt-controller;
-#     compatible = "sifive,plic-1.0.0\0riscv,plic0";
-# };
-plic-paddr = 0x0c00_0000 # uint
-# rtc@101000 {
-#     interrupts = <0x0b>;
-#     interrupt-parent = <0x03>;
-#     reg = <0x00 0x101000 0x00 0x1000>;
-#     compatible = "google,goldfish-rtc";
-# };
-# RTC (goldfish) Address
-rtc-paddr = 0x10_1000 # uint
-# Timer interrupt frequency in Hz.
-timer-frequency = 10_000_000 # uint
+# Base physical address of the PCIe ECAM space (should read from ACPI 'MCFG' table).
+pci-ecam-base = 0xb000_0000 # uint
+# PCI device memory ranges (not used on x86).
+pci-ranges = [] # [(uint, uint)]
+# Timer interrupt frequency in Hz. (4.0GHz)
+timer-frequency = 4_000_000_000 # uint
 # Timer interrupt num.
-timer-irq = "0x8000_0000_0000_0005" # uint
-uart-irq = 0x0a # uint
-# serial@10000000 {
-#     interrupts = <0x0a>;
-#     interrupt-parent = <0x03>;
-#     clock-frequency = "\08@";
-#     reg = <0x00 0x10000000 0x00 0x100>;
-#     compatible = "ns16550a";
-# };
-uart-paddr = 0x1000_0000 # uint
+timer-irq = 0xf0 # uint
 # VirtIO MMIO ranges with format (`base_paddr`, `size`).
-virtio-mmio-ranges = [
-    [0x1000_1000, 0x1000],
-    [0x1000_2000, 0x1000],
-    [0x1000_3000, 0x1000],
-    [0x1000_4000, 0x1000],
-    [0x1000_5000, 0x1000],
-    [0x1000_6000, 0x1000],
-    [0x1000_7000, 0x1000],
-    [0x1000_8000, 0x1000]
-] # [(uint, uint)]
+virtio-mmio-ranges = [] # [(uint, uint)]
 
 #
 # Platform configs
@@ -86,20 +46,20 @@ boot-stack-size = 0x40000 # uint
 # Number of CPUs.
 cpu-num = 1 # uint
 # Kernel address space base.
-kernel-aspace-base = "0xffff_ffc0_0000_0000" # uint
+kernel-aspace-base = "0xffff_8000_0000_0000" # uint
 # Kernel address space size.
-kernel-aspace-size = "0x0000_003f_ffff_f000" # uint
+kernel-aspace-size = "0x0000_7fff_ffff_f000" # uint
 # Base physical address of the kernel image.
-kernel-base-paddr = 0x8020_0000 # uint
+kernel-base-paddr = 0x20_0000 # uint
 # Base virtual address of the kernel image.
-kernel-base-vaddr = "0xffff_ffc0_8020_0000" # uint
+kernel-base-vaddr = "0xffff_8000_0020_0000" # uint
 # Offset of bus address and phys address. some boards, the bus address is
 # different from the physical address.
 phys-bus-offset = 0 # uint
 # Base address of the whole physical memory.
-phys-memory-base = 0x8000_0000 # uint
+phys-memory-base = 0 # uint
 # Size of the whole physical memory. (128M)
 phys-memory-size = 0x800_0000 # uint
 # Linear mapping offset, for quick conversions between physical and virtual
 # addresses.
-phys-virt-offset = "0xffff_ffc0_0000_0000" # uint
+phys-virt-offset = "0xffff_8000_0000_0000" # uint

Cargo.lock

@@ -23,6 +23,8 @@ include = [
 
 [features]
 default = []
+# Payload feature to enable building the origin binary
+payload = []
 # NOTE: axstd/fs is NOT used because arceos_api 0.2.2-preview.1 has an API
 # mismatch with axfs 0.2.2-preview.1. Instead, we enable filesystem via
 # axfeat/fs + axfeat/fs-fat and use axfs directly for file operations.
@@ -38,6 +40,11 @@ name = "xtask"
 path = "xtask/src/main.rs"
 required-features = ["xtask"]
 
+[[bin]]
+name = "origin"
+path = "payload/src/main.rs"
+required-features = ["payload"]
+
 [dependencies]
 axstd = { version = "0.2.2-preview.1", features = ["defplat", "alloc", "paging", "multitask", "sched-cfs", "uspace"], optional = true }
 # Enable FS init in axruntime (bypasses broken arceos_api/fs)
@@ -65,3 +72,6 @@ clap = { version = "4", features = ["derive"], optional = true }
 fatfs = { version = "0.3.6", optional = true }
 
 [profile.release]
+opt-level = "z"
+lto = true
+panic = "abort"

Cargo.toml

@@ -8,6 +8,14 @@ fn main() {
         return;
     }
 
+    if std::env::var("CARGO_FEATURE_PAYLOAD").is_ok() {
+        let manifest_dir = std::env::var("CARGO_MANIFEST_DIR").unwrap();
+        println!("cargo:rustc-link-arg=-T{}/payload/linker.ld", manifest_dir);
+        println!("cargo:rustc-link-arg=-nostdlib");
+        println!("cargo:rustc-link-arg=-static");
+        return;
+    }
+
     // The linker script is generated by axhal's build.rs at:
     //   target/<target_triple>/<profile>/linker_<platform>.lds
     let out_dir = std::env::var("OUT_DIR").unwrap();

build.rs

@@ -86,18 +86,19 @@ fn install_config(root: &Path, arch: &str) {
 /// Build the user-space payload binary for the target architecture.
 /// Equivalent to `make payload` in the original workflow.
 fn build_payload(root: &Path, info: &ArchInfo) -> PathBuf {
-    let payload_dir = root.join("payload");
-    let manifest = payload_dir.join("Cargo.toml");
-
     println!("Building payload for {} ...", info.target);
     let status = Command::new("cargo")
         .args([
             "build",
             "--release",
             "--target",
             info.target,
+            "--bin",
+            "origin",
+            "--features",
+            "payload",
             "--manifest-path",
-            manifest.to_str().unwrap(),
+            root.join("Cargo.toml").to_str().unwrap(),
         ])
         .status()
         .expect("failed to execute cargo build for payload");
@@ -107,7 +108,7 @@ fn build_payload(root: &Path, info: &ArchInfo) -> PathBuf {
     }
 
     // Objcopy to flat binary
-    let elf = payload_dir
+    let elf = root
         .join("target")
         .join(info.target)
         .join("release")