From cd3ad989210dc8a3f5805dd5d4c4a6bd74e281db Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Thu, 16 Jan 2020 17:15:53 +0100
Subject: Quite a different approach to userspace paging

Hope this works soon!
---
 src/kernel/boot.asm | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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

diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm
index 6b95f4c..85d4254 100644
--- a/src/kernel/boot.asm
+++ b/src/kernel/boot.asm
@@ -29,7 +29,11 @@ section .text
     global jump_userspace
     jump_userspace:
         cli
-        mov ebx, dword [esp + 4]
+        push ebp
+        mov ebp, esp
+        mov edx, dword [esp + 0xC]
+        mov esp, edx
+        push 0xABCDEF
 
         mov ax, 0x23
         mov ds, ax
@@ -48,10 +52,12 @@ section .text
         push eax
 
         push 0x1B
-        push ebx
-        mov ebp, ebx
+        push dword [ebp + 8]
         iret
 
+        pop ebp
+        ret
+
 section .end_section
     global ASM_KERNEL_END
     ASM_KERNEL_END:
-- 
cgit v1.2.3