ArmPkg: Tidy assembler code

[mirror_edk2.git] / ArmPkg / Library / ArmLib / Common / Arm / ArmLibSupport.S

diff --git a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
index 71aee430739e62615ceab805a9cf210a93b2c138..a3de902cc63b0e61ea4399ec72e751b9dd7daf1f 100644 (file)
--- a/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
+++ b/ArmPkg/Library/ArmLib/Common/Arm/ArmLibSupport.S
@@ -1,7 +1,7 @@
 #------------------------------------------------------------------------------ \r
 #\r
 # Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
-# Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
+# Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.\r
 #\r
 # This program and the accompanying materials\r
 # are licensed and made available under the terms and conditions of the BSD License\r
@@ -23,7 +23,7 @@
 \r
 .text\r
 .align 2\r
-GCC_ASM_EXPORT(Cp15IdCode)\r
+GCC_ASM_EXPORT(ArmReadMidr)\r
 GCC_ASM_EXPORT(Cp15CacheInfo)\r
 GCC_ASM_EXPORT(ArmGetInterruptState)\r
 GCC_ASM_EXPORT(ArmGetFiqState)\r
@@ -38,8 +38,6 @@ GCC_ASM_EXPORT(ArmWriteAuxCr)
 GCC_ASM_EXPORT(ArmReadAuxCr)\r
 GCC_ASM_EXPORT(ArmInvalidateTlb)\r
 GCC_ASM_EXPORT(ArmUpdateTranslationTableEntry)\r
-GCC_ASM_EXPORT(ArmReadNsacr)\r
-GCC_ASM_EXPORT(ArmWriteNsacr)\r
 GCC_ASM_EXPORT(ArmReadScr)\r
 GCC_ASM_EXPORT(ArmWriteScr)\r
 GCC_ASM_EXPORT(ArmReadMVBar)\r
@@ -52,7 +50,7 @@ GCC_ASM_EXPORT(ArmReadSctlr)
 \r
 #------------------------------------------------------------------------------\r
 \r
-ASM_PFX(Cp15IdCode):\r
+ASM_PFX(ArmReadMidr):\r
   mrc     p15,0,R0,c0,c0,0\r
   bx      LR\r
 \r
@@ -89,7 +87,7 @@ ASM_PFX(CPSRMaskInsert):    @ on entry, r0 is the mask and r1 is the field to in
   isb\r
   mov     sp, r3            @ restore stack pointer\r
   ldmfd   sp!, {r4-r12, lr} @ restore registers\r
-  bx      lr                @ return (hopefully thumb-safe!)             @ return (hopefully thumb-safe!)\r
+  bx      lr                @ return (hopefully thumb-safe!)\r
 \r
 ASM_PFX(CPSRRead):\r
   mrs     r0, cpsr\r
@@ -147,14 +145,6 @@ ASM_PFX(ArmInvalidateTlb):
   isb\r
   bx      lr\r
 \r
-ASM_PFX(ArmReadNsacr):\r
-  mrc     p15, 0, r0, c1, c1, 2\r
-  bx      lr\r
-\r
-ASM_PFX(ArmWriteNsacr):\r
-  mcr     p15, 0, r0, c1, c1, 2\r
-  bx      lr\r
-\r
 ASM_PFX(ArmReadScr):\r
   mrc     p15, 0, r0, c1, c1, 0\r
   bx      lr\r