From 5641cd0a4a333bdcaece5b1f88d2f0ef41171861 Mon Sep 17 00:00:00 2001 From: Graham Sanderson Date: Tue, 26 Oct 2021 13:47:46 -0500 Subject: [PATCH] __aeabi_memset* were switching the wrong arguments (#634) --- src/rp2_common/pico_mem_ops/mem_ops_aeabi.S | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/rp2_common/pico_mem_ops/mem_ops_aeabi.S b/src/rp2_common/pico_mem_ops/mem_ops_aeabi.S index e52e188..8540905 100644 --- a/src/rp2_common/pico_mem_ops/mem_ops_aeabi.S +++ b/src/rp2_common/pico_mem_ops/mem_ops_aeabi.S @@ -59,20 +59,20 @@ regular_func __aeabi_mem_init mem_section aeabi_memset_memcpy wrapper_func __aeabi_memset - // args are backwards - eors r0, r1 - eors r1, r0 - eors r0, r1 + // 2nd/3rd args are reversed + eors r2, r1 + eors r1, r2 + eors r2, r1 ldr r3, =aeabi_mem_funcs ldr r3, [r3, #MEMSET] bx r3 wrapper_func __aeabi_memset4 wrapper_func __aeabi_memset8 - // args are backwards - eors r0, r1 - eors r1, r0 - eors r0, r1 + // 2nd/3rd args are reversed + eors r2, r1 + eors r1, r2 + eors r2, r1 ldr r3, =aeabi_mem_funcs ldr r3, [r3, #MEMSET4] bx r3