diff options
| author | Marvin Borner | 2020-01-26 18:41:23 +0100 |
|---|---|---|
| committer | GitHub | 2020-01-26 18:41:23 +0100 |
| commit | 43f501c74aa09f18c904ace902dc4cc5d241c218 (patch) | |
| tree | ea30b53ac6043faddd1cdb2fdea17f37178b1cc7 /src/kernel/boot.asm | |
| parent | d5d1749257ff8b9aa6b5ace4b4720b484a2860f3 (diff) | |
| parent | bb2a6b4d93512e8afc1b1999eb58f1f506cc27ae (diff) | |
Merged task-based userspace switching and updated heap/paging code
Awesome!
Diffstat (limited to 'src/kernel/boot.asm')
| -rw-r--r-- | src/kernel/boot.asm | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm index 85d4254..58ee8d6 100644 --- a/src/kernel/boot.asm +++ b/src/kernel/boot.asm @@ -15,16 +15,11 @@ section .text global _start extern kernel_main _start: - mov esp, STACK_TOP - push ebx - push eax + push esp cli call kernel_main cli - - hlt_L: - hlt - jmp hlt_L + jmp $ global jump_userspace jump_userspace: |