summaryrefslogtreecommitdiff
path: root/src/kernel/arch/amd64/32/boot.s
diff options
context:
space:
mode:
Diffstat (limited to 'src/kernel/arch/amd64/32/boot.s')
-rw-r--r--src/kernel/arch/amd64/32/boot.s14
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