fix: update the environment variable and remove some warning

.cargo/config.toml

@@ -0,0 +1,4 @@
+
+[env]
+AX_WORK_DIR = { value = ".", relative = true }
+AX_LIBC_DIR = { value = "tools/axlibc", relative = true }

.gitignore

@@ -13,3 +13,4 @@ arceos-fada.itb
 !tools/rk3588/ramdisk.img
 !tools/axlibc
 linker_*
+crates/

Cargo.toml

@@ -1,31 +1,13 @@
-[workspace]
-resolver = "2"
-
-members = [
-    "tools/axlibc",
-    "apps/display",
-    "apps/exception",
-    "apps/helloworld",
-    "apps/memtest",
-    "apps/fs/shell",
-    "apps/net/echoserver",
-    "apps/net/httpclient",
-    "apps/net/httpserver",
-    "apps/net/udpserver",
-    "apps/net/bwbench",
-    "apps/task/parallel",
-    "apps/task/sleep",
-    "apps/task/yield",
-    "apps/task/priority",
-    "apps/task/tls",
-    "apps/monolithic_userboot"
-]
+[patch."https://github.com/rcore-os/smoltcp.git".smoltcp]
+branch = "starryos"
+git = "https://github.com/c0per/smoltcp"
 
-[profile.release]
+[profile.dev]
 lto = true
 
-[profile.dev]
+[profile.release]
 lto = true
 
-[patch."https://github.com/rcore-os/smoltcp.git"]
-smoltcp = { git = "https://github.com/c0per/smoltcp", branch = "starryos" }
+[workspace]
+members = ["tools/axlibc", "apps/display", "apps/exception", "apps/helloworld", "apps/memtest", "apps/fs/shell", "apps/net/echoserver", "apps/net/httpclient", "apps/net/httpserver", "apps/net/udpserver", "apps/net/bwbench", "apps/task/parallel", "apps/task/sleep", "apps/task/yield", "apps/task/priority", "apps/task/tls", "apps/monolithic_userboot"]
+resolver = "2"

Makefile

@@ -125,9 +125,6 @@ export AX_LOG=$(LOG)
 export AX_TARGET=$(TARGET)
 export AX_IP=$(IP)
 export AX_GW=$(GW)
-# 获取当前的工作目录
-export AX_WORK_DIR=$(CURDIR)
-export AX_LIBC_DIR=$(CURDIR)/tools/axlibc
 
 # Binutils
 CROSS_COMPILE ?= $(ARCH)-linux-musl-

apps/display/src/display.rs

@@ -1,7 +1,7 @@
 use embedded_graphics::pixelcolor::Rgb888;
 use embedded_graphics::prelude::{RgbColor, Size};
 use embedded_graphics::{draw_target::DrawTarget, prelude::OriginDimensions};
-
+#[cfg(feature = "axstd")]
 use std::os::arceos::api::display as api;
 
 pub struct Display {
@@ -11,14 +11,26 @@ pub struct Display {
 
 impl Display {
     pub fn new() -> Self {
-        let info = api::ax_framebuffer_info();
-        let fb =
-            unsafe { core::slice::from_raw_parts_mut(info.fb_base_vaddr as *mut u8, info.fb_size) };
-        let size = Size::new(info.width, info.height);
-        Self { size, fb }
+        #[cfg(feature = "axstd")]
+        {
+            let info = api::ax_framebuffer_info();
+            let fb = unsafe {
+                core::slice::from_raw_parts_mut(info.fb_base_vaddr as *mut u8, info.fb_size)
+            };
+            let size = Size::new(info.width, info.height);
+            Self { size, fb }
+        }
+        #[cfg(not(feature = "axstd"))]
+        {
+            Self {
+                size: Size::new(0, 0),
+                fb: &mut [],
+            }
+        }
     }
 
     pub fn flush(&self) {
+        #[cfg(feature = "axstd")]
         api::ax_framebuffer_flush();
     }
 }

apps/monolithic_userboot/Cargo.toml

@@ -9,7 +9,6 @@ authors = ["Youjie Zheng <[email protected]>"]
 [features]
 # Use "APP_FEATURES=batch" to enable batch mode
 batch = []
-ext4fs = ["axlibc/fs"]
+
 [dependencies]
 axstarry = { git = "https://github.com/Starry-OS/axstarry.git" }
-axlibc = { path = "../../tools/axlibc", optional = true }

apps/task/priority/src/main.rs

@@ -77,6 +77,7 @@ fn main() {
     for i in 0..PAYLOAD_KIND {
         let vec = data[i].clone();
         let data_len = TASK_PARAMS[i].data_len;
+        #[allow(unused_variables)]
         let nice = TASK_PARAMS[i].nice;
         tasks.push(thread::spawn(move || {
             #[cfg(feature = "axstd")]

apps/task/tls/src/main.rs

@@ -7,6 +7,7 @@
 #[cfg(feature = "axstd")]
 extern crate axstd as std;
 
+use core::ptr::addr_of;
 use std::{thread, vec::Vec};
 
 #[thread_local]
@@ -56,14 +57,14 @@ fn main() {
         get!(U16),
         get!(U32),
         get!(U64),
-        get!(std::str::from_utf8_unchecked(&STR))
+        get!(std::str::from_utf8_unchecked(&*addr_of!(STR)))
     );
     assert!(get!(BOOL));
     assert_eq!(get!(U8), 0xAA);
     assert_eq!(get!(U16), 0xcafe);
     assert_eq!(get!(U32), 0xdeadbeed);
     assert_eq!(get!(U64), 0xa2ce05_a2ce05);
-    assert_eq!(get!(&STR), b"Hello, world!");
+    assert_eq!(get!(&*addr_of!(STR)), b"Hello, world!");
 
     let mut tasks = Vec::new();
     for i in 1..=10 {
@@ -85,7 +86,7 @@ fn main() {
                 get!(U16),
                 get!(U32),
                 get!(U64),
-                get!(std::str::from_utf8_unchecked(&STR))
+                get!(std::str::from_utf8_unchecked(&*addr_of!(STR)))
             );
             assert_eq!(get!(BOOL), i % 2 == 0);
             assert_eq!(get!(U8), 0xAA + i as u8);
@@ -105,7 +106,7 @@ fn main() {
     assert_eq!(get!(U16), 0xcafe);
     assert_eq!(get!(U32), 0xdeadbeed);
     assert_eq!(get!(U64), 0xa2ce05_a2ce05);
-    assert_eq!(get!(&STR), b"Hello, world!");
+    assert_eq!(get!(&*addr_of!(STR)), b"Hello, world!");
 
     println!("TLS tests run OK!");
 }

tools/axlibc/.gitignore

@@ -1,3 +1,4 @@
 src/libctypes_gen.rs
 include/ax_pthread_mutex.h
 build_*
+lwext4*