From 285d1558aef930dc2653f209da140b1df35792a5 Mon Sep 17 00:00:00 2001 From: Brett Nash Date: Mon, 24 May 2010 02:16:14 +0000 Subject: [PATCH] Fix buggy arm ldr instruction. The size suffixes are apparetly allowed only on neon instructions. Thanks to Ben Zores for the bug report + testing. SVN revision: 49174 --- .../common/evas_op_blend/op_blend_mask_color_neon.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_neon.c b/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_neon.c index 76642487bd..09eca0e481 100644 --- a/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_neon.c +++ b/legacy/evas/src/lib/engines/common/evas_op_blend/op_blend_mask_color_neon.c @@ -68,9 +68,8 @@ _op_blend_mas_c_dp_neon(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, int " cmp %[tmp], %[d] \n\t" " ble "AP"loopout \n\t" AP"quadloopint: \n\t" -// " vld1.32 d0[0], [%[m]]! \n\t" - " ldr.32 %[x], [%[m]] \n\t" - " add %[m], #4 \n\t" + " ldr %[x], [%[m]] \n\t" + " add %[m], #4 \n\t" " cmp %[x], #0 \n\t" " beq "AP"fastloop \n\t" " vmov.32 d0[0], %[x] \n\t" @@ -232,7 +231,7 @@ _op_blend_mas_can_dp_neon(DATA32 *s __UNUSED__, DATA8 *m, DATA32 c, DATA32 *d, i AP"quadloopint: \n\t" // Load the mask: 4 bytes: It has d0/d1 - " ldr.32 %[x], [%[m]] \n\t" + " ldr %[x], [%[m]] \n\t" " add %[m], #4 \n\t" " cmp %[x], #0 \n\t" " beq "AP"fastloop \n\t"