From ad84758768c407bd074a8cd2c10674856f5bc549 Mon Sep 17 00:00:00 2001 From: Ian Moffett Date: Thu, 28 Dec 2023 22:16:55 -0500 Subject: kernel/amd64: trap: Fix stack misalignment Some traps have error codes and others don't... Fix inconsistent error code handling. Signed-off-by: Ian Moffett --- sys/arch/amd64/amd64/trap.S | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/arch/amd64/amd64/trap.S b/sys/arch/amd64/amd64/trap.S index 9dc1f6a..1e60c23 100644 --- a/sys/arch/amd64/amd64/trap.S +++ b/sys/arch/amd64/amd64/trap.S @@ -87,7 +87,7 @@ invl_op: .globl double_fault double_fault: - push_trapframe $TRAP_DOUBLE_FAULT + push_trapframe_ec $TRAP_DOUBLE_FAULT handle_trap @@ -97,7 +97,7 @@ double_fault: .globl invl_tss invl_tss: - push_trapframe $TRAP_INVLTSS + push_trapframe_ec $TRAP_INVLTSS handle_trap @@ -107,7 +107,7 @@ invl_tss: .globl segnp segnp: - push_trapframe $TRAP_SEGNP + push_trapframe_ec $TRAP_SEGNP handle_trap @@ -117,7 +117,7 @@ segnp: .globl general_prot general_prot: - push_trapframe $TRAP_PROTFLT + push_trapframe_ec $TRAP_PROTFLT handle_trap @@ -127,7 +127,7 @@ general_prot: .globl page_fault page_fault: - push_trapframe $TRAP_PAGEFLT + push_trapframe_ec $TRAP_PAGEFLT handle_trap -- cgit v1.2.3