diff options
| -rw-r--r-- | src/arch/arm64/Makefile.inc | 18 | ||||
| -rw-r--r-- | src/arch/arm64/memcpy.S | 52 | ||||
| -rw-r--r-- | src/arch/arm64/memmove.S | 55 | ||||
| -rw-r--r-- | src/arch/arm64/memset.S | 52 |
4 files changed, 9 insertions, 168 deletions
diff --git a/src/arch/arm64/Makefile.inc b/src/arch/arm64/Makefile.inc index 5f778b2b23..6af675b2fc 100644 --- a/src/arch/arm64/Makefile.inc +++ b/src/arch/arm64/Makefile.inc @@ -59,9 +59,9 @@ $(obj)/arch/arm64/id.bootblock.o: $(obj)/build.h bootblock-y += stages.c bootblock-y += eabi_compat.c -bootblock-y += memset.S -bootblock-y += memcpy.S -bootblock-y += memmove.S +bootblock-y += ../../lib/memset.c +bootblock-y += ../../lib/memcpy.c +bootblock-y += ../../lib/memmove.c # Build the bootblock @@ -80,9 +80,9 @@ ifeq ($(CONFIG_ARCH_ROMSTAGE_ARM64),y) romstage-y += stages.c romstage-y += div0.c romstage-y += eabi_compat.c -romstage-y += memset.S -romstage-y += memcpy.S -romstage-y += memmove.S +romstage-y += ../../lib/memset.c +romstage-y += ../../lib/memcpy.c +romstage-y += ../../lib/memmove.c romstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c # Build the romstage @@ -106,9 +106,9 @@ ramstage-y += cpu.c ramstage-y += eabi_compat.c ramstage-y += boot.c ramstage-y += tables.c -ramstage-y += memset.S -ramstage-y += memcpy.S -ramstage-y += memmove.S +ramstage-y += ../../lib/memset.c +ramstage-y += ../../lib/memcpy.c +ramstage-y += ../../lib/memmove.c ramstage-y += stage_entry.S ramstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c diff --git a/src/arch/arm64/memcpy.S b/src/arch/arm64/memcpy.S deleted file mode 100644 index ccad4cf8cc..0000000000 --- a/src/arch/arm64/memcpy.S +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2013 ARM Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include <arch/asm.h> - -/* - * Copy a buffer from src to dest (alignment handled by the hardware) - * - * Parameters: - * x0 - dest - * x1 - src - * x2 - n - * Returns: - * x0 - dest - */ -ENTRY(memcpy) - mov x4, x0 - subs x2, x2, #8 - b.mi 2f -1: ldr x3, [x1], #8 - subs x2, x2, #8 - str x3, [x4], #8 - b.pl 1b -2: adds x2, x2, #4 - b.mi 3f - ldr w3, [x1], #4 - sub x2, x2, #4 - str w3, [x4], #4 -3: adds x2, x2, #2 - b.mi 4f - ldrh w3, [x1], #2 - sub x2, x2, #2 - strh w3, [x4], #2 -4: adds x2, x2, #1 - b.mi 5f - ldrb w3, [x1] - strb w3, [x4] -5: ret -ENDPROC(memcpy) diff --git a/src/arch/arm64/memmove.S b/src/arch/arm64/memmove.S deleted file mode 100644 index 1f9e2638ab..0000000000 --- a/src/arch/arm64/memmove.S +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (C) 2013 ARM Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include <arch/asm.h> -/* - * Move a buffer from src to test (alignment handled by the hardware). - * If dest <= src, call memcpy, otherwise copy in reverse order. - * - * Parameters: - * x0 - dest - * x1 - src - * x2 - n - * Returns: - * x0 - dest - */ -ENTRY(memmove) - cmp x0, x1 - b.ls memcpy - add x4, x0, x2 - add x1, x1, x2 - subs x2, x2, #8 - b.mi 2f -1: ldr x3, [x1, #-8]! - subs x2, x2, #8 - str x3, [x4, #-8]! - b.pl 1b -2: adds x2, x2, #4 - b.mi 3f - ldr w3, [x1, #-4]! - sub x2, x2, #4 - str w3, [x4, #-4]! -3: adds x2, x2, #2 - b.mi 4f - ldrh w3, [x1, #-2]! - sub x2, x2, #2 - strh w3, [x4, #-2]! -4: adds x2, x2, #1 - b.mi 5f - ldrb w3, [x1, #-1] - strb w3, [x4, #-1] -5: ret -ENDPROC(memmove) diff --git a/src/arch/arm64/memset.S b/src/arch/arm64/memset.S deleted file mode 100644 index 0cea55d88b..0000000000 --- a/src/arch/arm64/memset.S +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 2013 ARM Ltd. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include <arch/asm.h> - -/* - * Fill in the buffer with character c (alignment handled by the hardware) - * - * Parameters: - * x0 - buf - * x1 - c - * x2 - n - * Returns: - * x0 - buf - */ -ENTRY(memset) - mov x4, x0 - and w1, w1, #0xff - orr w1, w1, w1, lsl #8 - orr w1, w1, w1, lsl #16 - orr x1, x1, x1, lsl #32 - subs x2, x2, #8 - b.mi 2f -1: str x1, [x4], #8 - subs x2, x2, #8 - b.pl 1b -2: adds x2, x2, #4 - b.mi 3f - sub x2, x2, #4 - str w1, [x4], #4 -3: adds x2, x2, #2 - b.mi 4f - sub x2, x2, #2 - strh w1, [x4], #2 -4: adds x2, x2, #1 - b.mi 5f - strb w1, [x4] -5: ret -ENDPROC(memset) |