From a68a9a11c91c3aca4d6f2e8a32df673ca39ec34d Mon Sep 17 00:00:00 2001 From: Dennis Kobert Date: Sat, 9 Nov 2019 03:18:39 +0100 Subject: Fix swaped flag and stack arguments --- kernel/src/interrupts/exceptions.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/kernel/src/interrupts/exceptions.rs b/kernel/src/interrupts/exceptions.rs index 057adbc..1e7680a 100644 --- a/kernel/src/interrupts/exceptions.rs +++ b/kernel/src/interrupts/exceptions.rs @@ -2,12 +2,13 @@ use x86_64::structures::idt::{InterruptStackFrame, PageFaultErrorCode}; macro_rules! exception_default { ($stack_frame: expr) => { - format_args!("instruction addr: 0x{:08x}\nstack addr: 0x{:08x}\nflags: 0x{:x}", - $stack_frame.instruction_pointer.as_u64(), - $stack_frame.cpu_flags, - $stack_frame.stack_pointer.as_u64() - ) - } + format_args!( + "instruction addr: 0x{:08x}\nstack addr: 0x{:08x}\nflags: 0x{:x}", + $stack_frame.instruction_pointer.as_u64(), + $stack_frame.stack_pointer.as_u64(), + $stack_frame.cpu_flags, + ) + }; } pub extern "x86-interrupt" fn breakpoint_handler(stack_frame: &mut InterruptStackFrame) { -- cgit v1.2.3-70-g09d2