CHAR8 Char;\r
} CPSR_CHAR;\r
\r
-\r
-\r
\r
/**\r
Use the EFI Debug Image Table to lookup the FaultAddress and find which PE/COFF image \r
UINTN Entry;\r
CHAR8 *Address;\r
\r
- \r
DebugTable = gDebugImageTableHeader->EfiDebugImageInfoTable;\r
if (DebugTable == NULL) {\r
return NULL;\r
OUT CHAR8 *ReturnStr\r
)\r
{\r
- UINTN Index;\r
- CHAR8 *Str = ReturnStr;\r
- CHAR8 *ModeStr;\r
+ UINTN Index;\r
+ CHAR8* Str;\r
+ CHAR8* ModeStr;\r
CPSR_CHAR CpsrChar[] = {\r
{ 31, 'n' },\r
{ 30, 'z' },\r
{ 0, '?' }\r
};\r
\r
+ Str = ReturnStr;\r
+\r
for (Index = 0; CpsrChar[Index].BIT != 0; Index++, Str++) {\r
*Str = CpsrChar[Index].Char;\r
if ((Cpsr & (1 << CpsrChar[Index].BIT)) != 0) {\r
return FaultSource;\r
}\r
\r
-\r
-CHAR8 *gExceptionTypeString[] = {\r
+STATIC CHAR8 *gExceptionTypeString[] = {\r
"Reset",\r
"Undefined OpCode",\r
"SWI",\r
"FIQ"\r
};\r
\r
-\r
/**\r
This is the default action to take on an unexpected exception\r
\r
BOOLEAN DfsrWrite;\r
UINT32 PcAdjust = 0;\r
\r
- DEBUG ((EFI_D_ERROR, "\n%a Exception PC at 0x%08x CPSR 0x%08x ", gExceptionTypeString[ExceptionType], SystemContext.SystemContextArm->PC, SystemContext.SystemContextArm->CPSR));\r
+ Print(L"\n%a Exception PC at 0x%08x CPSR 0x%08x ", gExceptionTypeString[ExceptionType], SystemContext.SystemContextArm->PC, SystemContext.SystemContextArm->CPSR);\r
DEBUG_CODE_BEGIN ();\r
CHAR8 *Pdb;\r
UINT32 ImageBase;\r
\r
//\r
// A PE/COFF image loads its headers into memory so the headers are \r
- // included in the linked addressess. ELF and Mach-O images do not\r
+ // included in the linked addresses. ELF and Mach-O images do not\r
// include the headers so the first byte of the image is usually\r
// text (code). If you look at link maps from ELF or Mach-O images\r
- // you need to subtact out the size of the PE/COFF header to get\r
+ // you need to subtract out the size of the PE/COFF header to get\r
// get the offset that matches the link map. \r
//\r
DEBUG ((EFI_D_ERROR, "loaded at 0x%08x (PE/COFF offset) 0x%x (ELF or Mach-O offset) 0x%x", ImageBase, Offset, Offset - PeCoffSizeOfHeader));\r