From 73e151edd0cf6e7d1e418a7cc8058b45162aa9eb Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Fri, 25 Dec 2020 12:51:11 +0100 Subject: [PATCH] Kernel: Add formatter for VirtualAddress --- Kernel/CMakeLists.txt | 1 + Kernel/VirtualAddress.cpp | 36 ++++++++++++++++++++++++++++++++++++ Kernel/VirtualAddress.h | 7 +++++++ 3 files changed, 44 insertions(+) create mode 100644 Kernel/VirtualAddress.cpp diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index 8ac692e8404..0767371ce91 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -201,6 +201,7 @@ set(KERNEL_SOURCES VM/Region.cpp VM/SharedInodeVMObject.cpp VM/VMObject.cpp + VirtualAddress.cpp WaitQueue.cpp init.cpp kprintf.cpp diff --git a/Kernel/VirtualAddress.cpp b/Kernel/VirtualAddress.cpp new file mode 100644 index 00000000000..0b3a8759c68 --- /dev/null +++ b/Kernel/VirtualAddress.cpp @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2020, Andreas Kling + * 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. + */ + +#include +#include + +namespace AK { +void Formatter::format(TypeErasedFormatParams& params, FormatBuilder& builder, const VirtualAddress& value) +{ + Formatter::format(params, builder, String::formatted("V{:p}", value.get())); +} + +} diff --git a/Kernel/VirtualAddress.h b/Kernel/VirtualAddress.h index 7b5da8d5e48..e26b8f0aeb5 100644 --- a/Kernel/VirtualAddress.h +++ b/Kernel/VirtualAddress.h @@ -75,3 +75,10 @@ inline const LogStream& operator<<(const LogStream& stream, VirtualAddress value { return stream << 'V' << value.as_ptr(); } + +namespace AK { +template<> +struct Formatter : Formatter { + void format(TypeErasedFormatParams&, FormatBuilder&, const VirtualAddress&); +}; +}