Fix panic due to not popping

svelterust · Jan 30, 2024 · cf6a03b · cf6a03b
1 parent 733b3ba
commit cf6a03b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/os/src/interrupts.rs b/os/src/interrupts.rs
@@ -93,6 +93,7 @@ extern "x86-interrupt" fn keyboard_interrupt_handler(_stack_frame: InterruptStac
                     // Get access to writer
                     let mut vga = vga::WRITER.lock();
                     vga.delete_character();
+                    repl::pop();
                 }
                 DecodedKey::Unicode(character) => {
                     if character == '\n' {

diff --git a/os/src/main.rs b/os/src/main.rs
@@ -35,7 +35,7 @@ fn kernel_main(boot_info: &'static BootInfo) -> ! {
 #[cfg(not(test))]
 #[panic_handler]
 fn panic(info: &core::panic::PanicInfo) -> ! {
-    println!("{}", info);
+    println!("\n{}", info);
     knarkos::hlt_loop();
 }
 

diff --git a/os/src/repl.rs b/os/src/repl.rs
@@ -10,6 +10,11 @@ lazy_static! {
     };
 }
 
+pub fn pop() {
+    let mut prompt = PROMPT.lock();
+    prompt.pop();
+}
+
 pub fn push(character: char) {
     match character as u8 {
         0x20..=0x7e => {