Merge pull request #105 from rcore-os/refactor-ulib

Refactor ulib

.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

Cargo.toml

@@ -62,7 +62,8 @@ members = [
     "modules/axsync",
     "modules/axtask",
 
-    "ulib/libax",
+    "ulib/axstd",
+    "ulib/axlibc",
 ]
 
 [profile.release]

Makefile

@@ -169,7 +169,7 @@ fmt:
 	cargo fmt --all
 
 fmt_c:
-	@clang-format --style=file -i $(shell find ulib/c_libax -iname '*.c' -o -iname '*.h')
+	@clang-format --style=file -i $(shell find ulib/axlibc -iname '*.c' -o -iname '*.h')
 
 test:
 	$(call app_test)
@@ -192,7 +192,7 @@ clean: clean_c
 	cargo clean
 
 clean_c:
-	rm -rf ulib/c_libax/build_*
+	rm -rf ulib/axlibc/build_*
 	rm -rf $(app-objs)
 
 .PHONY: all build disasm run justrun debug clippy fmt fmt_c test test_no_fail_fast clean clean_c doc disk_image

README.md

@@ -114,14 +114,14 @@ make A=apps/net/httpserver ARCH=aarch64 LOG=info NET=y SMP=4 run
 #### Rust
 
 1. Create a new rust package with `no_std` and `no_main` environment.
-2. Add `libax` dependency and features to enable to `Cargo.toml`:
+2. Add `axstd` dependency and features to enable to `Cargo.toml`:
 
     ```toml
     [dependencies]
-    libax = { path = "/path/to/arceos/ulib/libax", features = ["..."] }
+    axstd = { path = "/path/to/arceos/ulib/axstd", features = ["..."] }
     ```
 
-3. Call library functions from `libax` in your code, like the [helloworld](apps/helloworld/) example.
+3. Call library functions from `axstd` in your code, just like the Rust [std](https://doc.rust-lang.org/std/) library.
 4. Build your application with ArceOS, by running the `make` command in the application directory:
 
     ```bash

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]
-libax = { path = "../../ulib/libax", 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 libax::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 libax;
-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]
-libax = { path = "../../ulib/libax", features = ["paging"] }
+axstd = { path = "../../ulib/axstd", optional = true }