From 499784a824c541001c2fd52ae95eba88dcfc952b Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Sat, 21 Dec 2019 22:22:03 +0100
Subject: Many debugging/serial improvements

Sorry for the little information, but I did many things :)
---
 src/kernel/boot.asm | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/kernel/boot.asm')

diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm
index 2180069..3353a30 100644
--- a/src/kernel/boot.asm
+++ b/src/kernel/boot.asm
@@ -38,10 +38,8 @@ section .text
 
     global jump_userspace
     jump_userspace:
-        push ebp
-        mov ebp, esp
-        mov edx, DWORD[ebp + 0xC]
-        mov esp, edx
+        cli
+        mov ebx, dword [esp + 4]
 
         mov ax, 0x23
         mov ds, ax
@@ -53,17 +51,16 @@ section .text
         push 0x23
         push eax
         pushf
-        pop eax
 
+        ; Enable interrupts
+        pop eax
         or eax, 0x200
         push eax
-        push 0x1B
-
-        push DWORD[ebp + 0x8]
 
+        push 0x1B
+        push ebx
+        mov ebp, ebx
         iret
-        pop ebp
-        ret
 
 section .end_section
     global ASM_KERNEL_END
-- 
cgit v1.2.3