MdeModulePkg/MdeModulePkg.dsc: add MM_STANDALONE FTW and variable modules

[mirror_edk2.git] / ArmPkg / Library / DebugAgentSymbolsBaseLib / AArch64 / DebugAgentException.S

diff --git a/ArmPkg/Library/DebugAgentSymbolsBaseLib/AArch64/DebugAgentException.S b/ArmPkg/Library/DebugAgentSymbolsBaseLib/AArch64/DebugAgentException.S
index 3fc090b2c3a63c6562658910906c7720c9f02150..f33a07a19badde501a1f750cae0e48d234d8e6e3 100644 (file)
--- a/ArmPkg/Library/DebugAgentSymbolsBaseLib/AArch64/DebugAgentException.S
+++ b/ArmPkg/Library/DebugAgentSymbolsBaseLib/AArch64/DebugAgentException.S
@@ -12,82 +12,85 @@
 #\r
 #------------------------------------------------------------------------------\r
 \r
-GCC_ASM_EXPORT(DebugAgentVectorTable)\r
+#include <Chipset/AArch64.h>\r
+\r
 GCC_ASM_IMPORT(DefaultExceptionHandler)\r
 \r
 .text\r
-.align 11\r
-ASM_PFX(DebugAgentVectorTable):\r
+VECTOR_BASE(DebugAgentVectorTable)\r
 \r
 //\r
 // Current EL with SP0 : 0x0 - 0x180\r
 //\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_CUR_SP0_SYNC)\r
 ASM_PFX(SynchronousExceptionSP0):\r
   b   ASM_PFX(SynchronousExceptionSP0)\r
 \r
-.align 7\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_CUR_SP0_IRQ)\r
 ASM_PFX(IrqSP0):\r
   b   ASM_PFX(IrqSP0)\r
 \r
-.align 7\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_CUR_SP0_FIQ)\r
 ASM_PFX(FiqSP0):\r
   b   ASM_PFX(FiqSP0)\r
 \r
-.align 7\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_CUR_SP0_SERR)\r
 ASM_PFX(SErrorSP0):\r
   b   ASM_PFX(SErrorSP0)\r
 \r
 //\r
 // Current EL with SPx: 0x200 - 0x380\r
 //\r
-.align 7\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_CUR_SPx_SYNC)\r
 ASM_PFX(SynchronousExceptionSPx):\r
   b   ASM_PFX(SynchronousExceptionSPx)\r
 \r
-.align 7\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_CUR_SPx_IRQ)\r
 ASM_PFX(IrqSPx):\r
   b   ASM_PFX(IrqSPx)\r
 \r
-.align 7\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_CUR_SPx_FIQ)\r
 ASM_PFX(FiqSPx):\r
   b   ASM_PFX(FiqSPx)\r
 \r
-.align 7\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_CUR_SPx_SERR)\r
 ASM_PFX(SErrorSPx):\r
   b   ASM_PFX(SErrorSPx)\r
 \r
 /* Lower EL using AArch64 : 0x400 - 0x580 */\r
-.align 7\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_LOW_A64_SYNC)\r
 ASM_PFX(SynchronousExceptionA64):\r
   b   ASM_PFX(SynchronousExceptionA64)\r
 \r
-.align 7\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_LOW_A64_IRQ)\r
 ASM_PFX(IrqA64):\r
   b   ASM_PFX(IrqA64)\r
 \r
-.align 7\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_LOW_A64_FIQ)\r
 ASM_PFX(FiqA64):\r
   b   ASM_PFX(FiqA64)\r
 \r
-.align 7\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_LOW_A64_SERR)\r
 ASM_PFX(SErrorA64):\r
   b   ASM_PFX(SErrorA64)\r
 \r
 //\r
-// Lower EL using AArch32 : 0x0 - 0x180\r
+// Lower EL using AArch32 : 0x600 - 0x780\r
 //\r
-.align 7\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_LOW_A32_SYNC)\r
 ASM_PFX(SynchronousExceptionA32):\r
   b   ASM_PFX(SynchronousExceptionA32)\r
 \r
-.align 7\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_LOW_A32_IRQ)\r
 ASM_PFX(IrqA32):\r
   b   ASM_PFX(IrqA32)\r
 \r
-.align 7\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_LOW_A32_FIQ)\r
 ASM_PFX(FiqA32):\r
   b   ASM_PFX(FiqA32)\r
 \r
-.align 7\r
+VECTOR_ENTRY(DebugAgentVectorTable, ARM_VECTOR_LOW_A32_SERR)\r
 ASM_PFX(SErrorA32):\r
   b   ASM_PFX(SErrorA32)\r
+\r
+VECTOR_END(DebugAgentVectorTable)\r