将中断中所有消息格式化换为新的message!宏

This commit is contained in:
pointer-to-bios 2024-05-02 20:51:57 +08:00
parent 6a935dc2b7
commit 47f16d060e
2 changed files with 15 additions and 12 deletions

View File

@ -13,15 +13,11 @@ unsafe extern "C" fn interrupt_req_UNSUPPORTED(rip: u64, rsp: u64, errcode: u64)
interrupt_rust_enter();
let tty = Tty::from_id(0).unwrap();
tty.enable();
let msg = message_raw!(
Msg("Panic:"),
FgColor::<u8>(Color::RED),
Msg(" Kernel hit an unsupported interrupt\n\twith %rip=0x"),
Msg(rip.to_hex_string()),
Msg(" and %rsp=0x"),
Msg(rsp.to_hex_string())
);
tty.print(msg);
tty.print(message!(
"{Panic}: Kernel hit an {Unsupported} interrupt. \n",
FmtMeta::Color(Color::RED),
FmtMeta::Color(Color::YELLOW)
));
loop {}
}
@ -31,11 +27,12 @@ unsafe extern "C" fn interrupt_req_DE(rip: u64, rsp: u64, errcode: u64) {
let tty = Tty::from_id(0).unwrap();
tty.enable();
tty.print(message!(
"{Panic}: divided by zero. rip=0x{}.\n",
"{Panic}: Kernel hit {Divid Error} on rip=0x{} and rsp=0x{}.\n",
FmtMeta::Color(Color::RED),
FmtMeta::Pointer(rip as usize)
FmtMeta::Color(Color::YELLOW),
FmtMeta::Pointer(rip as usize),
FmtMeta::Pointer(rsp as usize)
));
loop {}
interrupt_rust_leave();
}

View File

@ -47,6 +47,12 @@ macro_rules! message_raw {
#[macro_export]
macro_rules! message {
( $fmtter : expr ) => {{
use crate::kernel::tty::tty::MessageBuilder;
MessageBuilder::new()
.message($fmtter)
.build()
}};
( $fmtter : expr, $( $e : expr ),* ) => {{
use crate::{
kernel::tty::tty::{