ArmPkg/Library/CompilerIntrinsicsLib: Enable VS2017/ARM builds

[mirror_edk2.git] / ArmPkg / Library / CompilerIntrinsicsLib / Arm / llsr.asm

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm
index 881db106d9d7e62185a667e3e992019ff1f4e88b..abfd7ab64a7951d5dbdc759b8615ceeeee2b53c7 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/llsr.asm
@@ -1,6 +1,7 @@
 //------------------------------------------------------------------------------\r
 //\r
 // Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+// Copyright (c) 2018, Pete Batard. All rights reserved.<BR>\r
 //\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
@@ -12,32 +13,33 @@
 //\r
 //------------------------------------------------------------------------------\r
 \r
+  EXPORT  __aeabi_llsr\r
+  EXPORT  __rt_srsh\r
 \r
+  AREA  s___aeabi_llsr, CODE, READONLY, ARM\r
 \r
-    INCLUDE AsmMacroExport.inc\r
+  ARM\r
 \r
 ;\r
 ;VOID\r
 ;EFIAPI\r
 ;__aeabi_llsr (\r
-; IN  VOID    *Destination,\r
-; IN  VOID    *Source,\r
-; IN  UINT32  Size\r
-; );\r
+;  IN  UINT64  Value,\r
+;  IN  UINT32  Shift\r
+;)\r
 ;\r
- RVCT_ASM_EXPORT __aeabi_llsr\r
+__aeabi_llsr\r
+__rt_srsh\r
     SUBS     r3,r2,#0x20\r
-    BPL      {pc} + 0x18  ; 0x1c\r
+    BPL      __aeabi_llsr_label1\r
     RSB      r3,r2,#0x20\r
     LSR      r0,r0,r2\r
     ORR      r0,r0,r1,LSL r3\r
     LSR      r1,r1,r2\r
     BX       lr\r
+__aeabi_llsr_label1\r
     LSR      r0,r1,r3\r
     MOV      r1,#0\r
     BX       lr\r
 \r
     END\r
-\r
-\r
-\r