Fix bug in UncachedMemoryAllocationLib, Assembler, make DefaultExceptionHandler lib...

[mirror_edk2.git] / ArmPkg / Drivers / CpuDxe / Exception.c

diff --git a/ArmPkg/Drivers/CpuDxe/Exception.c b/ArmPkg/Drivers/CpuDxe/Exception.c
index 8859ca8667477fac4f38ba0a9bdf5446fdc89b63..e313cf3fe97034e0c8d47f30f22586a4eecb4361 100644 (file)
--- a/ArmPkg/Drivers/CpuDxe/Exception.c
+++ b/ArmPkg/Drivers/CpuDxe/Exception.c
@@ -13,9 +13,7 @@
 **/\r
 \r
 #include "CpuDxe.h" \r
-#include <Library/CacheMaintenanceLib.h>\r
 \r
-extern BOOLEAN gExceptionContext;\r
 \r
 VOID\r
 ExceptionHandlersStart (\r
@@ -122,16 +120,7 @@ RegisterDebuggerInterruptHandler (
   return EFI_SUCCESS;\r
 }\r
 \r
-CHAR8 *gExceptionTypeString[] = {\r
-  "Reset",\r
-  "Undefined Instruction",\r
-  "SWI",\r
-  "Prefetch Abort",\r
-  "Data Abort",\r
-  "Undefined",\r
-  "IRQ",\r
-  "FIQ"\r
-};\r
+\r
 \r
 VOID\r
 EFIAPI\r
@@ -142,8 +131,7 @@ CommonCExceptionHandler (
 {\r
   BOOLEAN Dispatched = FALSE;\r
  \r
-  gExceptionContext = TRUE; \r
-  \r
+ \r
   if (ExceptionType <= MAX_ARM_EXCEPTION) {\r
     if (gDebuggerExceptionHandlers[ExceptionType]) {\r
       //\r
@@ -162,8 +150,6 @@ CommonCExceptionHandler (
     ASSERT (FALSE);\r
   }\r
 \r
-  gExceptionContext = FALSE; \r
-\r
   if (Dispatched) {\r
     //\r
     // We did work so this was an expected ExceptionType\r
@@ -178,12 +164,7 @@ CommonCExceptionHandler (
     return;\r
   }\r
 \r
-  //\r
-  // Code after here is the default exception handler...\r
-  //\r
-  DEBUG ((EFI_D_ERROR, "%a Exception from %08x\n", gExceptionTypeString[ExceptionType], SystemContext.SystemContextArm->PC));\r
-  ASSERT (FALSE);\r
-\r
+  DefaultExceptionHandler (ExceptionType, SystemContext);\r
 }\r
 \r
 \r