apio/Luna
1
1
Fork 0
Code Issues Pull Requests Actions Projects Releases 8 Wiki Activity

luna: Add a new SourceLocation class and use that in check() and expect()

Browse Source
This commit is contained in:
apio 2023-01-22 11:43:48 +01:00
parent 129297a0b0
commit 0126a8fb6e
Signed by: apio
GPG Key ID: B8A7D06E42258954
4 changed files with 55 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/src/Log.cpp
View File

@ -4,6 +4,7 @@
#include "arch/Timer.h"
#include "video/TextConsole.h"
#include <luna/Format.h>
#include <luna/SourceLocation.h>
static bool g_debug_enabled = true;
static bool g_serial_enabled = true;
@ -117,13 +118,14 @@ bool log_text_console_enabled()
static bool g_check_already_failed = false;
[[noreturn]] bool __check_failed(const char* file, const char* line, const char* func, const char* expr)
[[noreturn]] bool __check_failed(SourceLocation location, const char* expr)
{
CPU::disable_interrupts();
if (!g_check_already_failed)
{ // Avoid endlessly failing when trying to report a failed check.
g_check_already_failed = true;
kerrorln("ERROR: Check failed at %s:%s, in %s: %s", file, line, func, expr);
kerrorln("ERROR: Check failed at %s:%d, in %s: %s", location.file(), location.line(), location.function(),
expr);
CPU::print_stack_trace();
}
CPU::efficient_halt();

18
luna/include/luna/Check.h
View File

@ -1,6 +1,7 @@
#pragma once
#include <luna/SourceLocation.h>
[[noreturn]] extern bool __check_failed(const char* file, const char* line, const char* func, const char* expr);
[[noreturn]] extern bool __check_failed(SourceLocation location, const char* expr);
#ifndef STRINGIZE_VALUE_OF
#define STRINGIZE(x) #x
@ -10,22 +11,15 @@
// Like check(), but with a custom error message.
#define expect(expr, message) \
do { \
if (!(expr)) [[unlikely]] \
{ \
__check_failed(__FILE__, STRINGIZE_VALUE_OF(__LINE__), __PRETTY_FUNCTION__, message); \
} \
if (!(expr)) [[unlikely]] { __check_failed(SourceLocation::current(), message); } \
} while (0)
// Like assert(), but always enabled.
#define check(expr) \
do { \
if (!(expr)) [[unlikely]] \
{ \
__check_failed(__FILE__, STRINGIZE_VALUE_OF(__LINE__), __PRETTY_FUNCTION__, #expr); \
} \
if (!(expr)) [[unlikely]] { __check_failed(SourceLocation::current(), #expr); } \
} while (0)
#define unreachable() \
__check_failed(__FILE__, STRINGIZE_VALUE_OF(__LINE__), __PRETTY_FUNCTION__, "Reached unreachable code")
#define unreachable() __check_failed(SourceLocation::current(), "Reached unreachable code")
#define todo() __check_failed(__FILE__, STRINGIZE_VALUE_OF(__LINE__), __PRETTY_FUNCTION__, "Reached a TODO!")
#define todo() __check_failed(SourceLocation::current(), "Reached a TODO!")

42
luna/include/luna/SourceLocation.h Normal file
View File

@ -0,0 +1,42 @@
#pragma once
#include <luna/Types.h>
#ifndef STRINGIZE_VALUE_OF
#define STRINGIZE(x) #x
#define STRINGIZE_VALUE_OF(x) STRINGIZE(x)
#endif
class SourceLocation
{
public:
constexpr const char* file()
{
return m_file;
}
constexpr u32 line()
{
return m_line;
}
constexpr const char* function()
{
return m_function;
}
constexpr static SourceLocation current(const char* file = __builtin_FILE(), u32 line = __builtin_LINE(),
const char* function = __builtin_FUNCTION())
{
return SourceLocation { file, line, function };
}
private:
constexpr SourceLocation(const char* file, u32 line, const char* function)
: m_file(file), m_line(line), m_function(function)
{
}
const char* m_file;
u32 m_line;
const char* m_function;
};

5
luna/src/Check.cpp
View File

@ -1,11 +1,12 @@
#include <luna/Attributes.h>
#include <luna/SourceLocation.h>
#include <stdio.h>
#include <stdlib.h>
_weak [[noreturn]] bool __check_failed(const char* file, const char* line, const char* func, const char* expr)
_weak [[noreturn]] bool __check_failed(SourceLocation location, const char* expr)
{
// FIXME: Output to standard error instead of standard output.
printf("Check failed at %s:%s in %s: %s\n", file, line, func, expr);
printf("Check failed at %s:%d in %s: %s\n", location.file(), location.line(), location.function(), expr);
abort();
}