Add the rust std as a custom sysroot
This commit is contained in:
22
library/.gitignore
vendored
Normal file
22
library/.gitignore
vendored
Normal file
@@ -0,0 +1,22 @@
|
||||
Cargo.lock
|
||||
Cargo.toml
|
||||
alloctests
|
||||
backtrace
|
||||
compiler-builtins
|
||||
core
|
||||
coretests
|
||||
panic_abort
|
||||
panic_unwind
|
||||
portable-simd
|
||||
proc_macro
|
||||
profiler_builtins
|
||||
rustc-std-workspace-alloc
|
||||
rustc-std-workspace-core
|
||||
rustc-std-workspace-std
|
||||
std_detect
|
||||
stdarch
|
||||
sysroot
|
||||
target
|
||||
test
|
||||
unwind
|
||||
windows_link
|
||||
108
library/justfile
Normal file
108
library/justfile
Normal file
@@ -0,0 +1,108 @@
|
||||
SRC_DIR := "std/src"
|
||||
PATCH_DIR := "std/patches"
|
||||
RUST_SRC := `rustc --print sysroot` / "lib/rustlib/src/rust/library"
|
||||
ROOT_LINKS := "\
|
||||
Cargo.toml backtrace std_detect panic_abort panic_unwind \
|
||||
windows_link unwind alloc rustc-std-workspace-alloc \
|
||||
rustc-std-workspace-core rustc-std-workspace-std \
|
||||
compiler-builtins core stdarch portable-simd proc_macro \
|
||||
profiler_builtins test coretests alloctests sysroot"
|
||||
REAL_CP_FILES := "\
|
||||
sys/args/mod.rs \
|
||||
sys/io/error/mod.rs \
|
||||
sys/pal/mod.rs \
|
||||
sys/random/mod.rs \
|
||||
sys/thread_local/mod.rs"
|
||||
STD_FILES := "\
|
||||
alloc.rs ascii.rs backtrace.rs bstr.rs env.rs error.rs fs.rs \
|
||||
keyword_docs.rs lib.rs macros.rs panic.rs panicking.rs pat.rs \
|
||||
path.rs process.rs random.rs rt.rs tests_helpers.rs time.rs \
|
||||
backtrace collections ffi fs hash io net num os/raw/mod.rs \
|
||||
os/raw/tests.rs os/mod.rs prelude process sync sys/alloc/mod.rs \
|
||||
sys/args/unsupported.rs sys/env/mod.rs sys/env/common.rs \
|
||||
sys/env/unsupported.rs sys/fd/mod.rs sys/fs/mod.rs \
|
||||
sys/fs/common.rs sys/fs/unsupported.rs sys/helpers/mod.rs \
|
||||
sys/helpers/small_c_string.rs sys/helpers/tests.rs sys/helpers/wstr.rs \
|
||||
sys/io/error/generic.rs sys/io/io_slice/unsupported.rs \
|
||||
sys/io/is_terminal/unsupported.rs sys/io/kernel_copy/mod.rs \
|
||||
sys/io/mod.rs sys/net/connection/mod.rs sys/net/connection/unsupported.rs \
|
||||
sys/net/hostname/mod.rs sys/net/hostname/unsupported.rs sys/net/mod.rs \
|
||||
sys/os_str/bytes/tests.rs sys/os_str/bytes.rs sys/os_str/mod.rs \
|
||||
sys/pal/unsupported/mod.rs sys/pal/unsupported/common.rs \
|
||||
sys/pal/unsupported/os.rs sys/path/mod.rs sys/path/unix.rs \
|
||||
sys/personality/dwarf/eh.rs sys/personality/dwarf/mod.rs \
|
||||
sys/personality/dwarf/tests.rs sys/personality/mod.rs sys/pipe/mod.rs \
|
||||
sys/pipe/unsupported.rs sys/platform_version/mod.rs sys/process/mod.rs \
|
||||
sys/process/env.rs sys/process/unsupported.rs sys/random/unsupported.rs \
|
||||
sys/stdio/mod.rs sys/stdio/unsupported.rs sys/sync/condvar/mod.rs \
|
||||
sys/sync/condvar/no_threads.rs sys/sync/mutex/mod.rs \
|
||||
sys/sync/mutex/no_threads.rs sys/sync/once/mod.rs \
|
||||
sys/sync/once/no_threads.rs sys/sync/rwlock/mod.rs \
|
||||
sys/sync/rwlock/no_threads.rs sys/sync/thread_parking/mod.rs \
|
||||
sys/sync/thread_parking/unsupported.rs sys/sync/mod.rs \
|
||||
sys/sync/once_box.rs sys/thread/mod.rs sys/thread/unsupported.rs \
|
||||
sys/thread_local/no_threads.rs sys/thread_local/os.rs sys/time/mod.rs \
|
||||
sys/time/unsupported.rs sys/backtrace.rs sys/cmath.rs \
|
||||
sys/configure_builtins.rs sys/env_consts.rs sys/exit.rs sys/mod.rs thread"
|
||||
KEEP_FILES := "sys sys/pal sys/pal/survos.rs sys/alloc sys/alloc/survos.rs"
|
||||
|
||||
setup-std:
|
||||
@echo "🔗 Linking root directories..."
|
||||
@for dir in {{ ROOT_LINKS }}; do ln -fs {{ RUST_SRC }}/$dir "."; done
|
||||
|
||||
@echo "📂 Processing std/src files..."
|
||||
@for f in {{ STD_FILES }}; do {{ just_executable() }} cp_std $f; done
|
||||
@for f in {{ REAL_CP_FILES }}; do {{ just_executable() }} real_cp_std $f; done
|
||||
|
||||
@{{ just_executable() }} cp_std "../build.rs"
|
||||
@{{ just_executable() }} cp_std "../Cargo.toml"
|
||||
@sed -i '59a\ || target_os == "survos"' std/src/../build.rs
|
||||
|
||||
update-std: setup-std patch-std
|
||||
|
||||
patch-std:
|
||||
@echo "🛠️ Patching the std..."
|
||||
@find {{ PATCH_DIR }} -type f -name "*.sed" | while read -r patch_file; do \
|
||||
rel="${patch_file#{{ PATCH_DIR }}/}"; \
|
||||
target="{{ SRC_DIR }}/${rel%.sed}.rs"; \
|
||||
if [ -f "$target" ]; then \
|
||||
echo " [SED] ${rel%.sed}.rs"; \
|
||||
sed -i -f "$patch_file" "$target"; \
|
||||
else \
|
||||
echo "⚠ [WARN] target missing: $target"; \
|
||||
fi; \
|
||||
done
|
||||
|
||||
build-sysroot:
|
||||
RUSTFLAGS="-Zforce-unstable-if-unmarked -C relocation-model=pic -C link-arg=-pie" \
|
||||
cargo build --package std --target ../riscv64.json --features compiler-builtins-mem
|
||||
mkdir -p ../sysroot/lib/rustlib/riscv64/lib
|
||||
rm -rf ../sysroot/lib/rustlib/riscv64/lib/*
|
||||
cp target/riscv64/debug/deps/*.rlib ../sysroot/lib/rustlib/riscv64/lib
|
||||
|
||||
clean:
|
||||
cargo clean
|
||||
rm -rf ../sysroot/lib/rustlib/riscv64/lib/*
|
||||
@for item in $(find library/std/src); do \
|
||||
basename_item=$(basename "$item"); \
|
||||
keep=0; \
|
||||
for protected in {{ KEEP_FILES }}; do \
|
||||
echo $basename_item = $protected; \
|
||||
if [ "$basename_item" = "$protected" ]; then keep=1; break; fi; \
|
||||
done; \
|
||||
if [ "$keep" -eq 0 ]; then \
|
||||
rm -rf "$item"; \
|
||||
fi; \
|
||||
done
|
||||
rm -f std/build.rs std/Cargo.toml Cargo.toml
|
||||
@for item in {{ ROOT_LINKS }}; do rm -rf $item; done
|
||||
|
||||
# --- Helpers ---
|
||||
|
||||
cp_std path:
|
||||
@mkdir -p {{ SRC_DIR / parent_directory(path) }}
|
||||
@ln -fs {{ RUST_SRC / "std/src" / path }} {{ parent_directory(SRC_DIR / path) }}
|
||||
|
||||
real_cp_std path:
|
||||
@mkdir -p {{ SRC_DIR / parent_directory(path) }}
|
||||
@cp -r {{ RUST_SRC / "std/src" / path }} {{ SRC_DIR / path }}
|
||||
146
library/std/.gitignore
vendored
Normal file
146
library/std/.gitignore
vendored
Normal file
@@ -0,0 +1,146 @@
|
||||
Cargo.lock
|
||||
Cargo.toml
|
||||
build.rs
|
||||
target
|
||||
src/random.rs
|
||||
src/num
|
||||
src/prelude
|
||||
src/sync
|
||||
src/fs.rs
|
||||
src/alloc.rs
|
||||
src/process
|
||||
src/backtrace.rs
|
||||
src/ascii.rs
|
||||
src/bstr.rs
|
||||
src/thread
|
||||
src/keyword_docs.rs
|
||||
src/tests_helpers.rs
|
||||
src/error.rs
|
||||
src/net
|
||||
src/rt.rs
|
||||
src/sys/args
|
||||
src/sys/args/mod.rs
|
||||
src/sys/args/unsupported.rs
|
||||
src/sys/thread_local
|
||||
src/sys/thread_local/os.rs
|
||||
src/sys/thread_local/no_threads.rs
|
||||
src/sys/thread_local/mod.rs
|
||||
src/sys/platform_version
|
||||
src/sys/platform_version/mod.rs
|
||||
src/sys/personality
|
||||
src/sys/personality/dwarf
|
||||
src/sys/personality/dwarf/eh.rs
|
||||
src/sys/personality/dwarf/mod.rs
|
||||
src/sys/personality/dwarf/tests.rs
|
||||
src/sys/personality/mod.rs
|
||||
src/sys/pal/mod.rs
|
||||
src/sys/pal/unsupported
|
||||
src/sys/pal/unsupported/os.rs
|
||||
src/sys/pal/unsupported/mod.rs
|
||||
src/sys/pal/unsupported/common.rs
|
||||
src/sys/sync
|
||||
src/sys/sync/condvar
|
||||
src/sys/sync/condvar/no_threads.rs
|
||||
src/sys/sync/condvar/mod.rs
|
||||
src/sys/sync/mutex
|
||||
src/sys/sync/mutex/no_threads.rs
|
||||
src/sys/sync/mutex/mod.rs
|
||||
src/sys/sync/once_box.rs
|
||||
src/sys/sync/rwlock
|
||||
src/sys/sync/rwlock/no_threads.rs
|
||||
src/sys/sync/rwlock/mod.rs
|
||||
src/sys/sync/mod.rs
|
||||
src/sys/sync/thread_parking
|
||||
src/sys/sync/thread_parking/mod.rs
|
||||
src/sys/sync/thread_parking/unsupported.rs
|
||||
src/sys/sync/once
|
||||
src/sys/sync/once/no_threads.rs
|
||||
src/sys/sync/once/mod.rs
|
||||
src/sys/fd
|
||||
src/sys/fd/mod.rs
|
||||
src/sys/process
|
||||
src/sys/process/mod.rs
|
||||
src/sys/process/env.rs
|
||||
src/sys/process/unsupported.rs
|
||||
src/sys/pipe
|
||||
src/sys/pipe/mod.rs
|
||||
src/sys/pipe/unsupported.rs
|
||||
src/sys/env_consts.rs
|
||||
src/sys/backtrace.rs
|
||||
src/sys/exit.rs
|
||||
src/sys/thread
|
||||
src/sys/thread/mod.rs
|
||||
src/sys/thread/unsupported.rs
|
||||
src/sys/env
|
||||
src/sys/env/mod.rs
|
||||
src/sys/env/common.rs
|
||||
src/sys/env/unsupported.rs
|
||||
src/sys/net
|
||||
src/sys/net/hostname
|
||||
src/sys/net/hostname/mod.rs
|
||||
src/sys/net/hostname/unsupported.rs
|
||||
src/sys/net/mod.rs
|
||||
src/sys/net/connection
|
||||
src/sys/net/connection/mod.rs
|
||||
src/sys/net/connection/unsupported.rs
|
||||
src/sys/path
|
||||
src/sys/path/mod.rs
|
||||
src/sys/path/unix.rs
|
||||
src/sys/configure_builtins.rs
|
||||
src/sys/mod.rs
|
||||
src/sys/time
|
||||
src/sys/time/mod.rs
|
||||
src/sys/time/unsupported.rs
|
||||
src/sys/stdio
|
||||
src/sys/stdio/mod.rs
|
||||
src/sys/stdio/unsupported.rs
|
||||
src/sys/cmath.rs
|
||||
src/sys/alloc/mod.rs
|
||||
src/sys/helpers
|
||||
src/sys/helpers/mod.rs
|
||||
src/sys/helpers/wstr.rs
|
||||
src/sys/helpers/tests.rs
|
||||
src/sys/helpers/small_c_string.rs
|
||||
src/sys/fs
|
||||
src/sys/fs/mod.rs
|
||||
src/sys/fs/common.rs
|
||||
src/sys/fs/unsupported.rs
|
||||
src/sys/random
|
||||
src/sys/random/mod.rs
|
||||
src/sys/random/unsupported.rs
|
||||
src/sys/io
|
||||
src/sys/io/is_terminal
|
||||
src/sys/io/is_terminal/unsupported.rs
|
||||
src/sys/io/mod.rs
|
||||
src/sys/io/io_slice
|
||||
src/sys/io/io_slice/unsupported.rs
|
||||
src/sys/io/error
|
||||
src/sys/io/error/mod.rs
|
||||
src/sys/io/error/generic.rs
|
||||
src/sys/io/kernel_copy
|
||||
src/sys/io/kernel_copy/mod.rs
|
||||
src/sys/os_str
|
||||
src/sys/os_str/mod.rs
|
||||
src/sys/os_str/bytes
|
||||
src/sys/os_str/bytes/tests.rs
|
||||
src/sys/os_str/bytes.rs
|
||||
src/macros.rs
|
||||
src/os
|
||||
src/os/mod.rs
|
||||
src/os/raw
|
||||
src/os/raw/mod.rs
|
||||
src/os/raw/tests.rs
|
||||
src/backtrace
|
||||
src/path.rs
|
||||
src/lib.rs
|
||||
src/process.rs
|
||||
src/ffi
|
||||
src/env.rs
|
||||
src/pat.rs
|
||||
src/fs
|
||||
src/panic.rs
|
||||
src/collections
|
||||
src/panicking.rs
|
||||
src/time.rs
|
||||
src/io
|
||||
src/hash
|
||||
3
library/std/patches/sys/alloc/mod.sed
Normal file
3
library/std/patches/sys/alloc/mod.sed
Normal file
@@ -0,0 +1,3 @@
|
||||
109a \ target_os = "survos" => { \
|
||||
mod survos; \
|
||||
}
|
||||
4
library/std/patches/sys/args/mod.sed
Normal file
4
library/std/patches/sys/args/mod.sed
Normal file
@@ -0,0 +1,4 @@
|
||||
# 55a \ target_os = "survos" => { \
|
||||
# mod survos; \
|
||||
# pub use survos::*; \
|
||||
# }
|
||||
1
library/std/patches/sys/io/error/mod.sed
Normal file
1
library/std/patches/sys/io/error/mod.sed
Normal file
@@ -0,0 +1 @@
|
||||
45a \ target_os = "survos",
|
||||
6
library/std/patches/sys/pal/mod.sed
Normal file
6
library/std/patches/sys/pal/mod.sed
Normal file
@@ -0,0 +1,6 @@
|
||||
62a \ target_os = "survos" => { \
|
||||
mod unsupported; \
|
||||
pub use self::unsupported::*; \
|
||||
mod survos; \
|
||||
pub use self::survos::*; \
|
||||
}
|
||||
2
library/std/patches/sys/random/mod.sed
Normal file
2
library/std/patches/sys/random/mod.sed
Normal file
@@ -0,0 +1,2 @@
|
||||
108a \target_os = "survos",
|
||||
124a \target_os = "survos",
|
||||
6
library/std/patches/sys/thread_local/mod.sed
Normal file
6
library/std/patches/sys/thread_local/mod.sed
Normal file
@@ -0,0 +1,6 @@
|
||||
32a \ target_os = "survos",
|
||||
|
||||
129a \ target_os = "survos" => { \
|
||||
// todo \
|
||||
pub(crate) fn enable() {} \
|
||||
}
|
||||
104
library/std/src/sys/alloc/survos.rs
Normal file
104
library/std/src/sys/alloc/survos.rs
Normal file
@@ -0,0 +1,104 @@
|
||||
#![allow(fuzzy_provenance_casts)]
|
||||
|
||||
use crate::alloc::{GlobalAlloc, Layout, System};
|
||||
|
||||
#[stable(feature = "alloc_system_type", since = "1.28.0")]
|
||||
unsafe impl GlobalAlloc for System {
|
||||
unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
|
||||
alloc(layout)
|
||||
}
|
||||
|
||||
unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
|
||||
dealloc(ptr, layout)
|
||||
}
|
||||
}
|
||||
|
||||
#[repr(u64)]
|
||||
enum SysCall {
|
||||
Read = 0,
|
||||
Write = 1,
|
||||
Open = 2,
|
||||
Close = 3,
|
||||
Seek = 8,
|
||||
Alloc = 40,
|
||||
Dealloc = 41,
|
||||
Spawn = 58,
|
||||
ExecVE = 59,
|
||||
Exit = 60,
|
||||
NanoSleep = 101,
|
||||
WriteIntTemp = 998,
|
||||
WriteTemp = 999,
|
||||
Unimplemented = 1 << 31,
|
||||
}
|
||||
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
unsafe fn _syscall(
|
||||
syscall: SysCall,
|
||||
mut a1: u64,
|
||||
mut a2: u64,
|
||||
mut a3: u64,
|
||||
mut a4: u64,
|
||||
mut a5: u64,
|
||||
mut a6: u64,
|
||||
mut a7: u64,
|
||||
) -> (u64, u64, u64, u64, u64, u64, u64, u64) {
|
||||
let mut a0 = syscall as u64;
|
||||
unsafe {
|
||||
core::arch::asm!(
|
||||
"ecall",
|
||||
inlateout("a0") a0,
|
||||
inlateout("a1") a1,
|
||||
inlateout("a2") a2,
|
||||
inlateout("a3") a3,
|
||||
inlateout("a4") a4,
|
||||
inlateout("a5") a5,
|
||||
inlateout("a6") a6,
|
||||
inlateout("a7") a7,
|
||||
clobber_abi("system")
|
||||
);
|
||||
}
|
||||
(a0, a1, a2, a3, a4, a5, a6, a7)
|
||||
}
|
||||
|
||||
macro_rules! syscall {
|
||||
($syscall:expr, $a1:expr, $a2:expr, $a3:expr, $a4:expr, $a5:expr, $a6:expr, $a7:expr) => {
|
||||
_syscall($syscall, $a1, $a2, $a3, $a4, $a5, $a6, $a7)
|
||||
};
|
||||
($syscall:expr, $a1:expr, $a2:expr, $a3:expr, $a4:expr, $a5:expr, $a6:expr) => {
|
||||
syscall!($syscall, $a1, $a2, $a3, $a4, $a5, $a6, 0)
|
||||
};
|
||||
($syscall:expr, $a1:expr, $a2:expr, $a3:expr, $a4:expr, $a5:expr) => {
|
||||
syscall!($syscall, $a1, $a2, $a3, $a4, $a5, 0)
|
||||
};
|
||||
($syscall:expr, $a1:expr, $a2:expr, $a3:expr, $a4:expr) => {
|
||||
syscall!($syscall, $a1, $a2, $a3, $a4, 0)
|
||||
};
|
||||
($syscall:expr, $a1:expr, $a2:expr, $a3:expr) => {
|
||||
syscall!($syscall, $a1, $a2, $a3, 0)
|
||||
};
|
||||
($syscall:expr, $a1:expr, $a2:expr) => {
|
||||
syscall!($syscall, $a1, $a2, 0)
|
||||
};
|
||||
($syscall:expr, $a1:expr) => {
|
||||
syscall!($syscall, $a1, 0)
|
||||
};
|
||||
($syscall:expr) => {
|
||||
syscall!($syscall, 0)
|
||||
};
|
||||
}
|
||||
|
||||
fn alloc(layout: Layout) -> *mut u8 {
|
||||
unsafe {
|
||||
let size = layout.size();
|
||||
let align = layout.align();
|
||||
let (ptr, ..) = syscall!(SysCall::Alloc, size as u64, align as u64);
|
||||
ptr as *mut u8
|
||||
}
|
||||
}
|
||||
fn dealloc(ptr: *mut u8, layout: core::alloc::Layout) {
|
||||
unsafe {
|
||||
let size = layout.size();
|
||||
let align = layout.align();
|
||||
syscall!(SysCall::Dealloc, ptr as u64, size as u64, align as u64);
|
||||
}
|
||||
}
|
||||
11
library/std/src/sys/pal/survos.rs
Normal file
11
library/std/src/sys/pal/survos.rs
Normal file
@@ -0,0 +1,11 @@
|
||||
/// # Safety
|
||||
/// `argc` and `argv` are passed by the kernel
|
||||
#[unsafe(no_mangle)]
|
||||
#[stable(feature = "rust1", since = "1.0.0")]
|
||||
pub unsafe extern "C" fn _start(argc: isize, argv: *const *const u8) -> isize {
|
||||
unsafe extern "C" {
|
||||
fn main(argc: isize, argv: *const *const u8) -> isize;
|
||||
}
|
||||
|
||||
unsafe { main(argc, argv) }
|
||||
}
|
||||
Reference in New Issue
Block a user