AbleOS/ableos
2
2
Fork 15
Code Issues Pull requests 1 Projects Releases Wiki Activity

various fixes, update to latest rust nightly

Browse source
This commit is contained in:
koniifer 2024-11-16 16:34:45 +00:00
parent d958a103fa
commit 2808bc9e7c
8 changed files with 27 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
Cargo.lock generated
View file

@ -1,6 +1,6 @@
# This file is automatically @generated by Cargo. # This file is automatically @generated by Cargo.
# It is not intended for manual editing. # It is not intended for manual editing.
version = 3 version = 4
[[package]] [[package]]
name = "aarch64-cpu" name = "aarch64-cpu"
@ -65,15 +65,6 @@ version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
[[package]]
name = "bumpalo"
version = "3.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
dependencies = [
"allocator-api2",
]
[[package]] [[package]]
name = "byteorder" name = "byteorder"
version = "1.5.0" version = "1.5.0"
@ -208,12 +199,6 @@ dependencies = [
"wasi", "wasi",
] ]
[[package]]
name = "hashbrown"
version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
[[package]] [[package]]
name = "hashbrown" name = "hashbrown"
version = "0.15.1" version = "0.15.1"
@ -228,24 +213,23 @@ dependencies = [
[[package]] [[package]]
name = "hbbytecode" name = "hbbytecode"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#baa70d3f1272c2cbb208ca17115dc54b7d31af5c" source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#4088bd18b189b15996a4bdd6ab47141372457875"
[[package]] [[package]]
name = "hblang" name = "hblang"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#baa70d3f1272c2cbb208ca17115dc54b7d31af5c" source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#4088bd18b189b15996a4bdd6ab47141372457875"
dependencies = [ dependencies = [
"hashbrown 0.15.1", "hashbrown",
"hbbytecode", "hbbytecode",
"hbvm", "hbvm",
"log", "log",
"regalloc2",
] ]
[[package]] [[package]]
name = "hbvm" name = "hbvm"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#baa70d3f1272c2cbb208ca17115dc54b7d31af5c" source = "git+https://git.ablecorp.us/AbleOS/holey-bytes.git#4088bd18b189b15996a4bdd6ab47141372457875"
dependencies = [ dependencies = [
"hbbytecode", "hbbytecode",
] ]
@ -396,7 +380,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
dependencies = [ dependencies = [
"equivalent", "equivalent",
"hashbrown 0.15.1", "hashbrown",
] ]
[[package]] [[package]]
@ -406,7 +390,7 @@ dependencies = [
"aarch64-cpu", "aarch64-cpu",
"crossbeam-queue", "crossbeam-queue",
"derive_more", "derive_more",
"hashbrown 0.15.1", "hashbrown",
"hbvm", "hbvm",
"limine", "limine",
"log", "log",
@ -428,9 +412,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.163" version = "0.2.164"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fdaeca4cf44ed4ac623e86ef41f056e848dbeab7ec043ecb7326ba300b36fd0" checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
[[package]] [[package]]
name = "limine" name = "limine"
@ -553,19 +537,6 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
] ]
[[package]]
name = "regalloc2"
version = "0.10.2"
source = "git+https://github.com/jakubDoka/regalloc2?branch=reuse-allocations#21c43e3ee182824e92e2b25f1d3c03ed47f9c02b"
dependencies = [
"allocator-api2",
"bumpalo",
"hashbrown 0.14.5",
"log",
"rustc-hash",
"smallvec",
]
[[package]] [[package]]
name = "regex-syntax" name = "regex-syntax"
version = "0.8.5" version = "0.8.5"
@ -602,12 +573,6 @@ dependencies = [
"windows-sys", "windows-sys",
] ]
[[package]]
name = "rustc-hash"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
[[package]] [[package]]
name = "rustc_version" name = "rustc_version"
version = "0.4.1" version = "0.4.1"
@ -619,9 +584,9 @@ dependencies = [
[[package]] [[package]]
name = "rustls" name = "rustls"
version = "0.23.16" version = "0.23.17"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eee87ff5d9b36712a58574e12e9f0ea80f915a5b0ac518d322b24a465617925e" checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e"
dependencies = [ dependencies = [
"log", "log",
"once_cell", "once_cell",

3
kernel/.cargo/config.toml
View file

@ -1,6 +1,3 @@
[unstable] [unstable]
build-std = ["core", "compiler_builtins", "alloc"] build-std = ["core", "compiler_builtins", "alloc"]
build-std-features = ["compiler-builtins-mem"] build-std-features = ["compiler-builtins-mem"]
[build]
target = "./targets/x86_64-ableos.json"

1
kernel/lds/x86_64.ld
View file

@ -38,6 +38,7 @@ SECTIONS
.data : { .data : {
*(.data .data.*) *(.data .data.*)
*(.got .got.*)
} :data } :data
.bss : { .bss : {

12
kernel/src/arch/mod.rs
View file

@ -14,11 +14,16 @@ arch_cond!(
riscv64: "riscv64", riscv64: "riscv64",
x86_64: "x86_64", x86_64: "x86_64",
); );
#[cfg(target_arch = "x86_64")]
use {crate::arch::interrupts::Interrupt, alloc::string::String}; use {crate::arch::interrupts::Interrupt, alloc::string::String};
#[cfg(target_arch = "x86_64")]
pub struct InterruptList { pub struct InterruptList {
list: HashMap<Interrupt, String>, list: HashMap<Interrupt, String>,
} }
#[cfg(target_arch = "x86_64")]
use hashbrown::HashMap; use hashbrown::HashMap;
#[cfg(target_arch = "x86_64")]
impl InterruptList { impl InterruptList {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
@ -26,10 +31,9 @@ impl InterruptList {
} }
} }
} }
use { #[cfg(target_arch = "x86_64")]
alloc::vec::Vec, use spin::{Lazy, Mutex};
spin::{Lazy, Mutex}, #[cfg(target_arch = "x86_64")]
};
pub static INTERRUPT_LIST: Lazy<Mutex<InterruptList>> = Lazy::new(|| { pub static INTERRUPT_LIST: Lazy<Mutex<InterruptList>> = Lazy::new(|| {
let mut il = InterruptList::new(); let mut il = InterruptList::new();
use crate::alloc::string::ToString; use crate::alloc::string::ToString;

6
kernel/src/arch/x86_64/mod.rs
View file

@ -33,7 +33,7 @@ const INITIAL_KERNEL_HEAP_SIZE: *const () = _initial_kernel_heap_size as _;
#[cfg(not(target_feature = "avx2"))] #[cfg(not(target_feature = "avx2"))]
unsafe extern "C" fn _kernel_start() -> ! { unsafe extern "C" fn _kernel_start() -> ! {
// Initialise SSE, then jump to kernel entrypoint // Initialise SSE, then jump to kernel entrypoint
core::arch::asm!( core::arch::naked_asm!(
// Initialise SSE // Initialise SSE
"mov rax, cr0", "mov rax, cr0",
"and ax, 0xfffb", "and ax, 0xfffb",
@ -46,7 +46,6 @@ unsafe extern "C" fn _kernel_start() -> ! {
// Jump to the kernel entry point // Jump to the kernel entry point
"jmp {}", "jmp {}",
sym start, sym start,
options(noreturn),
) )
} }
@ -54,7 +53,7 @@ unsafe extern "C" fn _kernel_start() -> ! {
#[naked] #[naked]
#[cfg(target_feature = "avx2")] #[cfg(target_feature = "avx2")]
unsafe extern "C" fn _kernel_start() -> ! { unsafe extern "C" fn _kernel_start() -> ! {
core::arch::asm!( core::arch::naked_asm!(
// Enable protected mode and configure control registers // Enable protected mode and configure control registers
"mov rax, cr0", "mov rax, cr0",
"and ax, 0xFFFB", // Clear CR0.EM (bit 2) for coprocessor emulation "and ax, 0xFFFB", // Clear CR0.EM (bit 2) for coprocessor emulation
@ -100,7 +99,6 @@ unsafe extern "C" fn _kernel_start() -> ! {
"jmp {0}", "jmp {0}",
sym start, sym start,
sym oops, sym oops,
options(noreturn),
) )
} }

3
kernel/src/lib.rs
View file

@ -5,7 +5,6 @@
#![feature( #![feature(
slice_split_once, slice_split_once,
exclusive_wrapper, exclusive_wrapper,
new_uninit,
core_intrinsics, core_intrinsics,
abi_x86_interrupt, abi_x86_interrupt,
alloc_error_handler, alloc_error_handler,
@ -15,7 +14,7 @@
pointer_is_aligned_to pointer_is_aligned_to
)] )]
#![test_runner(crate::test_runner)] #![test_runner(crate::test_runner)]
#![allow(dead_code, internal_features)] #![allow(dead_code, internal_features, static_mut_refs)]
extern crate alloc; extern crate alloc;
mod allocator; mod allocator;

2
kernel/targets/aarch64-virt-ableos.json
View file

@ -1,6 +1,6 @@
{ {
"arch": "aarch64", "arch": "aarch64",
"data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128", "data-layout": "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128-Fn32",
"disable-redzone": true, "disable-redzone": true,
"env": "", "env": "",
"executables": true, "executables": true,

4
rust-toolchain.toml
View file

@ -1,3 +1,5 @@
[toolchain] [toolchain]
channel = "nightly-2024-07-27" # old toolchain
# channel = "nightly-2024-07-27"
channel = "nightly"
components = ["rust-src", "llvm-tools"] components = ["rust-src", "llvm-tools"]