v0.3.0: basic display & console & interrupt

GZTimeWalker · Mar 29, 2022 · 9342ce3 · 9342ce3
1 parent c74f03f
commit 9342ce3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/pkg/kernel/.cargo/config b/pkg/kernel/.cargo/config
@@ -4,3 +4,6 @@ target = "config/x86_64-unknown-none.json"
 [unstable]
 build-std-features = ["compiler-builtins-mem"]
 build-std = ["core", "compiler_builtins"]
+
+[env]
+LOG = "trace"
diff --git a/pkg/kernel/src/main.rs b/pkg/kernel/src/main.rs
@@ -48,5 +48,10 @@ pub fn kernal_main(boot_info: &'static BootInfo) -> ! {
  x86_64::instructions::interrupts::enable();
  info!("Interrupts Enabled.");
 
+ trace!("Trace?");
+ debug!("Debug Test.");
+ warn!("Warning Test.");
+ error!("ERROR!!!");
+
  loop {}
 }
diff --git a/pkg/kernel/src/utils/math.rs b/pkg/kernel/src/utils/math.rs
@@ -1,17 +1,20 @@
 extern crate libm;
 
-macro_rules! no_mangle {
+/// export functions in libm for float calculate
+///
+/// ref: https://github.com/rust-lang/compiler-builtins/blob/master/src/math.rs
+macro_rules! libm_export {
  ($(fn $fun:ident($($iid:ident : $ity:ty),+) -> $oty:ty;)+) => {
  $(
  #[no_mangle]
  pub extern "C" fn $fun($($iid: $ity),+) -> $oty {
- self::libm::$fun($($iid),+)
+ libm::$fun($($iid),+)
  }
  )+
  }
 }
 
-no_mangle! {
+libm_export! {
  fn acos(x: f64) -> f64;
  fn asin(x: f64) -> f64;
  fn cbrt(x: f64) -> f64;