diff options
| author | Marvin Borner | 2020-01-16 21:08:43 +0100 |
|---|---|---|
| committer | GitHub | 2020-01-16 21:08:43 +0100 |
| commit | d5d1749257ff8b9aa6b5ace4b4720b484a2860f3 (patch) | |
| tree | a2cd4f1c7995e32c1c02b191324fa63f9d30655b /src/kernel/boot.asm | |
| parent | 602b98247e9c87e38870e39abf1d8b13aeae5d0f (diff) | |
| parent | 366119b53d5148922c5df7c7bd088ed71e95499a (diff) | |
Merged fancy userspace paging
Diffstat (limited to 'src/kernel/boot.asm')
| -rw-r--r-- | src/kernel/boot.asm | 12 |
1 files changed, 9 insertions, 3 deletions
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: |