From 50c65ea7e137a31321b772e1c4c6cc659a8f7125 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Tue, 13 Nov 2018 19:33:21 -0800 Subject: [PATCH] fatal: monospace start address --- .../fatal/source/fatal_task_screen.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/stratosphere/fatal/source/fatal_task_screen.cpp b/stratosphere/fatal/source/fatal_task_screen.cpp index e4b25d1ba..c20b14d7a 100644 --- a/stratosphere/fatal/source/fatal_task_screen.cpp +++ b/stratosphere/fatal/source/fatal_task_screen.cpp @@ -283,13 +283,19 @@ Result ShowFatalTask::ShowFatal() { FontManager::SetPosition(backtrace_x, backtrace_y); if (bt_size == 0) { if (this->ctx->cpu_ctx.is_aarch32) { - FontManager::PrintFormatLine("Start Address: 0x%08X", this->ctx->cpu_ctx.aarch32_ctx.start_address); + FontManager::Print("Start Address: "); + FontManager::PrintMonospaceU32(this->ctx->cpu_ctx.aarch32_ctx.start_address); + FontManager::PrintLine(""); } else { - FontManager::PrintFormatLine("Start Address: 0x%016lX", this->ctx->cpu_ctx.aarch64_ctx.start_address); + FontManager::Print("Start Address: "); + FontManager::PrintMonospaceU64(this->ctx->cpu_ctx.aarch64_ctx.start_address); + FontManager::PrintLine(""); } } else { if (this->ctx->cpu_ctx.is_aarch32) { - FontManager::PrintFormatLine("Backtrace - Start Address: 0x%08X", this->ctx->cpu_ctx.aarch32_ctx.start_address); + FontManager::PrintFormatLine("Backtrace - Start Address: "); + FontManager::PrintMonospaceU32(this->ctx->cpu_ctx.aarch32_ctx.start_address); + FontManager::PrintLine(""); FontManager::AddSpacingLines(0.5f); for (u32 i = 0; i < Aarch32CpuContext::MaxStackTraceDepth / 2; i++) { u32 bt_cur = 0, bt_next = 0; @@ -319,9 +325,9 @@ Result ShowFatalTask::ShowFatal() { FontManager::SetPosition(backtrace_x, FontManager::GetY()); } } else { - - FontManager::PrintFormatLine("Backtrace - Start Address: 0x%016lX", this->ctx->cpu_ctx.aarch64_ctx.start_address); - FontManager::AddSpacingLines(0.5f); + FontManager::PrintFormatLine("Backtrace - Start Address: "); + FontManager::PrintMonospaceU64(this->ctx->cpu_ctx.aarch64_ctx.start_address); + FontManager::PrintLine(""); for (u32 i = 0; i < Aarch64CpuContext::MaxStackTraceDepth / 2; i++) { u64 bt_cur = 0, bt_next = 0; if (i < this->ctx->cpu_ctx.aarch64_ctx.stack_trace_size) {