UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / ArmPkg / Library / CompilerIntrinsicsLib / Arm / switch32.S

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
index 5ecffa6fee0de12fb33a18a374db004aedd83e7b..fbf72dd5f10bb2554fc9fa640bc4795084d3d471 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
@@ -1,45 +1,23 @@
-#------------------------------------------------------------------------------ 
-#
-# Copyright (c) 2008-2009 Apple Inc. All rights reserved.
-#
-# All rights reserved. This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution.  The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
-#
-#------------------------------------------------------------------------------
-
-#/** @file
-#  Compiler intrinsic for ARM compiler
-#
-#  Copyright (c) 2008, Apple, Inc.
-#  All rights reserved. This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution.  The full text of the license may be found at
-#  http)://opensource.org/licenses/bsd-license.php
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.;
-#
-#**/
-#        
-
-.text
-.p2align 2
-
-.globl ASM_PFX(__switch32)
-
-
-ASM_PFX(__switch32):    
-    ldr     ip, [lr, #-1]
-    cmp     r0, ip
-    add     r0, lr, r0, lsl #2
-    ldrcc   r0, [r0, #3]
-    add     ip, lr, ip, lsl #2
-    ldrcs   r0, [ip, #3]
-    add     ip, lr, r0
-    bx      ip
-
+#/** @file\r
+#  Compiler intrinsic for ARM compiler\r
+#\r
+#  Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+#  SPDX-License-Identifier: BSD-2-Clause-Patent\r
+#\r
+#**/\r
+#\r
+\r
+#include <AsmMacroIoLib.h>\r
+\r
+.syntax unified\r
+\r
+ASM_FUNC(__switch32)\r
+    ldr     ip, [lr, #-1]\r
+    cmp     r0, ip\r
+    add     r0, lr, r0, lsl #2\r
+    ldrcc   r0, [r0, #3]\r
+    add     ip, lr, ip, lsl #2\r
+    ldrcs   r0, [ip, #3]\r
+    add     ip, lr, r0\r
+    bx      ip\r
+\r