X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=ArmPkg%2FDrivers%2FCpuDxe%2FException.c;h=e313cf3fe97034e0c8d47f30f22586a4eecb4361;hp=d46971b33cc6e05636c0c4c938096818081ef3bd;hb=6f72e28d04348ad4539679949609675b114896e1;hpb=3b66da94989fc44890483b67b7d13c031c2f9fdc

diff --git a/ArmPkg/Drivers/CpuDxe/Exception.c b/ArmPkg/Drivers/CpuDxe/Exception.c
index d46971b33c..e313cf3fe9 100644
--- a/ArmPkg/Drivers/CpuDxe/Exception.c
+++ b/ArmPkg/Drivers/CpuDxe/Exception.c
@@ -14,7 +14,6 @@
 
 #include "CpuDxe.h" 
 
-EFI_DEBUG_IMAGE_INFO_TABLE_HEADER *gDebugImageTableHeader = NULL;
 
 VOID
 ExceptionHandlersStart (
@@ -123,125 +122,6 @@ RegisterDebuggerInterruptHandler (
 
 
 
-
-CHAR8 *
-GetImageName (
-  IN  UINT32  FaultAddress,
-  OUT UINT32  *ImageBase,
-  OUT UINT32  *PeCoffSizeOfHeaders
-  )
-{
-  EFI_DEBUG_IMAGE_INFO  *DebugTable;
-  UINTN                 Entry;
-  CHAR8                 *Address;
-
-  
-  DebugTable = gDebugImageTableHeader->EfiDebugImageInfoTable;
-  if (DebugTable == NULL) {
-    return NULL;
-  }
-
-  Address = (CHAR8 *)(UINTN)FaultAddress;
-  for (Entry = 0; Entry < gDebugImageTableHeader->TableSize; Entry++, DebugTable++) {
-    if (DebugTable->NormalImage != NULL) {
-      if ((DebugTable->NormalImage->ImageInfoType == EFI_DEBUG_IMAGE_INFO_TYPE_NORMAL) && 
-          (DebugTable->NormalImage->LoadedImageProtocolInstance != NULL)) {
-        if ((Address >= (CHAR8 *)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase) &&
-            (Address <= ((CHAR8 *)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase + DebugTable->NormalImage->LoadedImageProtocolInstance->ImageSize))) {
-          *ImageBase = (UINT32)DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase;
-          *PeCoffSizeOfHeaders = PeCoffGetSizeOfHeaders ((VOID *)(UINTN)*ImageBase);
-          return PeCoffLoaderGetPdbPointer (DebugTable->NormalImage->LoadedImageProtocolInstance->ImageBase);
-        }           
-      }
-    }  
-  }
-
-  return NULL;
-}
-
-typedef struct {
-  UINT32  Bit;
-  CHAR8   Char;
-} CPSR_CHAR;
-
-
-VOID
-CpsrString (
-  IN  UINT32  Cpsr,
-  OUT CHAR8   *ReturnStr
-  )
-{
-  UINTN Index;
-  CHAR8 *Str = ReturnStr;
-  CHAR8 *ModeStr;
-  CPSR_CHAR CpsrChar[] = {
-    { 31, 'n' },
-    { 30, 'z' },
-    { 29, 'c' },
-    { 28, 'v' },
-
-    { 9,  'e' },
-    { 8,  'a' },
-    { 7,  'i' },
-    { 6,  'f' },
-    { 5,  't' },
-    { 0,  '?' }
-  };
-  
-  for (Index = 0; CpsrChar[Index].Bit != 0; Index++, Str++) {
-    *Str = CpsrChar[Index].Char;
-    if ((Cpsr & (1 << CpsrChar[Index].Bit)) != 0) {
-      // Concert to upper case if bit is set
-      *Str &= ~0x20;
-    }
-  }
-  
-  *Str++ = '_';
-  *Str = '\0';
-  
-  switch (Cpsr & 0x1f) {
-  case 0x17:
-    ModeStr = "abt";
-    break;
-  case 0x011:
-    ModeStr = "fiq";
-    break;
-  case 0x12:
-    ModeStr = "irq";
-    break;
-  case 0x13:
-    ModeStr = "svc";
-    break;
-  case 0x1f:
-    ModeStr = "sys";
-    break;
-  case 0x1b:
-    ModeStr = "und";
-    break;
-  case 0x10:
-    ModeStr = "usr";
-    break;
-  
-  default:
-    ModeStr = "???";
-    break;
-  }
-  
-  AsciiStrCat (Str, ModeStr);
-  return;
-}  
-  
-CHAR8 *gExceptionTypeString[] = {
-  "Reset",
-  "Undefined Instruction",
-  "SWI",
-  "Prefetch Abort",
-  "Data Abort",
-  "Undefined",
-  "IRQ",
-  "FIQ"
-};
-
 VOID
 EFIAPI
 CommonCExceptionHandler (
@@ -284,52 +164,7 @@ CommonCExceptionHandler (
     return;
   }
 
-  //
-  // Code after here is the default exception handler... Dump the context
-  //
-  DEBUG ((EFI_D_ERROR, "\n%a Exception PC at 0x%08x  CPSR 0x%08x ", gExceptionTypeString[ExceptionType], SystemContext.SystemContextArm->PC, SystemContext.SystemContextArm->CPSR));
-  DEBUG_CODE_BEGIN ();
-    CHAR8   *Pdb;
-    UINT32  ImageBase;
-    UINT32  PeCoffSizeOfHeader;
-    UINT32  Offset;
-    CHAR8   CpsrStr[32];  // char per bit. Lower 5-bits are mode that is a 3 char string
-    
-    CpsrString (SystemContext.SystemContextArm->CPSR, CpsrStr);
-    DEBUG ((EFI_D_ERROR, "%a\n", CpsrStr));
-  
-    Pdb = GetImageName (SystemContext.SystemContextArm->PC, &ImageBase, &PeCoffSizeOfHeader);
-    Offset = SystemContext.SystemContextArm->PC - ImageBase;
-    if (Pdb != NULL) {
-      DEBUG ((EFI_D_ERROR, "%a\n", Pdb));
-
-      //
-      // A PE/COFF image loads its headers into memory so the headers are 
-      // included in the linked addressess. ELF and Mach-O images do not
-      // include the headers so the first byte of the image is usually
-      // text (code). If you look at link maps from ELF or Mach-O images
-      // you need to subtact out the size of the PE/COFF header to get
-      // get the offset that matches the link map. 
-      //
-      DEBUG ((EFI_D_ERROR, "loaded at 0x%08x (PE/COFF offset) 0x%x (ELF or Mach-O offset) 0x%x", ImageBase, Offset, Offset - PeCoffSizeOfHeader));
-      
-      // If we come from an image it is safe to show the instruction. We know it should not fault
-      if ((SystemContext.SystemContextArm->CPSR & 0x20) == 0) {
-        // ARM
-        DEBUG ((EFI_D_ERROR, "\nFaulting Instruction 0x%08x", *(UINT32 *)(UINTN)SystemContext.SystemContextArm->PC));
-      } else {
-        // Thumb
-        DEBUG ((EFI_D_ERROR, "\nFaulting Instruction 0x%04x", *(UINT16 *)(UINTN)SystemContext.SystemContextArm->PC));
-      }
-    }
-  DEBUG_CODE_END ();
-  DEBUG ((EFI_D_ERROR, "\n  R0 0x%08x   R1 0x%08x   R2 0x%08x   R3 0x%08x\n", SystemContext.SystemContextArm->R0, SystemContext.SystemContextArm->R1, SystemContext.SystemContextArm->R2, SystemContext.SystemContextArm->R3));
-  DEBUG ((EFI_D_ERROR, "  R4 0x%08x   R5 0x%08x   R6 0x%08x   R7 0x%08x\n", SystemContext.SystemContextArm->R4, SystemContext.SystemContextArm->R5, SystemContext.SystemContextArm->R6, SystemContext.SystemContextArm->R7));
-  DEBUG ((EFI_D_ERROR, "  R8 0x%08x   R9 0x%08x  R10 0x%08x  R11 0x%08x\n", SystemContext.SystemContextArm->R8, SystemContext.SystemContextArm->R9, SystemContext.SystemContextArm->R10, SystemContext.SystemContextArm->R11));
-  DEBUG ((EFI_D_ERROR, " R12 0x%08x   SP 0x%08x   LR 0x%08x   PC 0x%08x\n", SystemContext.SystemContextArm->R12, SystemContext.SystemContextArm->SP, SystemContext.SystemContextArm->LR, SystemContext.SystemContextArm->PC));
-  DEBUG ((EFI_D_ERROR, "DFSR 0x%08x DFAR 0x%08x IFSR 0x%08x IFAR 0x%08x\n\n", SystemContext.SystemContextArm->DFSR, SystemContext.SystemContextArm->DFAR, SystemContext.SystemContextArm->IFSR, SystemContext.SystemContextArm->IFAR));
-
-  ASSERT (FALSE);
+  DefaultExceptionHandler (ExceptionType, SystemContext);
 }
 
 
@@ -346,11 +181,6 @@ InitializeExceptions (
   BOOLEAN              Enabled;
   EFI_PHYSICAL_ADDRESS Base;
 
-  Status = EfiGetSystemConfigurationTable (&gEfiDebugImageInfoTableGuid, (VOID **)&gDebugImageTableHeader);
-  if (EFI_ERROR (Status)) {
-    gDebugImageTableHeader = NULL;
-  }
-
   //
   // Disable interrupts
   //