From ae9c1d1b16061242068353ff9064c8c9ef63b577 Mon Sep 17 00:00:00 2001
From: dzwdz
Date: Sat, 24 Jul 2021 18:53:34 +0200
Subject: sysexit() now overrides all registers

when doing anything more complex than starting a new program, you pretty
much need to pass a full register dump. otherwise stuff will break
---
 src/kernel/arch/i386/sysenter.s | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/kernel/arch/i386/sysenter.s')

diff --git a/src/kernel/arch/i386/sysenter.s b/src/kernel/arch/i386/sysenter.s
index a982dd8..24cbc89 100644
--- a/src/kernel/arch/i386/sysenter.s
+++ b/src/kernel/arch/i386/sysenter.s
@@ -8,12 +8,9 @@
 .set IA32_SYSENTER_EIP, 0x176
 
 .section .text
-.global sysexit
-.type sysexit, @function
-sysexit:
-	mov 4(%esp), %edx
-	mov 8(%esp), %ecx
-
+.global _sysexit_real
+.type _sysexit_real, @function
+_sysexit_real:
 	mov $(SEG_r3data << 3 | 3), %ax
 	mov %ax, %ds
 	mov %ax, %es
@@ -25,6 +22,9 @@ sysexit:
 	or $0x80000000, %eax
 	mov %eax, %cr0
 
+	// restore the registers
+	mov $_sysexit_regs, %esp
+	popal // probably a bad idea
 	sysexit
 
 
-- 
cgit v1.2.3