diff options
| author | Alexey Gavrilov <90127298+rebovas@users.noreply.github.com> | 2024-03-31 14:40:50 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-31 14:40:50 +0700 |
| commit | 18b4f9d1bff908fd91a48c1953ebcb8363855a59 (patch) | |
| tree | d309b630a161823c79dab9a48f67a41a40d76b24 /kernel | |
| parent | a276644952ed018e77ca64181059434a6bc4ee62 (diff) | |
| parent | 49cfee4e370892df8404e56d53b04dde196f82f2 (diff) | |
Merge pull request #6 from rebovas/idt
IDT + uintptr update
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/boot.s | 2 | ||||
| -rw-r--r-- | kernel/kernel.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kernel/boot.s b/kernel/boot.s index 987cb48..710bb7b 100644 --- a/kernel/boot.s +++ b/kernel/boot.s @@ -10,6 +10,7 @@ align 4 section .bss align 16 +resb 160 stack_bottom: resb 16384 stack_top: @@ -20,6 +21,7 @@ global _start:function (_start.end - _start) _start: mov esp, stack_top call main + int 0x20 cli .hang: hlt jmp .hang diff --git a/kernel/kernel.c b/kernel/kernel.c index 36fb0fd..09152b8 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -8,8 +8,8 @@ void main() { SecondaryInitialization init; - init.processorInitialize(); init.devicesInitialize(); + init.processorInitialize(); out::display << "Hello, World!\n"; Rsdp *rsdp = (Rsdp *)StringOperations::findInMemory(Rsdp::signatureString, @@ -29,6 +29,5 @@ void main() madt->getIcs(7), madt->getIcs(8)}; const IoapicStruct *ioapicStruct = (IoapicStruct *)icsEntry[1]; - out::display << '\n'; empty(); }; |