From: Rafal Krypa <r.krypa@samsung.com>

Subject: Fix Neon build with Thumb-2

    In assembly part of function evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90:
    Don't use 3-operand add instructions (e.g. add r2, r5, #2) as this is
    not supported in unified syntax.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@65768 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/AUTHORS b/AUTHORS
index 52f8f93..470dd6a 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -31,3 +31,4 @@ Seungsoo Woo <om101.woo@samsung.com>
 Youness Alaoui <kakaroto@kakaroto.homelinux.net>
 Jim Kukunas <james.t.kukunas@linux.intel.com>
 Nicolas Aguirre <aguirre.nicolas@gmail.com>
+Rafal Krypa <r.krypa@samsung.com>

diff --git a/src/lib/engines/common/evas_convert_rgb_32.c b/src/lib/engines/common/evas_convert_rgb_32.c
index 41dac6f..565e0d0 100644 (file)
--- a/src/lib/engines/common/evas_convert_rgb_32.c
+++ b/src/lib/engines/common/evas_convert_rgb_32.c
@@ -104,21 +104,21 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int
        asm volatile (
        ".fpu neon                                              \n\t"
        "       mov             %[s1],  %[src]                  \n\t"
-       "       add             %[s1],  %[h],lsl #2             \n\t"
+       "       add             %[s1],  %[s1],  %[h],lsl #2     \n\t"
        "       sub             %[s1],  #8                      \n\t"
 
        "       mov             %[s2],  %[src]                  \n\t"
-       "       add             %[s2],  %[h], lsl #3            \n\t"
-       "       add             %[s2],  %[sjmp], lsr #1         \n\t"
+       "       add             %[s2],  %[s2],  %[h], lsl #3    \n\t"
+       "       add             %[s2],  %[s2],  %[sjmp], lsr #1 \n\t"
        "       sub             %[s2],  #8                      \n\t"
 
        "       mov             %[d1],  %[dst]                  \n\t"
 
        "       add             %[d2],  %[d1], %[djmp]          \n\t"
-       "       add             %[d2],  %[w], lsl #2            \n\t"
+       "       add             %[d2],  %[d2],  %[w], lsl #2    \n\t"
 
        "       mov             %[sadv], %[h], lsl #3           \n\t"
-       "       add             %[sadv], %[sjmp], lsl #1        \n\t"
+       "       add             %[sadv], %[sadv], %[sjmp], lsl #1\n\t"
 
        "       mov             %[y],   #0                      \n\t"
        "       mov             %[x],   #0                      \n\t"
@@ -136,17 +136,17 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int
 
        "       mov             %[x],   #0                      \n\t"
        "       add             %[d1],  %[djmp]                 \n\t"
-       "       add             %[d1],  %[w], lsl #2            \n\t"
+       "       add             %[d1],  %[d1],  %[w], lsl #2    \n\t"
        "       add             %[d2],  %[djmp]                 \n\t"
-       "       add             %[d2],  %[w], lsl #2            \n\t"
+       "       add             %[d2],  %[d2],  %[w], lsl #2    \n\t"
 
        "       mov             %[s1],  %[src]                  \n\t"
-       "       add             %[s1],  %[h], lsl #2            \n\t"
-       "       sub             %[s1],  %[y], lsl #2            \n\t"
+       "       add             %[s1],  %[s1],  %[h], lsl #2    \n\t"
+       "       sub             %[s1],  %[s1],  %[y], lsl #2    \n\t"
        "       sub             %[s1],  #16                     \n\t"
 
        "       add             %[s2],  %[s1], %[h], lsl #2     \n\t"
-       "       add             %[s2],  %[sjmp], lsl #2         \n\t"
+       "       add             %[s2],  %[s2],  %[sjmp], lsl #2 \n\t"
 
        "       add             %[y],   #2                      \n\t"