RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 19:22:45 +00:00
Code Issues Activity Actions

Kernel: Replace calls to Prekernel::panic() with PANIC macro on aarch64

Browse source
This commit is contained in:
Timon Kruiper 2022-05-03 01:46:26 +02:00 • committed by Andreas Kling
parent e81e1fa9c8
commit f8e4eecbfb
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Kernel/Arch/aarch64/Prekernel/PrekernelExceptions.cpp
View file

@ -8,6 +8,7 @@
#include <Kernel/Arch/aarch64/Prekernel/Aarch64_asm_utils.h>
#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
#include <Kernel/Arch/aarch64/Registers.h>
#include <Kernel/Panic.h>
extern "C" void enter_el2_from_el3();
extern "C" void enter_el1_from_el2();
@ -93,7 +94,7 @@ void drop_to_exception_level_1()
set_up_el1();
break;
default: {
Prekernel::panic("FATAL: CPU booted in unsupported exception mode!\r\n");
PANIC("CPU booted in unsupported exception mode!");
}
}
}

7
Kernel/Arch/aarch64/Prekernel/PrekernelMMU.cpp
View file

@ -12,6 +12,7 @@
#include <Kernel/Arch/aarch64/RPi/MMIO.h>
#include <Kernel/Arch/aarch64/RPi/UART.h>
#include <Kernel/Arch/aarch64/Registers.h>
#include <Kernel/Panic.h>
// Documentation here for Aarch64 Address Translations
// https://documentation-service.arm.com/static/5efa1d23dbdee951c1ccdec5?token=
@ -62,17 +63,17 @@ public:
, m_current(start)
{
if (m_start >= m_end) {
Prekernel::panic("Invalid memory range passed to PageBumpAllocator");
PANIC("Invalid memory range passed to PageBumpAllocator");
}
if ((FlatPtr)m_start % PAGE_TABLE_SIZE != 0 || (FlatPtr)m_end % PAGE_TABLE_SIZE != 0) {
Prekernel::panic("Memory range passed into PageBumpAllocator not aligned to PAGE_TABLE_SIZE");
PANIC("Memory range passed into PageBumpAllocator not aligned to PAGE_TABLE_SIZE");
}
}
u64* take_page()
{
if (m_current == m_end) {
Prekernel::panic("Prekernel pagetable memory exhausted");
PANIC("Prekernel pagetable memory exhausted");
}
u64* page = m_current;