From 27995cd5d6ea40639d6034b8b7cbb84f625f1a4a Mon Sep 17 00:00:00 2001
From: Olivier Martin <olivier.martin@arm.com>
Date: Sat, 1 Mar 2014 11:01:00 +0000
Subject: ArmPkg: Tidy assembler code

- Fixed typo
- Removed unreachable 'dead' loop

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15277 6f19259b-4bc3-4df7-8a09-765794883524
---
 ArmPlatformPkg/PrePeiCore/AArch64/Helper.S | 3 ---
 ArmPlatformPkg/Sec/AArch64/Helper.S        | 3 ---
 ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S | 5 +----
 ArmPlatformPkg/Sec/Arm/Helper.S            | 5 +----
 4 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'ArmPlatformPkg')

diff --git a/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S b/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S
index 14e9cb8d8b..a11cda06d1 100644
--- a/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S
+++ b/ArmPlatformPkg/PrePeiCore/AArch64/Helper.S
@@ -45,7 +45,4 @@ ASM_PFX(SetupExceptionLevel2):
 
    ret
 
-dead:
-   b       dead
-
 ASM_FUNCTION_REMOVE_IF_UNREFERENCED
diff --git a/ArmPlatformPkg/Sec/AArch64/Helper.S b/ArmPlatformPkg/Sec/AArch64/Helper.S
index 4501be54a0..490d3df12d 100644
--- a/ArmPlatformPkg/Sec/AArch64/Helper.S
+++ b/ArmPlatformPkg/Sec/AArch64/Helper.S
@@ -92,7 +92,4 @@ ASM_PFX(set_non_secure_mode):
    msr     spsr_el3, x0
    ret
 
-dead:
-   b       dead
-
 ASM_FUNCTION_REMOVE_IF_UNREFERENCED
diff --git a/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S b/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S
index e678f4c18c..c16ede0831 100644
--- a/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S
+++ b/ArmPlatformPkg/Sec/AArch64/SecEntryPoint.S
@@ -1,5 +1,5 @@
 //
-//  Copyright (c) 2011-2013, ARM Limited. All rights reserved.
+//  Copyright (c) 2011-2014, ARM Limited. All rights reserved.
 //
 //  This program and the accompanying materials
 //  are licensed and made available under the terms and conditions of the BSD License
@@ -141,6 +141,3 @@ _PrepareArguments:
 ASM_PFX(JumpToPEI):
   LoadConstantToReg (FixedPcdGet32(PcdFvBaseAddress), x0)
   blr   x0
-
-dead:
-  b     dead
diff --git a/ArmPlatformPkg/Sec/Arm/Helper.S b/ArmPlatformPkg/Sec/Arm/Helper.S
index c99987d3a1..ae4bc44540 100644
--- a/ArmPlatformPkg/Sec/Arm/Helper.S
+++ b/ArmPlatformPkg/Sec/Arm/Helper.S
@@ -1,5 +1,5 @@
 #========================================================================================
-#  Copyright (c) 2011-2013, ARM Limited. All rights reserved.
+#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.
 #  
 #  This program and the accompanying materials                          
 #  are licensed and made available under the terms and conditions of the BSD License         
@@ -80,8 +80,5 @@ ASM_PFX(set_non_secure_mode):
     isb
     pop     { r1 }
     bx      lr                @ return (hopefully thumb-safe!)
-
-dead:
-    b       dead
     
 ASM_FUNCTION_REMOVE_IF_UNREFERENCED
-- 
cgit v1.2.3