From cd82e330bbb1329b5ab8bd236e063af41cd4007a Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Mon, 9 May 2016 16:24:18 +0200 Subject: ArmPkg/DefaultExceptionHandlerLib: add stack dump to exception handling code This adds a partial stack dump (256 bytes at either side of the stack pointer) to the CPU state dumping routine that is invoked when taking an unexpected exception. Since dereferencing the stack pointer may itself fault, ensure that we don't enter the dumping routine recursively. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Acked-by: Leif Lindholm --- .../AArch64/DefaultExceptionHandler.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'ArmPkg/Library/DefaultExceptionHandlerLib') diff --git a/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c b/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c index df30c4f..ca2c48c 100644 --- a/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c +++ b/ArmPkg/Library/DefaultExceptionHandlerLib/AArch64/DefaultExceptionHandler.c @@ -34,6 +34,8 @@ STATIC CHAR8 *gExceptionTypeString[] = { "SError" }; +STATIC BOOLEAN mRecursiveException; + CHAR8 * GetImageName ( IN UINTN FaultAddress, @@ -134,6 +136,14 @@ DefaultExceptionHandler ( { CHAR8 Buffer[100]; UINTN CharCount; + INT32 Offset; + + if (mRecursiveException) { + CharCount = AsciiSPrint (Buffer, sizeof (Buffer),"\nRecursive exception occurred while dumping the CPU state\n"); + SerialPortWrite ((UINT8 *) Buffer, CharCount); + CpuDeadLoop (); + } + mRecursiveException = TRUE; CharCount = AsciiSPrint (Buffer,sizeof (Buffer),"\n\n%a Exception at 0x%016lx\n", gExceptionTypeString[ExceptionType], SystemContext.SystemContextAArch64->ELR); SerialPortWrite ((UINT8 *) Buffer, CharCount); @@ -183,5 +193,16 @@ DefaultExceptionHandler ( DescribeExceptionSyndrome (SystemContext.SystemContextAArch64->ESR); ASSERT (FALSE): + DEBUG ((EFI_D_ERROR, "\nStack dump:\n")); + for (Offset = -256; Offset < 256; Offset += 32) { + DEBUG ((EFI_D_ERROR, "%c %013lx: %016lx %016lx %016lx %016lx\n", + Offset == 0 ? '>' : ' ', + SystemContext.SystemContextAArch64->SP + Offset, + *(UINT64 *)(SystemContext.SystemContextAArch64->SP + Offset), + *(UINT64 *)(SystemContext.SystemContextAArch64->SP + Offset + 8), + *(UINT64 *)(SystemContext.SystemContextAArch64->SP + Offset + 16), + *(UINT64 *)(SystemContext.SystemContextAArch64->SP + Offset + 24))); + } + CpuDeadLoop (); } -- cgit v1.1