From 8a4663c131e113ac85337a55ba72ce9e1688ec49 Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Mon, 17 Sep 2018 17:23:04 +0930 Subject: assert: Include file name in assert output Printing the line number without an associated file is almost meaningless; add the file name to improve debug ergonomics. Change-Id: I454876ccc567cb58066362caced7efbaf92cfe62 Signed-off-by: Andrew Jeffery Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/66117 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Corey V. Swenson Reviewed-by: Daniel M. Crowell --- src/lib/assert.C | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/lib') diff --git a/src/lib/assert.C b/src/lib/assert.C index 953393c31..bd55ae546 100644 --- a/src/lib/assert.C +++ b/src/lib/assert.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2017 */ +/* Contributors Listed Below - COPYRIGHT 2011,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -41,7 +41,8 @@ /** Hook location for trace module to set up when loaded. */ namespace TRACE { void (*traceCallback)(void*, size_t) = NULL; }; -extern "C" void __assert(AssertBehavior i_assertb, int i_line) +extern "C" void __assert(AssertBehavior i_assertb, const char* i_file, + int i_line) { if ((i_assertb == ASSERT_CRITICAL) && (KernelMisc::in_kernel_mode())) { @@ -61,23 +62,23 @@ extern "C" void __assert(AssertBehavior i_assertb, int i_line) } else { - printk("Assertion failed @%p on line %d.\n", - linkRegister(), i_line); + printk("Assertion failed @%p at %s:%d.\n", + linkRegister(), i_file, i_line); } task_crash(); break; case ASSERT_CRITICAL: // Critical task, trace not available. - printk("Assertion failed @%p on line %d.(Crit_Assert)\n", - linkRegister(), i_line); + printk("Assertion failed @%p on line %s:%d. (Crit_Assert)\n", + linkRegister(), i_file, i_line); // Need to call the external CritAssert system call cpu_crit_assert(reinterpret_cast(linkRegister())); break; case ASSERT_KERNEL: // Kernel assert called. - printk("Assertion failed @%p on line %d. (kassert)\n", - linkRegister(), i_line); + printk("Assertion failed @%p on line %s:%d. (kassert)\n", + linkRegister(), i_file, i_line); /*@ * @errortype -- cgit v1.2.1