aboutsummaryrefslogtreecommitdiff
path: root/arch/x86_64/src/boot
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86_64/src/boot')
-rw-r--r--arch/x86_64/src/boot/boot.s16
1 files changed, 10 insertions, 6 deletions
diff --git a/arch/x86_64/src/boot/boot.s b/arch/x86_64/src/boot/boot.s
index f6c7978..35a6121 100644
--- a/arch/x86_64/src/boot/boot.s
+++ b/arch/x86_64/src/boot/boot.s
@@ -354,11 +354,8 @@ prepare_page_maps:
.section .boot_text, "ax", @progbits
.code64
-.global reload_segment_register_trampoline
-reload_segment_register_trampoline:
- jmp 0x08, $_reload_cs
-
-_reload_cs:
+.global segment_register_reload_pointer
+segment_register_reload_pointer:
xor %rax, %rax
mov %rax, %ss
mov %rax, %ds
@@ -369,7 +366,14 @@ _reload_cs:
ret
_transition_to_long_mode:
- call _reload_cs
+ //call segment_register_reload_pointer
+
+ xor %rax, %rax
+ mov %rax, %ss
+ mov %rax, %ds
+ mov %rax, %es
+ mov %rax, %fs
+ mov %rax, %gs
movl $0xb8000, (vga_buffer_pointer)