feat: fix shell

.cargo/config.toml

@@ -2,8 +2,15 @@
 bindeps = true
 
 [target.x86_64-unknown-linux-gnu]
-rustflags = ["-Cforce-frame-pointers=on"]
+rustflags = [
+  "-C", "force-frame-pointers=on"
+]
 
 [target.x86_64-unknown-none]
-rustflags = ["-Cforce-frame-pointers=on"]
+rustflags = [
+  "-C", "force-frame-pointers=on",
+  "-C", "code-model=large",
+  "-C", "relocation-model=static",
+  # "-C", "target-feature=+crt-static",
+]
 runner = "cargo run -p vmm --"

Cargo.toml

@@ -1,6 +1,6 @@
 [workspace]
-members = [ "common", "vmm", "kernel", "macros", "user", "arca" , "arcane", "fix"]
-default-members = [ "common", "vmm", "macros", "arca"]
+members = [ "common", "vmm", "kernel", "macros" , "user", "arca" , "arcane", "fix", "fix/runtime", "fix/handle", "fix/shell" ]
+default-members = [ "common", "vmm", "macros", "arca", "fix/handle" ]
 
 resolver = "2"
 

common/Cargo.toml

@@ -8,14 +8,14 @@ default = ["std"]
 std = ["alloc", "snafu/std", "libc", "nix"]
 alloc = []
 thread_local_cache = ["cache"]
-core_local_cache = ["macros", "cache"]
+core_local_cache = ["cache"]
 cache = []
 nix = ["dep:nix"]
 
 [dependencies]
 log = "0.4.22"
 snafu = { version="0.8.5", default-features=false }
-macros = { path = "../macros", optional=true }
+macros = { path = "../macros" }
 arca = { path = "../arca" }
 libc = { version="0.2.164", optional=true }
 elf = { version = "0.7.4", default-features = false }

common/src/bitpack.rs

@@ -0,0 +1,7 @@
+pub use macros::BitPack;
+
+pub trait BitPack {
+    const TAGBITS: u32;
+    fn pack(&self) -> [u8; 32];
+    fn unpack(content: [u8; 32]) -> Self;
+}

common/src/lib.rs

@@ -1,24 +1,18 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![feature(allocator_api)]
-#![feature(box_as_ptr)]
 #![feature(fn_traits)]
-#![feature(layout_for_ptr)]
-#![feature(maybe_uninit_as_bytes)]
+#![cfg_attr(feature = "std", feature(layout_for_ptr))]
 #![feature(negative_impls)]
-#![feature(new_range_api)]
 #![feature(ptr_metadata)]
-#![feature(slice_from_ptr_range)]
-#![feature(sync_unsafe_cell)]
-#![feature(try_trait_v2)]
-#![feature(test)]
+#![cfg_attr(test, feature(test))]
 #![feature(unboxed_closures)]
-#![cfg_attr(feature = "std", feature(thread_id_value))]
 #![cfg_attr(feature = "thread_local_cache", feature(thread_local))]
 
 pub mod buddy;
 pub mod refcnt;
 pub use buddy::BuddyAllocator;
 pub mod arrayvec;
+pub mod bitpack;
 pub mod controlreg;
 pub mod elfloader;
 pub mod ipaddr;

fix/Cargo.toml

@@ -14,11 +14,15 @@ klog-warn = ["kernel/klog-warn"]
 klog-error = ["kernel/klog-error"]
 klog-off = ["kernel/klog-off"]
 debugcon = ["kernel/debugcon"]
+testing-mode = ["fixhandle/testing-mode"]
 
 [dependencies]
 arca = { path = "../arca", features = ["serde"] }
 kernel = { path = "../kernel" }
+macros = { path = "../macros" }
 common = { path = "../common", default-features = false }
+fixhandle = { path = "handle" }
+fixruntime = { path = "runtime" }
 log = "0.4.27"
 serde = { version = "1.0.219", default-features = false, features = ["alloc", "derive"] }
 chrono = { version = "0.4.41", default-features = false, features = ["alloc", "serde"] }
@@ -30,9 +34,13 @@ trait-variant = "0.1.2"
 futures = { version = "0.3.31", default-features = false, features = ["alloc", "async-await"] }
 user = { path = "../user", artifact = "bin", target = "x86_64-unknown-none" }
 async-lock = { version = "3.4.1", default-features = false }
+bytemuck = "1.24.0"
+bitfield-struct = "0.11.0"
 
 [build-dependencies]
+fixshell = { path = "shell", artifact="staticlib", target = "x86_64-unknown-none" }
 anyhow = "1.0.98"
+bindgen = "0.72.1"
 cc = "1.2.30"
 autotools = "0.2.7"
 cmake = "0.1.54"