mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 20:47:45 +00:00
Kernel: Move Prekernel{CPU, Exceptions}.cpp out of Prekernel directory
This lets us delete the Prekernel.h file, and gets us closer to deleting the Prekernel from the aarch64 Kernel.
This commit is contained in:
parent
e7c5fd978b
commit
e88cd338f1
7 changed files with 11 additions and 20 deletions
|
@ -7,3 +7,10 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define PAGE_MASK (~(FlatPtr)0xfffu)
|
#define PAGE_MASK (~(FlatPtr)0xfffu)
|
||||||
|
|
||||||
|
namespace Prekernel {
|
||||||
|
|
||||||
|
void drop_to_exception_level_1();
|
||||||
|
void init_prekernel_page_tables();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <Kernel/Arch/aarch64/ASM_wrapper.h>
|
#include <Kernel/Arch/aarch64/ASM_wrapper.h>
|
||||||
#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
|
#include <Kernel/Arch/aarch64/CPU.h>
|
||||||
#include <Kernel/Arch/aarch64/Registers.h>
|
#include <Kernel/Arch/aarch64/Registers.h>
|
||||||
#include <Kernel/Panic.h>
|
#include <Kernel/Panic.h>
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
#include <AK/Types.h>
|
#include <AK/Types.h>
|
||||||
|
|
||||||
#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
|
#include <Kernel/Arch/aarch64/CPU.h>
|
||||||
|
|
||||||
#include <Kernel/Arch/aarch64/ASM_wrapper.h>
|
#include <Kernel/Arch/aarch64/ASM_wrapper.h>
|
||||||
#include <Kernel/Arch/aarch64/RPi/MMIO.h>
|
#include <Kernel/Arch/aarch64/RPi/MMIO.h>
|
|
@ -1,14 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) 2021, James Mintram <me@jamesrm.com>
|
|
||||||
*
|
|
||||||
* SPDX-License-Identifier: BSD-2-Clause
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
namespace Prekernel {
|
|
||||||
|
|
||||||
void drop_to_exception_level_1();
|
|
||||||
void init_prekernel_page_tables();
|
|
||||||
|
|
||||||
}
|
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
#include <Kernel/Arch/Processor.h>
|
#include <Kernel/Arch/Processor.h>
|
||||||
#include <Kernel/Arch/aarch64/ASM_wrapper.h>
|
#include <Kernel/Arch/aarch64/ASM_wrapper.h>
|
||||||
#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
|
|
||||||
|
|
||||||
extern "C" uintptr_t vector_table_el1;
|
extern "C" uintptr_t vector_table_el1;
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,6 @@
|
||||||
|
|
||||||
#include <Kernel/Arch/Processor.h>
|
#include <Kernel/Arch/Processor.h>
|
||||||
#include <Kernel/Arch/aarch64/BootPPMParser.h>
|
#include <Kernel/Arch/aarch64/BootPPMParser.h>
|
||||||
#include <Kernel/Arch/aarch64/Prekernel/Prekernel.h>
|
|
||||||
#include <Kernel/Arch/aarch64/RPi/Framebuffer.h>
|
#include <Kernel/Arch/aarch64/RPi/Framebuffer.h>
|
||||||
#include <Kernel/Arch/aarch64/RPi/Mailbox.h>
|
#include <Kernel/Arch/aarch64/RPi/Mailbox.h>
|
||||||
#include <Kernel/Arch/aarch64/RPi/Timer.h>
|
#include <Kernel/Arch/aarch64/RPi/Timer.h>
|
||||||
|
|
|
@ -399,8 +399,6 @@ if (NOT "${SERENITY_ARCH}" STREQUAL "aarch64")
|
||||||
else()
|
else()
|
||||||
set(PREKERNEL_SOURCES
|
set(PREKERNEL_SOURCES
|
||||||
Arch/aarch64/Prekernel/boot.S
|
Arch/aarch64/Prekernel/boot.S
|
||||||
Arch/aarch64/Prekernel/PrekernelExceptions.cpp
|
|
||||||
Arch/aarch64/Prekernel/PrekernelMMU.cpp
|
|
||||||
|
|
||||||
Prekernel/UBSanitizer.cpp
|
Prekernel/UBSanitizer.cpp
|
||||||
)
|
)
|
||||||
|
@ -420,9 +418,11 @@ else()
|
||||||
Arch/aarch64/BootPPMParser.cpp
|
Arch/aarch64/BootPPMParser.cpp
|
||||||
Arch/aarch64/CrashHandler.cpp
|
Arch/aarch64/CrashHandler.cpp
|
||||||
Arch/aarch64/Dummy.cpp
|
Arch/aarch64/Dummy.cpp
|
||||||
|
Arch/aarch64/Exceptions.cpp
|
||||||
Arch/aarch64/init.cpp
|
Arch/aarch64/init.cpp
|
||||||
Arch/aarch64/kprintf.cpp
|
Arch/aarch64/kprintf.cpp
|
||||||
Arch/aarch64/MainIdRegister.cpp
|
Arch/aarch64/MainIdRegister.cpp
|
||||||
|
Arch/aarch64/MMU.cpp
|
||||||
Arch/aarch64/PageDirectory.cpp
|
Arch/aarch64/PageDirectory.cpp
|
||||||
Arch/aarch64/Panic.cpp
|
Arch/aarch64/Panic.cpp
|
||||||
Arch/aarch64/Processor.cpp
|
Arch/aarch64/Processor.cpp
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue