ulib: make axstd API more similar to rust std

- now apps can be built with both std and ArceOS without modification

.github/workflows/build.yml

@@ -91,3 +91,41 @@ jobs:
       run: make ARCH=${{ matrix.arch }} A=apps/c/udpserver
     - name: Build c/iperf
       run: make ARCH=${{ matrix.arch }} A=apps/c/iperf
+
+  build-apps-for-std:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        arch: [x86_64]
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions-rs/toolchain@v1
+      with:
+        profile: minimal
+        toolchain: ${{ env.rust-toolchain }}
+    - name: Build helloworld
+      run: cargo build -p arceos-helloworld
+    - name: Build memtest
+      run: cargo build -p arceos-memtest
+    - name: Build exception
+      run: cargo build -p arceos-exception
+    - name: Build task/yield
+      run: cargo build -p arceos-yield
+    - name: Build task/parallel
+      run: cargo build -p arceos-parallel
+    - name: Build task/sleep
+      run: cargo build -p arceos-sleep
+    - name: Build task/priority
+      run: cargo build -p arceos-priority
+    - name: Build fs/shell
+      run: cargo build -p arceos-shell
+    - name: Build net/echoserver
+      run: cargo build -p arceos-echoserver
+    - name: Build net/httpclient
+      run: cargo build -p arceos-httpclient
+    - name: Build net/httpserver
+      run: cargo build -p arceos-httpserver
+    - name: Build net/udpserver
+      run: cargo build -p arceos-udpserver

apps/display/Cargo.toml

@@ -7,5 +7,5 @@ authors = ["Shiping Yuan <[email protected]>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-axstd = { path = "../../ulib/axstd", features = ["display"] }
+axstd = { path = "../../ulib/axstd", features = ["display"], optional = true }
 embedded-graphics = "0.8"

apps/display/src/display.rs

@@ -2,7 +2,7 @@ use embedded_graphics::pixelcolor::Rgb888;
 use embedded_graphics::prelude::{RgbColor, Size};
 use embedded_graphics::{draw_target::DrawTarget, prelude::OriginDimensions};
 
-pub use axstd::display::{framebuffer_flush, framebuffer_info, DisplayInfo};
+pub use axstd::os::arceos::axdisplay::{framebuffer_flush, framebuffer_info, DisplayInfo};
 
 pub struct Display {
     size: Size,

apps/display/src/main.rs

@@ -1,9 +1,10 @@
-#![no_std]
-#![no_main]
+#![cfg_attr(feature = "axstd", no_std)]
+#![cfg_attr(feature = "axstd", no_main)]
 
-extern crate axstd;
-mod display;
+#[cfg(feature = "axstd")]
+extern crate axstd as std;
 
+mod display;
 use display::*;
 
 use embedded_graphics::{
@@ -77,7 +78,7 @@ fn test_gpu() -> i32 {
     0
 }
 
-#[no_mangle]
+#[cfg_attr(feature = "axstd", no_mangle)]
 fn main() -> ! {
     test_gpu();
     loop {

apps/exception/Cargo.toml

@@ -7,4 +7,4 @@ authors = ["Yuekai Jia <[email protected]>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-axstd = { path = "../../ulib/axstd", features = ["paging"] }
+axstd = { path = "../../ulib/axstd", optional = true }

apps/exception/expect_debug_aarch64.out

@@ -11,8 +11,6 @@ Found physcial memory regions:
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
-Initialize global memory allocator...
-Initialize kernel page table...
 Initialize platform devices...
 Primary CPU 0 init OK.
 Running exception tests...

apps/exception/expect_debug_riscv64.out

@@ -11,8 +11,6 @@ Found physcial memory regions:
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
-Initialize global memory allocator...
-Initialize kernel page table...
 Initialize platform devices...
 Primary CPU 0 init OK.
 Running exception tests...

apps/exception/expect_debug_x86_64.out

@@ -11,8 +11,7 @@ Found physcial memory regions:
  boot stack (READ | WRITE | RESERVED)
  .bss (READ | WRITE | RESERVED)
  free memory (READ | WRITE | FREE)
-Initialize global memory allocator...
-Initialize kernel page table...
+Initialize platform devices...
 Primary CPU 0 init OK.
 Running exception tests...
 #BP @ 0x[0-9a-f]\{16\}

apps/exception/src/main.rs

@@ -1,8 +1,11 @@
-#![no_std]
-#![no_main]
+#![cfg_attr(feature = "axstd", no_std)]
+#![cfg_attr(feature = "axstd", no_main)]
 
-use axstd::println;
-use core::arch::asm;
+#[cfg(feature = "axstd")]
+extern crate axstd as std;
+
+use std::arch::asm;
+use std::println;
 
 fn raise_break_exception() {
     unsafe {
@@ -15,7 +18,7 @@ fn raise_break_exception() {
     }
 }
 
-#[no_mangle]
+#[cfg_attr(feature = "axstd", no_mangle)]
 fn main() {
     println!("Running exception tests...");
     raise_break_exception();

apps/fs/shell/Cargo.toml

@@ -7,12 +7,11 @@ authors = ["Yuekai Jia <[email protected]>"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-use_ramfs = ["axfs/myfs", "dep:axfs_vfs", "dep:axfs_ramfs", "dep:crate_interface"]
+use-ramfs = ["axstd/myfs", "dep:axfs_vfs", "dep:axfs_ramfs", "dep:crate_interface"]
 default = []
 
 [dependencies]
-axfs = { path = "../../../modules/axfs", optional = true }
 axfs_vfs = { path = "../../../crates/axfs_vfs", optional = true }
 axfs_ramfs = { path = "../../../crates/axfs_ramfs", optional = true }
 crate_interface = { path = "../../../crates/crate_interface", optional = true }
-axstd = { path = "../../../ulib/axstd", features = ["fs"] }
+axstd = { path = "../../../ulib/axstd", features = ["alloc", "fs"], optional = true }