From 125343cc886accee268b03f020c09658cff37509 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 24 Apr 2018 22:39:50 +0200 Subject: [PATCH 1/2] Drop test for zero incx,incy in armv7 AXPY ...to pass the related utest (see #1469) --- kernel/arm/axpy_vfp.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/arm/axpy_vfp.S b/kernel/arm/axpy_vfp.S index 37515f399..c35b8aece 100644 --- a/kernel/arm/axpy_vfp.S +++ b/kernel/arm/axpy_vfp.S @@ -440,13 +440,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. cmp N, #0 ble axpy_kernel_L999 - +/* cmp INC_X, #0 beq axpy_kernel_L999 cmp INC_Y, #0 beq axpy_kernel_L999 - +*/ cmp INC_X, #1 bne axpy_kernel_S_BEGIN From 2d0929fa7c969cbe8f7dcbf3e5b16ef1301dc6a1 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Tue, 24 Apr 2018 22:43:00 +0200 Subject: [PATCH 2/2] Move the test for zero incx,incy in ARMV7 ROT to pass the related utest (see #1469) --- kernel/arm/rot_vfp.S | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kernel/arm/rot_vfp.S b/kernel/arm/rot_vfp.S index 25f563690..ea296dbc5 100644 --- a/kernel/arm/rot_vfp.S +++ b/kernel/arm/rot_vfp.S @@ -483,13 +483,13 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. cmp N, #0 ble rot_kernel_L999 - +/* cmp INC_X, #0 beq rot_kernel_L999 cmp INC_Y, #0 beq rot_kernel_L999 - +*/ cmp INC_X, #1 bne rot_kernel_S_BEGIN @@ -584,6 +584,12 @@ rot_kernel_S1: rot_kernel_S10: KERNEL_S1 + + cmp INC_X, #0 + beq rot_kernel_L999 + + cmp INC_Y, #0 + beq rot_kernel_L999 subs I, I, #1 bne rot_kernel_S10