From 7db6db5ae64e7ab2626bbd898c63f58e053dc1a6 Mon Sep 17 00:00:00 2001
From: Loic Guegan <manzerbredes@mailbox.org>
Date: Sun, 25 Apr 2021 12:41:24 +0200
Subject: Debug multiboot, enable apic and ACPI table parsing

---
 src/boot/boot.S        | 2 +-
 src/boot/multiboot2.cc | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/boot')

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;   
-- 
cgit v1.2.3