From c25424d882fcadf0a37a4bc0cd9e08a605bc91a7 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 16 May 2025 10:54:40 +0200 Subject: fix(hal/ap): Use a safer origin address on the AMD64 HAL. Signed-off-by: Amlal El Mahrouss --- dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc') diff --git a/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc b/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc index 98e96687..f7aa2a70 100644 --- a/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc +++ b/dev/kernel/HALKit/AMD64/HalApplicationProcessor.cc @@ -15,7 +15,7 @@ #include #include "NewKit/Defines.h" -#define APIC_Signature "APIC" +#define APIC_MAG "APIC" #define AP_BLOB_SIZE 126 @@ -172,7 +172,7 @@ Void mp_init_cores(VoidPtr vendor_ptr) noexcept { PowerFactoryInterface hw_and_pow_int{vendor_ptr}; - kRawMADT = hw_and_pow_int.Find(APIC_Signature).Leak().Leak(); + kRawMADT = hw_and_pow_int.Find(APIC_MAG).Leak().Leak(); kMADTBlock = reinterpret_cast(kRawMADT); kSMPAware = NO; @@ -202,7 +202,7 @@ Void mp_init_cores(VoidPtr vendor_ptr) noexcept { controller.Write(LAPIC_REG_TIMER_LVT, 32 | (1 << 17)); controller.Write(LAPIC_REG_TIMER_INITCNT, 1000000); - const UIntPtr trampoline_phys = 0x8000; + const UIntPtr trampoline_phys = 0x7c00; HAL::mm_map_page((VoidPtr)trampoline_phys, (VoidPtr)trampoline_phys, HAL::kMMFlagsWr | HAL::kMMFlagsPresent); -- cgit v1.2.3