diff options
| author | dzwdz | 2022-07-17 14:39:45 +0200 |
|---|---|---|
| committer | dzwdz | 2022-07-17 14:39:45 +0200 |
| commit | 51cbabd0f40b041fa00203266afa046d14e88b22 (patch) | |
| tree | 75022bc959b32e72876dfe3449faecac6feb5caa /src/kernel/arch/amd64/32/boot.s | |
| parent | 4c10db944ca18c8001848c7e4e8ef51876bbe094 (diff) | |
amd64: remove dead code, combine shared code
Diffstat (limited to 'src/kernel/arch/amd64/32/boot.s')
| -rw-r--r-- | src/kernel/arch/amd64/32/boot.s | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/kernel/arch/amd64/32/boot.s b/src/kernel/arch/amd64/32/boot.s index af32007..0e21036 100644 --- a/src/kernel/arch/amd64/32/boot.s +++ b/src/kernel/arch/amd64/32/boot.s @@ -37,15 +37,14 @@ _start: pop %edi - // TODO import gdt.h for globals - mov $(2<<3), %eax - mov %eax, %ds // SEG_r0data + mov $(2 << 3), %eax // SEG_r0data + mov %eax, %ds mov %eax, %ss mov %eax, %es mov %eax, %fs mov %eax, %gs - ljmp $(1<<3), $boot64 // SEG_r0code + ljmp $(1 << 3), $boot64 // SEG_r0code panic_early: // output a vga Fuck @@ -53,12 +52,6 @@ panic_early: movl $0x4F6B4F63, 0xB872E jmp cpu_halt -// TODO not part of anything yet - call sysenter_setup - // TODO will fail - push %ebx // address of the Multiboot struct - call kmain_early - .global cpu_shutdown .type cpu_shutdown, @function cpu_shutdown: @@ -80,7 +73,6 @@ cpu_halt: .global cpu_pause .type cpu_pause, @function cpu_pause: - xchgw %bx, %bx sti hlt cli |