ArmPlatformPkg: Minor code changes (comments, misspellings, coding stylei, line endings)

[mirror_edk2.git] / ArmPlatformPkg / Sec / Exception.S

diff --git a/ArmPlatformPkg/Sec/Exception.S b/ArmPlatformPkg/Sec/Exception.S
index 81e2659c1b645917b29e53378a2871c05bd24455..14e1fa8c1d752a813432be186f15e76e90d0ed6f 100644 (file)
--- a/ArmPlatformPkg/Sec/Exception.S
+++ b/ArmPlatformPkg/Sec/Exception.S
@@ -12,26 +12,19 @@
 #
 
 #include <AsmMacroIoLib.h>
-#include <Base.h>
 #include <AutoGen.h>
+#include "SecInternal.h"
 
-#start of the code section
 .text
-.align 5\r
-\r
-# IMPORT
-GCC_ASM_IMPORT(SecCommonExceptionEntry)
+.align 5
 
-# EXPORT
+GCC_ASM_IMPORT(SecCommonExceptionEntry)
 GCC_ASM_EXPORT(SecVectorTable)
-\r
+
 //============================================================
-//Default Exception Handlers
+// Default Exception Handlers
 //============================================================
   
-//FIXME: One of the EDK2 tool is broken. It does not look to respect the alignment. Even, if we specify 32-byte alignment for this file.
-Dummy1: .word      0\r
-Dummy2: .word      0\r
   
 ASM_PFX(SecVectorTable):
   b _DefaultResetHandler
@@ -87,20 +80,19 @@ _DefaultReserved:
   # Switch to SVC for common stack
   cps  #0x13
   mov  r0, #5
-  blx  SecCommonExceptionEntry
+  blx  ASM_PFX(SecCommonExceptionEntry)
 
 _DefaultIrq:
   sub  r1, LR, #4
   # Switch to SVC for common stack
   cps  #0x13
   mov  r0, #6
-  blx  SecCommonExceptionEntry
+  blx  ASM_PFX(SecCommonExceptionEntry)
 
 _DefaultFiq:
   sub  r1, LR, #4
   # Switch to SVC for common stack
   cps  #0x13
   mov  r0, #7
-  blx  SecCommonExceptionEntry
-\r
-.end\r
+  blx  ASM_PFX(SecCommonExceptionEntry)
+