mirror of
https://github.com/Atmosphere-NX/Atmosphere.git
synced 2025-05-14 07:04:24 -04:00
kern: improve panic output
This commit is contained in:
parent
5b98426171
commit
b3e6571586
1 changed files with 74 additions and 27 deletions
|
@ -29,13 +29,56 @@ namespace ams::kern {
|
|||
|
||||
namespace {
|
||||
|
||||
size_t g_panic_count = 0;
|
||||
constexpr std::array<s32, cpu::NumCores> NegativeArray = [] {
|
||||
std::array<s32, cpu::NumCores> arr = {};
|
||||
for (size_t i = 0; i < arr.size(); i++) {
|
||||
arr[i] = -1;
|
||||
}
|
||||
return arr;
|
||||
}();
|
||||
|
||||
std::atomic<s32> g_next_ticket = 0;
|
||||
std::atomic<s32> g_current_ticket = 0;
|
||||
|
||||
std::array<s32, cpu::NumCores> g_core_tickets = NegativeArray;
|
||||
|
||||
s32 GetCoreTicket() {
|
||||
const s32 core_id = GetCurrentCoreId();
|
||||
if (g_core_tickets[core_id] == -1) {
|
||||
g_core_tickets[core_id] = 2 * g_next_ticket.fetch_add(1);
|
||||
}
|
||||
return g_core_tickets[core_id];
|
||||
}
|
||||
|
||||
void WaitCoreTicket() {
|
||||
const s32 expected = GetCoreTicket();
|
||||
const s32 desired = expected + 1;
|
||||
s32 compare = g_current_ticket;
|
||||
do {
|
||||
if (compare == desired) {
|
||||
break;
|
||||
}
|
||||
compare = expected;
|
||||
} while (!g_current_ticket.compare_exchange_weak(compare, desired));
|
||||
}
|
||||
|
||||
void ReleaseCoreTicket() {
|
||||
const s32 expected = GetCoreTicket() + 1;
|
||||
const s32 desired = expected + 1;
|
||||
s32 compare = g_current_ticket;
|
||||
do {
|
||||
if (compare != expected) {
|
||||
break;
|
||||
}
|
||||
} while (!g_current_ticket.compare_exchange_weak(compare, desired));
|
||||
}
|
||||
|
||||
[[gnu::unused]] void PrintCurrentState() {
|
||||
if (g_panic_count == 1) {
|
||||
g_panic_count++;
|
||||
/* Wait for it to be our turn to print. */
|
||||
WaitCoreTicket();
|
||||
|
||||
MESOSPHERE_RELEASE_LOG("Base Address: %p\n", _start);
|
||||
const s32 core_id = GetCurrentCoreId();
|
||||
MESOSPHERE_RELEASE_LOG("Core[%d] Current State:\n", core_id);
|
||||
|
||||
/* TODO: Dump register state. */
|
||||
|
||||
|
@ -51,11 +94,16 @@ namespace ams::kern {
|
|||
fp = stack_frame->fp;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
MESOSPHERE_RELEASE_LOG("\n");
|
||||
|
||||
/* Allow the next core to print. */
|
||||
ReleaseCoreTicket();
|
||||
}
|
||||
|
||||
NORETURN void StopSystem() {
|
||||
#ifdef MESOSPHERE_BUILD_FOR_DEBUGGING
|
||||
/* Print the current core. */
|
||||
PrintCurrentState();
|
||||
#endif
|
||||
|
||||
|
@ -66,16 +114,15 @@ namespace ams::kern {
|
|||
|
||||
NORETURN WEAK_SYMBOL void Panic(const char *file, int line, const char *format, ...) {
|
||||
#ifdef MESOSPHERE_BUILD_FOR_DEBUGGING
|
||||
if (g_panic_count == 0) {
|
||||
g_panic_count++;
|
||||
/* Wait for it to be our turn to print. */
|
||||
WaitCoreTicket();
|
||||
|
||||
::std::va_list vl;
|
||||
va_start(vl, format);
|
||||
MESOSPHERE_RELEASE_LOG("KernelPanic (Core %d): %s:%d\n", GetCurrentCoreId(), file, line);
|
||||
MESOSPHERE_RELEASE_LOG("Core[%d]: Kernel Panic at %s:%d\n", GetCurrentCoreId(), file, line);
|
||||
MESOSPHERE_RELEASE_VLOG(format, vl);
|
||||
MESOSPHERE_RELEASE_LOG("\n");
|
||||
va_end(vl);
|
||||
}
|
||||
#endif
|
||||
|
||||
StopSystem();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue