LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-20 09:49:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Kernel: Use VirtualAddress & PhysicalAddress classes from LibBareMetal

Browse Source
This commit is contained in:
Liav A 2020-02-09 18:15:58 +02:00 committed by Andreas Kling
parent 7c4dd0c8cf
commit 99ea80695e
Notes: sideshowbarker 2024-07-19 09:29:48 +09:00 
Author: https://github.com/supercomputer7
Commit: https://github.com/SerenityOS/serenity/commit/99ea80695e6
Pull-request: https://github.com/SerenityOS/serenity/pull/1194
16 changed files with 20 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kernel/ACPI/ACPIDynamicParser.h
View File

@ -30,8 +30,8 @@
#include <Kernel/ACPI/ACPIStaticParser.h>
#include <Kernel/IRQHandler.h>
#include <Kernel/Lock.h>
#include <Kernel/VM/PhysicalAddress.h>
#include <Kernel/VM/PhysicalPage.h>
#include <LibBareMetal/Memory/PhysicalAddress.h>
class ACPIDynamicParser final : public IRQHandler
, ACPIStaticParser {

6
Kernel/ACPI/ACPIParser.h
View File

@ -29,9 +29,9 @@
#include <AK/Types.h>
#include <Kernel/ACPI/Definitions.h>
#include <Kernel/FileSystem/File.h>
#include <Kernel/VM/PhysicalAddress.h>
#include <Kernel/VM/Region.h>
#include <Kernel/VM/VirtualAddress.h>
#include <LibBareMetal/Memory/PhysicalAddress.h>
#include <LibBareMetal/Memory/VirtualAddress.h>
class ACPIParser {
public:
@ -53,4 +53,4 @@ public:
protected:
explicit ACPIParser(bool usable);
bool m_operable;
};
};

4
Kernel/ACPI/DMIDecoder.h
View File

@ -28,9 +28,9 @@
#include <AK/Types.h>
#include <AK/Vector.h>
#include <Kernel/VM/PhysicalAddress.h>
#include <Kernel/VM/Region.h>
#include <Kernel/VM/VirtualAddress.h>
#include <LibBareMetal/Memory/PhysicalAddress.h>
#include <LibBareMetal/Memory/VirtualAddress.h>
namespace SMBIOS {
struct [[gnu::packed]] LegacyEntryPoint32bit

4
Kernel/Arch/i386/CPU.h
View File

@ -28,8 +28,8 @@
#include <AK/Badge.h>
#include <AK/Noncopyable.h>
#include <Kernel/VM/PhysicalAddress.h>
#include <Kernel/VM/VirtualAddress.h>
#include <LibBareMetal/Memory/PhysicalAddress.h>
#include <LibBareMetal/Memory/VirtualAddress.h>
#include <LibBareMetal/Output/kstdio.h>
#define PAGE_SIZE 4096

2
Kernel/Devices/BXVGADevice.h
View File

@ -29,7 +29,7 @@
#include <AK/String.h>
#include <AK/Types.h>
#include <Kernel/Devices/BlockDevice.h>
#include <Kernel/VM/PhysicalAddress.h>
#include <LibBareMetal/Memory/PhysicalAddress.h>
class BXVGADevice final : public BlockDevice {
AK_MAKE_ETERNAL

2
Kernel/Devices/FloppyDiskDevice.h
View File

@ -101,8 +101,8 @@
#include <Kernel/Devices/BlockDevice.h>
#include <Kernel/IRQHandler.h>
#include <Kernel/Lock.h>
#include <Kernel/VM/PhysicalAddress.h>
#include <Kernel/VM/PhysicalPage.h>
#include <LibBareMetal/Memory/PhysicalAddress.h>
struct FloppyControllerCommand {
u8 cmd; // Command to send to the controller

2
Kernel/Devices/MBVGADevice.h
View File

@ -29,7 +29,7 @@
#include <AK/String.h>
#include <AK/Types.h>
#include <Kernel/Devices/BlockDevice.h>
#include <Kernel/VM/PhysicalAddress.h>
#include <LibBareMetal/Memory/PhysicalAddress.h>
class MBVGADevice final : public BlockDevice {
AK_MAKE_ETERNAL

2
Kernel/Devices/PATAChannel.h
View File

@ -41,9 +41,9 @@
#include <Kernel/IRQHandler.h>
#include <Kernel/Lock.h>
#include <Kernel/PCI/Access.h>
#include <Kernel/VM/PhysicalAddress.h>
#include <Kernel/VM/PhysicalPage.h>
#include <Kernel/WaitQueue.h>
#include <LibBareMetal/Memory/PhysicalAddress.h>
struct PhysicalRegionDescriptor {
PhysicalAddress offset;

2
Kernel/Devices/SB16.h
View File

@ -29,9 +29,9 @@
#include <AK/CircularQueue.h>
#include <Kernel/Devices/CharacterDevice.h>
#include <Kernel/IRQHandler.h>
#include <Kernel/VM/PhysicalAddress.h>
#include <Kernel/VM/PhysicalPage.h>
#include <Kernel/WaitQueue.h>
#include <LibBareMetal/Memory/PhysicalAddress.h>
class SB16;

6
Kernel/FileSystem/File.h
View File

@ -26,13 +26,13 @@
#pragma once
#include <AK/String.h>
#include <AK/RefCounted.h>
#include <AK/NonnullRefPtr.h>
#include <AK/RefCounted.h>
#include <AK/String.h>
#include <AK/Types.h>
#include <Kernel/KResult.h>
#include <Kernel/UnixTypes.h>
#include <Kernel/VM/VirtualAddress.h>
#include <LibBareMetal/Memory/VirtualAddress.h>
class FileDescription;
class Process;

2
Kernel/FileSystem/FileDescription.h
View File

@ -36,7 +36,7 @@
#include <Kernel/FileSystem/VirtualFileSystem.h>
#include <Kernel/KBuffer.h>
#include <Kernel/Net/Socket.h>
#include <Kernel/VM/VirtualAddress.h>
#include <LibBareMetal/Memory/VirtualAddress.h>
class File;
class TTY;

2
Kernel/VM/AnonymousVMObject.h
View File

@ -26,8 +26,8 @@
#pragma once
#include <Kernel/VM/PhysicalAddress.h>
#include <Kernel/VM/VMObject.h>
#include <LibBareMetal/Memory/PhysicalAddress.h>
class AnonymousVMObject : public VMObject {
public:

66
Kernel/VM/PhysicalAddress.h
View File

@ -1,66 +0,0 @@
/*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#pragma once
#include <AK/LogStream.h>
#include <AK/Types.h>
class PhysicalAddress {
public:
PhysicalAddress() {}
explicit PhysicalAddress(uintptr_t address)
: m_address(address)
{
}
PhysicalAddress offset(uintptr_t o) const { return PhysicalAddress(m_address + o); }
uintptr_t get() const { return m_address; }
void set(uintptr_t address) { m_address = address; }
void mask(uintptr_t m) { m_address &= m; }
bool is_null() const { return m_address == 0; }
u8* as_ptr() { return reinterpret_cast<u8*>(m_address); }
const u8* as_ptr() const { return reinterpret_cast<const u8*>(m_address); }
PhysicalAddress page_base() const { return PhysicalAddress(m_address & 0xfffff000); }
bool operator==(const PhysicalAddress& other) const { return m_address == other.m_address; }
bool operator!=(const PhysicalAddress& other) const { return m_address != other.m_address; }
bool operator>(const PhysicalAddress& other) const { return m_address > other.m_address; }
bool operator>=(const PhysicalAddress& other) const { return m_address >= other.m_address; }
bool operator<(const PhysicalAddress& other) const { return m_address < other.m_address; }
bool operator<=(const PhysicalAddress& other) const { return m_address <= other.m_address; }
private:
uintptr_t m_address { 0 };
};
inline const LogStream& operator<<(const LogStream& stream, PhysicalAddress value)
{
return stream << 'P' << value.as_ptr();
}

2
Kernel/VM/PhysicalPage.h
View File

@ -29,7 +29,7 @@
#include <AK/NonnullRefPtr.h>
#include <Kernel/Assertions.h>
#include <Kernel/Heap/SlabAllocator.h>
#include <Kernel/VM/PhysicalAddress.h>
#include <LibBareMetal/Memory/PhysicalAddress.h>
class PhysicalPage {
friend class MemoryManager;

2
Kernel/VM/RangeAllocator.h
View File

@ -29,7 +29,7 @@
#include <AK/String.h>
#include <AK/Traits.h>
#include <AK/Vector.h>
#include <Kernel/VM/VirtualAddress.h>
#include <LibBareMetal/Memory/VirtualAddress.h>
class Range {
friend class RangeAllocator;

77
Kernel/VM/VirtualAddress.h
View File

@ -1,77 +0,0 @@
/*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#pragma once
#include <AK/LogStream.h>
#include <AK/Types.h>
class VirtualAddress {
public:
VirtualAddress() {}
explicit VirtualAddress(uintptr_t address)
: m_address(address)
{
}
explicit VirtualAddress(const void* address)
: m_address((uintptr_t)address)
{
}
bool is_null() const { return m_address == 0; }
bool is_page_aligned() const { return (m_address & 0xfff) == 0; }
VirtualAddress offset(uintptr_t o) const { return VirtualAddress(m_address + o); }
uintptr_t get() const { return m_address; }
void set(uintptr_t address) { m_address = address; }
void mask(uintptr_t m) { m_address &= m; }
bool operator<=(const VirtualAddress& other) const { return m_address <= other.m_address; }
bool operator>=(const VirtualAddress& other) const { return m_address >= other.m_address; }
bool operator>(const VirtualAddress& other) const { return m_address > other.m_address; }
bool operator<(const VirtualAddress& other) const { return m_address < other.m_address; }
bool operator==(const VirtualAddress& other) const { return m_address == other.m_address; }
bool operator!=(const VirtualAddress& other) const { return m_address != other.m_address; }
u8* as_ptr() { return reinterpret_cast<u8*>(m_address); }
const u8* as_ptr() const { return reinterpret_cast<const u8*>(m_address); }
VirtualAddress page_base() const { return VirtualAddress(m_address & 0xfffff000); }
private:
uintptr_t m_address { 0 };
};
inline VirtualAddress operator-(const VirtualAddress& a, const VirtualAddress& b)
{
return VirtualAddress(a.get() - b.get());
}
inline const LogStream& operator<<(const LogStream& stream, VirtualAddress value)
{
return stream << 'V' << value.as_ptr();
}