\r
#include <Guid/DebugImageInfoTable.h>\r
\r
-extern EFI_DEBUG_IMAGE_INFO_TABLE_HEADER *gDebugImageTableHeader;\r
-\r
-/**\r
- The constructor function caches EFI Debug table information for use in the exception handler.\r
-\r
-\r
- @param ImageHandle The firmware allocated handle for the EFI image.\r
- @param SystemTable A pointer to the EFI System Table.\r
-\r
- @retval EFI_SUCCESS The constructor always returns EFI_SUCCESS.\r
-\r
-**/\r
-EFI_STATUS\r
-EFIAPI\r
-DefaultExceptionHandlerConstructor (\r
- IN EFI_HANDLE ImageHandle,\r
- IN EFI_SYSTEM_TABLE *SystemTable\r
- )\r
-{\r
- EFI_STATUS Status;\r
-\r
- Status = EfiGetSystemConfigurationTable (&gEfiDebugImageInfoTableGuid, (VOID **)&gDebugImageTableHeader);\r
- if (EFI_ERROR (Status)) {\r
- gDebugImageTableHeader = NULL;\r
- }\r
- return Status;\r
-}\r
-\r
/**\r
Use the EFI Debug Image Table to lookup the FaultAddress and find which PE/COFF image\r
it came from. As long as the PE/COFF image contains a debug directory entry a\r
OUT UINTN *PeCoffSizeOfHeaders\r
)\r
{\r
- EFI_DEBUG_IMAGE_INFO *DebugTable;\r
- UINTN Entry;\r
- CHAR8 *Address;\r
+ EFI_STATUS Status;\r
+ EFI_DEBUG_IMAGE_INFO_TABLE_HEADER *DebugTableHeader;\r
+ EFI_DEBUG_IMAGE_INFO *DebugTable;\r
+ UINTN Entry;\r
+ CHAR8 *Address;\r
+\r
+ Status = EfiGetSystemConfigurationTable (&gEfiDebugImageInfoTableGuid, (VOID **)&DebugTableHeader);\r
+ if (EFI_ERROR (Status)) {\r
+ return NULL;\r
+ }\r
\r
- DebugTable = gDebugImageTableHeader->EfiDebugImageInfoTable;\r
+ DebugTable = DebugTableHeader->EfiDebugImageInfoTable;\r
if (DebugTable == NULL) {\r
return NULL;\r
}\r
\r
Address = (CHAR8 *)(UINTN)FaultAddress;\r
- for (Entry = 0; Entry < gDebugImageTableHeader->TableSize; Entry++, DebugTable++) {\r
+ for (Entry = 0; Entry < DebugTableHeader->TableSize; Entry++, DebugTable++) {\r
if (DebugTable->NormalImage != NULL) {\r
if ((DebugTable->NormalImage->ImageInfoType == EFI_DEBUG_IMAGE_INFO_TYPE_NORMAL) &&\r
(DebugTable->NormalImage->LoadedImageProtocolInstance != NULL)) {\r