diff options
| author | Loic Guegan <manzerbredes@mailbox.org> | 2021-04-25 12:41:24 +0200 |
|---|---|---|
| committer | Loic Guegan <manzerbredes@mailbox.org> | 2021-04-25 12:41:24 +0200 |
| commit | 7db6db5ae64e7ab2626bbd898c63f58e053dc1a6 (patch) | |
| tree | aac3b4b8755acbea397709a00611642c2534f053 /src/boot | |
| parent | 657372f1be95393b76a54f258ba3f937b4073abe (diff) | |
Debug multiboot, enable apic and ACPI table parsing
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/boot.S | 2 | ||||
| -rw-r--r-- | src/boot/multiboot2.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/boot/boot.S b/src/boot/boot.S index 5e4d82c..029a67e 100644 --- a/src/boot/boot.S +++ b/src/boot/boot.S @@ -109,7 +109,7 @@ mov %eax, %cr0 # Now we are in Compatibility mode # Now we need to set CS.L=1 (setting up a 64 bit GDT) lgdt (gdtr) -jmp $0x08, $new_cs +ljmp $0x08, $new_cs new_cs: # Pay attention here! diff --git a/src/boot/multiboot2.cc b/src/boot/multiboot2.cc index b0e8c14..1b661b8 100644 --- a/src/boot/multiboot2.cc +++ b/src/boot/multiboot2.cc @@ -38,7 +38,7 @@ char mb2_find_new_rsdp(u32* mb2_info_addr, u64 *return_addr, u32 *return_size){ u32* addr=mb2_find_tag(mb2_info_addr,15); if(addr){ *return_size=addr[1]; - *return_addr=(u64)addr+2; + *return_addr=(u64)(addr+2); return 1; } return 0; @@ -48,7 +48,7 @@ char mb2_find_old_rsdp(u32* mb2_info_addr, u64 *return_addr, u32 *return_size){ u32* addr=mb2_find_tag(mb2_info_addr,14); if(addr){ *return_size=addr[1]; - *return_addr=(u64)addr+2; + *return_addr=(u64)(addr+2); return 1; } return 0; |