From fb790b07aeba8e22e4190cf3e1834d11ecde6c96 Mon Sep 17 00:00:00 2001 From: Amlal Date: Fri, 25 Apr 2025 13:08:33 +0200 Subject: dev: better .clang-format, ran format command. Signed-off-by: Amlal --- dev/kernel/KernelKit/DebugOutput.h | 268 +++++++++++++++++-------------------- 1 file changed, 122 insertions(+), 146 deletions(-) (limited to 'dev/kernel/KernelKit/DebugOutput.h') diff --git a/dev/kernel/KernelKit/DebugOutput.h b/dev/kernel/KernelKit/DebugOutput.h index 6d740138..7110a941 100644 --- a/dev/kernel/KernelKit/DebugOutput.h +++ b/dev/kernel/KernelKit/DebugOutput.h @@ -1,13 +1,13 @@ /* ------------------------------------------- - Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. + Copyright (C) 2024-2025, Amlal El Mahrouss, all rights reserved. ------------------------------------------- */ #pragma once -#include #include +#include #include #include @@ -19,183 +19,159 @@ #define kDebugMag3 'G' #define kDebugSourceFile 23 -#define kDebugLine 33 -#define kDebugTeam 43 -#define kDebugEOP 49 - -namespace Kernel -{ - class TerminalDevice; - class DTraceDevice; - - inline TerminalDevice end_line(); - inline TerminalDevice number(const Long& x); - inline TerminalDevice hex_number(const Long& x); - - // @brief Emulates a VT100 terminal. - class TerminalDevice final NE_DEVICE - { - public: - TerminalDevice(void (*print)(IDeviceObject*, const Char*), void (*gets)(IDeviceObject*, const Char*)) - : IDeviceObject(print, gets) - { - } - - ~TerminalDevice() override; - - /// @brief returns device name (terminal name) - /// @return string type (const Char*) - const Char* Name() const override - { - return ("TerminalDevice"); - } - - NE_COPY_DEFAULT(TerminalDevice) - - STATIC TerminalDevice The() noexcept; - }; - - inline TerminalDevice end_line() - { - TerminalDevice self = TerminalDevice::The(); - - self.operator<<("\r"); - return self; - } - - inline TerminalDevice carriage_return() - { - TerminalDevice self = TerminalDevice::The(); - - self.operator<<("\r"); - return self; - } - - inline TerminalDevice tabulate() - { - TerminalDevice self = TerminalDevice::The(); +#define kDebugLine 33 +#define kDebugTeam 43 +#define kDebugEOP 49 + +namespace Kernel { +class TerminalDevice; +class DTraceDevice; + +inline TerminalDevice end_line(); +inline TerminalDevice number(const Long& x); +inline TerminalDevice hex_number(const Long& x); + +// @brief Emulates a VT100 terminal. +class TerminalDevice final NE_DEVICE { + public: + TerminalDevice(void (*print)(IDeviceObject*, const Char*), + void (*gets)(IDeviceObject*, const Char*)) + : IDeviceObject(print, gets) {} + + ~TerminalDevice() override; + + /// @brief returns device name (terminal name) + /// @return string type (const Char*) + const Char* Name() const override { return ("TerminalDevice"); } + + NE_COPY_DEFAULT(TerminalDevice) + + STATIC TerminalDevice The() noexcept; +}; + +inline TerminalDevice end_line() { + TerminalDevice self = TerminalDevice::The(); + + self.operator<<("\r"); + return self; +} + +inline TerminalDevice carriage_return() { + TerminalDevice self = TerminalDevice::The(); + + self.operator<<("\r"); + return self; +} + +inline TerminalDevice tabulate() { + TerminalDevice self = TerminalDevice::The(); - self.operator<<("\t"); - return self; - } + self.operator<<("\t"); + return self; +} - /// @brief emulate a terminal bell, like the VT100 does. - inline TerminalDevice bell() - { - TerminalDevice self = TerminalDevice::The(); +/// @brief emulate a terminal bell, like the VT100 does. +inline TerminalDevice bell() { + TerminalDevice self = TerminalDevice::The(); - self.operator<<("\a"); - return self; - } + self.operator<<("\a"); + return self; +} - namespace Detail - { - inline TerminalDevice _write_number(const Long& x, TerminalDevice& term) - { - UInt64 y = (x > 0 ? x : -x) / 10; - UInt64 h = (x > 0 ? x : -x) % 10; +namespace Detail { + inline TerminalDevice _write_number(const Long& x, TerminalDevice& term) { + UInt64 y = (x > 0 ? x : -x) / 10; + UInt64 h = (x > 0 ? x : -x) % 10; - if (y) - _write_number(y, term); + if (y) _write_number(y, term); - /* fail if the number is not base-10 */ - if (h > 10) - { - _write_number('?', term); - return term; - } + /* fail if the number is not base-10 */ + if (h > 10) { + _write_number('?', term); + return term; + } - if (y == ~0UL) - y = -y; + if (y == ~0UL) y = -y; - const Char kNumbers[11] = "0123456789"; + const Char kNumbers[11] = "0123456789"; - Char buf[2]; - buf[0] = kNumbers[h]; - buf[1] = 0; + Char buf[2]; + buf[0] = kNumbers[h]; + buf[1] = 0; - term.operator<<(buf); - return term; - } + term.operator<<(buf); + return term; + } - inline TerminalDevice _write_number_hex(const Long& x, TerminalDevice& term) - { - UInt64 y = (x > 0 ? x : -x) / 16; - UInt64 h = (x > 0 ? x : -x) % 16; + inline TerminalDevice _write_number_hex(const Long& x, TerminalDevice& term) { + UInt64 y = (x > 0 ? x : -x) / 16; + UInt64 h = (x > 0 ? x : -x) % 16; - if (y) - _write_number_hex(y, term); + if (y) _write_number_hex(y, term); - /* fail if the hex number is not base-16 */ - if (h > 16) - { - _write_number_hex('?', term); - return term; - } + /* fail if the hex number is not base-16 */ + if (h > 16) { + _write_number_hex('?', term); + return term; + } - if (y == ~0UL) - y = -y; + if (y == ~0UL) y = -y; - const Char kNumbers[17] = "0123456789ABCDEF"; + const Char kNumbers[17] = "0123456789ABCDEF"; - Char buf[2]; - buf[0] = kNumbers[h]; - buf[1] = 0; + Char buf[2]; + buf[0] = kNumbers[h]; + buf[1] = 0; - term.operator<<(buf); - return term; - } - } // namespace Detail + term.operator<<(buf); + return term; + } +} // namespace Detail - inline TerminalDevice hex_number(const Long& x) - { - TerminalDevice self = TerminalDevice::The(); +inline TerminalDevice hex_number(const Long& x) { + TerminalDevice self = TerminalDevice::The(); - Detail::_write_number_hex(x, self); - self.operator<<("h"); + Detail::_write_number_hex(x, self); + self.operator<<("h"); - return self; - } + return self; +} - inline TerminalDevice number(const Long& x) - { - TerminalDevice self = TerminalDevice::The(); +inline TerminalDevice number(const Long& x) { + TerminalDevice self = TerminalDevice::The(); - Detail::_write_number(x, self); + Detail::_write_number(x, self); - return self; - } + return self; +} - inline TerminalDevice get_console_in(Char* buf) - { - TerminalDevice self = TerminalDevice::The(); +inline TerminalDevice get_console_in(Char* buf) { + TerminalDevice self = TerminalDevice::The(); - self >> buf; + self >> buf; - return self; - } + return self; +} - inline constexpr SizeT kDebugTypeLen = 256U; +inline constexpr SizeT kDebugTypeLen = 256U; - typedef Char rt_debug_type[kDebugTypeLen]; +typedef Char rt_debug_type[kDebugTypeLen]; - class DebuggerPortHeader final - { - public: - Int16 fPort; - Int16 fPortBsy; - }; +class DebuggerPortHeader final { + public: + Int16 fPort; + Int16 fPortBsy; +}; - inline TerminalDevice& operator<<(TerminalDevice& src, const Long& num) - { - src = number(num); - return src; - } -} // namespace Kernel +inline TerminalDevice& operator<<(TerminalDevice& src, const Long& num) { + src = number(num); + return src; +} +} // namespace Kernel #ifdef kout #undef kout -#endif // ifdef kout +#endif // ifdef kout #define kout TerminalDevice::The() -- cgit v1.2.3