justin/jsix
1
1
Fork 0
mirror of https://github.com/justinian/jsix.git synced 2025-12-10 00:14:32 -08:00
Code Issues Packages Projects Releases Wiki Activity

[panic] Allow assert/panic to take optional user cpu_state

Browse Source 
In places where the "user" state is available, like interrupt handlers,
panic() and kassert() can now take an optional pointer to that user
cpu_state structure, and the panic handler will print that out as well.
This commit is contained in:
Justin C. Miller
2022-01-15 09:33:38 -08:00
parent 421fe33dc0
commit 4d9b33ecd4
8 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/kernel/assert.h
View File

@@ -16,6 +16,7 @@ extern void const *symbol_table;
__attribute__ ((always_inline))
inline void panic(
const char *message = nullptr,
const cpu_state *user = nullptr,
const char *function = __builtin_FUNCTION(),
const char *file = __builtin_FILE(),
uint64_t line = __builtin_LINE())
@@ -28,10 +29,13 @@ inline void panic(
// If we aren't the first CPU to panic, cpu.panic will be null
if (cpu.panic) {
cpu.panic->symbol_data = symbol_table;
cpu.panic->user_state = user;
cpu.panic->message = message;
cpu.panic->function = function;
cpu.panic->file = file;
cpu.panic->line = line;
cpu.panic->cpus = g_num_cpus;
*apic_icr = send_nmi_command;
@@ -48,12 +52,13 @@ __attribute__ ((always_inline))
inline void kassert(
bool check,
const char *message = nullptr,
const cpu_state *user = nullptr,
const char *function = __builtin_FUNCTION(),
const char *file = __builtin_FILE(),
uint64_t line = __builtin_LINE())
{
if (!check)
panic::panic(message, function, file, line);
panic::panic(message, user, function, file, line);
}
#define assert(x) kassert((x))