From 5ced36a91651f167918adc86ade5462bf166d54c Mon Sep 17 00:00:00 2001 From: Able Date: Mon, 22 Nov 2021 10:30:49 -0600 Subject: [PATCH] h --- ableos/.cargo/config.toml | 1 + ableos/src/lib.rs | 41 +++++++++++++++++++-------------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ableos/.cargo/config.toml b/ableos/.cargo/config.toml index e2703d6c..3120ea56 100644 --- a/ableos/.cargo/config.toml +++ b/ableos/.cargo/config.toml @@ -9,5 +9,6 @@ build-std = ["core","alloc", "compiler_builtins"] [target.'cfg(target_arch = "x86_64")'] # --quiet suppresses warning messages from the bootimage crate runner = "bootimage runner --quiet" + [target.riscv64gc-unknown-none-elf] rustflags = "-C link-arg=-T../ableos/src/arch/riscv/virt.lds" diff --git a/ableos/src/lib.rs b/ableos/src/lib.rs index 5261538b..3d95fafa 100644 --- a/ableos/src/lib.rs +++ b/ableos/src/lib.rs @@ -1,39 +1,38 @@ //! hi #![no_std] -// #![deny(warnings)] -#![feature(asm)] -#![feature(global_asm)] -#![feature(abi_x86_interrupt)] -#![feature(core_intrinsics, lang_items, llvm_asm)] -// #![feature(alloc_error_handler)] // at the top of the file -#![reexport_test_harness_main = "test_main"] -#![feature(custom_test_frameworks)] -#![test_runner(crate::arch::test_runner)] -#![feature(naked_functions)] -#[cfg(target_arch = "arm")] -#[path = "arch/aarch32/mod.rs"] -mod arch; +#![feature( + abi_x86_interrupt, + asm, + core_intrinsics, + global_asm, + lang_items, + llvm_asm, + naked_functions +)] #[cfg(target_arch = "aarch64")] #[path = "arch/aarch64/mod.rs"] -mod arch; +pub mod arch; #[cfg(target_arch = "x86_64")] #[path = "arch/x86_64/mod.rs"] -mod arch; +pub mod arch; + #[cfg(target_arch = "riscv64")] #[path = "arch/riscv/mod.rs"] -mod arch; +pub mod arch; + #[macro_use] pub mod print; use arch::drivers::serial; -mod driver_traits; -mod experiments; -mod kmain; -mod panic; -pub use experiments::server; +pub mod driver_traits; +pub mod experiments; pub mod keyboard; +pub mod kmain; +pub mod panic; pub mod relib; + +use experiments::server;