From 96ef5a8e30a8da33eaab09f13cc8d752342717a5 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 13 May 2019 09:54:16 +0100 Subject: [PATCH] ArmPkg/CompilerIntrinsicsLib: Add uread, uwrite GCC assembly sources The new sources are a copy of the RVCT version. Cc: Ard Biesheuvel Cc: Leif Lindholm Signed-off-by: Pete Batard Reviewed-by: Leif Lindholm --- .../Library/CompilerIntrinsicsLib/Arm/uread.S | 54 +++++++++++++++++++ .../CompilerIntrinsicsLib/Arm/uwrite.S | 53 ++++++++++++++++++ .../CompilerIntrinsicsLib.inf | 2 + 3 files changed, 109 insertions(+) create mode 100644 ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S create mode 100644 ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S new file mode 100644 index 0000000000..e8a1dbad86 --- /dev/null +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uread.S @@ -0,0 +1,54 @@ +#------------------------------------------------------------------------------ +# +# Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +#------------------------------------------------------------------------------ + +#include + +# +#UINT32 +#EFIAPI +#__aeabi_uread4 ( +# IN VOID *Pointer +# ); +# +ASM_FUNC(__aeabi_uread4) + ldrb r1, [r0] + ldrb r2, [r0, #1] + ldrb r3, [r0, #2] + ldrb r0, [r0, #3] + orr r1, r1, r2, lsl #8 + orr r1, r1, r3, lsl #16 + orr r0, r1, r0, lsl #24 + bx lr + +# +#UINT64 +#EFIAPI +#__aeabi_uread8 ( +# IN VOID *Pointer +# ); +# +ASM_FUNC(__aeabi_uread8) + mov r3, r0 + + ldrb r1, [r3] + ldrb r2, [r3, #1] + orr r1, r1, r2, lsl #8 + ldrb r2, [r3, #2] + orr r1, r1, r2, lsl #16 + ldrb r0, [r3, #3] + orr r0, r1, r0, lsl #24 + + ldrb r1, [r3, #4] + ldrb r2, [r3, #5] + orr r1, r1, r2, lsl #8 + ldrb r2, [r3, #6] + orr r1, r1, r2, lsl #16 + ldrb r2, [r3, #7] + orr r1, r1, r2, lsl #24 + + bx lr diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S new file mode 100644 index 0000000000..9432ac4317 --- /dev/null +++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uwrite.S @@ -0,0 +1,53 @@ +#------------------------------------------------------------------------------ +# +# Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +#------------------------------------------------------------------------------ + +#include + +# +#UINT32 +#EFIAPI +#__aeabi_uwrite4 ( +# IN UINT32 Data, +# IN VOID *Pointer +# ); +# +ASM_FUNC(__aeabi_uwrite4) + mov r2, r0, lsr #8 + strb r0, [r1] + strb r2, [r1, #1] + mov r2, r0, lsr #16 + strb r2, [r1, #2] + mov r2, r0, lsr #24 + strb r2, [r1, #3] + bx lr + +# +#UINT64 +#EFIAPI +#__aeabi_uwrite8 ( +# IN UINT64 Data, +# IN VOID *Pointer +# ); +# +ASM_FUNC(__aeabi_uwrite8) + mov r3, r0, lsr #8 + strb r0, [r2] + strb r3, [r2, #1] + mov r3, r0, lsr #16 + strb r3, [r2, #2] + mov r3, r0, lsr #24 + strb r3, [r2, #3] + + mov r3, r1, lsr #8 + strb r1, [r2, #4] + strb r3, [r2, #5] + mov r3, r1, lsr #16 + strb r3, [r2, #6] + mov r3, r1, lsr #24 + strb r3, [r2, #7] + bx lr diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf index aaf3de02a9..d5bad94677 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf +++ b/ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf @@ -71,6 +71,8 @@ Arm/lasr.S | GCC Arm/llsr.S | GCC Arm/llsl.S | GCC + Arm/uread.S | GCC + Arm/uwrite.S | GCC Arm/div.asm | MSFT Arm/uldiv.asm | MSFT