aboutsummaryrefslogtreecommitdiff
path: root/src/kernel/boot.asm
diff options
context:
space:
mode:
authorMarvin Borner2019-12-21 12:25:14 +0100
committerMarvin Borner2019-12-21 12:25:14 +0100
commit38610cd06dc0b5a3a4ee46f5fe7c341191aa2bc1 (patch)
tree759378766ee6b22d72a0f2fded1b0dd530376a6e /src/kernel/boot.asm
parent07530dd08e0b29573712b54543a7fc42672bb34b (diff)
Some userspace improvements
GAS is bad, NASM is awesome.
Diffstat (limited to 'src/kernel/boot.asm')
-rw-r--r--src/kernel/boot.asm9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm
index 8241786..2180069 100644
--- a/src/kernel/boot.asm
+++ b/src/kernel/boot.asm
@@ -38,7 +38,10 @@ section .text
global jump_userspace
jump_userspace:
- mov ebx, dword [esp+4]
+ push ebp
+ mov ebp, esp
+ mov edx, DWORD[ebp + 0xC]
+ mov esp, edx
mov ax, 0x23
mov ds, ax
@@ -56,8 +59,8 @@ section .text
push eax
push 0x1B
- push ebx
- mov ebp, ebx
+ push DWORD[ebp + 0x8]
+
iret
pop ebp
ret