summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorRafal Krypa <r.krypa@samsung.com>2011-12-01 10:00:44 +0000
committerCarsten Haitzler <raster@rasterman.com>2011-12-01 10:00:44 +0000
commit20896e3c142f8e8f30f5146a46dffa4d6d37b4b6 (patch)
treeae824f57b0c71a4ccc4a39988c801029d68cfa05 /legacy
parent1593fbca3fc1535f623d0c888b296dfb297423d7 (diff)
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. SVN revision: 65768
Diffstat (limited to 'legacy')
-rw-r--r--legacy/evas/AUTHORS1
-rw-r--r--legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c20
2 files changed, 11 insertions, 10 deletions
diff --git a/legacy/evas/AUTHORS b/legacy/evas/AUTHORS
index 52f8f93..470dd6a 100644
--- a/legacy/evas/AUTHORS
+++ b/legacy/evas/AUTHORS
@@ -31,3 +31,4 @@ Seungsoo Woo <om101.woo@samsung.com>
31Youness Alaoui <kakaroto@kakaroto.homelinux.net> 31Youness Alaoui <kakaroto@kakaroto.homelinux.net>
32Jim Kukunas <james.t.kukunas@linux.intel.com> 32Jim Kukunas <james.t.kukunas@linux.intel.com>
33Nicolas Aguirre <aguirre.nicolas@gmail.com> 33Nicolas Aguirre <aguirre.nicolas@gmail.com>
34Rafal Krypa <r.krypa@samsung.com>
diff --git a/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c b/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c
index 41dac6f..565e0d0 100644
--- a/legacy/evas/src/lib/engines/common/evas_convert_rgb_32.c
+++ b/legacy/evas/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
104 asm volatile ( 104 asm volatile (
105 ".fpu neon \n\t" 105 ".fpu neon \n\t"
106 " mov %[s1], %[src] \n\t" 106 " mov %[s1], %[src] \n\t"
107 " add %[s1], %[h],lsl #2 \n\t" 107 " add %[s1], %[s1], %[h],lsl #2 \n\t"
108 " sub %[s1], #8 \n\t" 108 " sub %[s1], #8 \n\t"
109 109
110 " mov %[s2], %[src] \n\t" 110 " mov %[s2], %[src] \n\t"
111 " add %[s2], %[h], lsl #3 \n\t" 111 " add %[s2], %[s2], %[h], lsl #3 \n\t"
112 " add %[s2], %[sjmp], lsr #1 \n\t" 112 " add %[s2], %[s2], %[sjmp], lsr #1 \n\t"
113 " sub %[s2], #8 \n\t" 113 " sub %[s2], #8 \n\t"
114 114
115 " mov %[d1], %[dst] \n\t" 115 " mov %[d1], %[dst] \n\t"
116 116
117 " add %[d2], %[d1], %[djmp] \n\t" 117 " add %[d2], %[d1], %[djmp] \n\t"
118 " add %[d2], %[w], lsl #2 \n\t" 118 " add %[d2], %[d2], %[w], lsl #2 \n\t"
119 119
120 " mov %[sadv], %[h], lsl #3 \n\t" 120 " mov %[sadv], %[h], lsl #3 \n\t"
121 " add %[sadv], %[sjmp], lsl #1 \n\t" 121 " add %[sadv], %[sadv], %[sjmp], lsl #1\n\t"
122 122
123 " mov %[y], #0 \n\t" 123 " mov %[y], #0 \n\t"
124 " mov %[x], #0 \n\t" 124 " mov %[x], #0 \n\t"
@@ -136,17 +136,17 @@ evas_common_convert_rgba_to_32bpp_rgb_8888_rot_90 (DATA32 *src, DATA8 *dst, int
136 136
137 " mov %[x], #0 \n\t" 137 " mov %[x], #0 \n\t"
138 " add %[d1], %[djmp] \n\t" 138 " add %[d1], %[djmp] \n\t"
139 " add %[d1], %[w], lsl #2 \n\t" 139 " add %[d1], %[d1], %[w], lsl #2 \n\t"
140 " add %[d2], %[djmp] \n\t" 140 " add %[d2], %[djmp] \n\t"
141 " add %[d2], %[w], lsl #2 \n\t" 141 " add %[d2], %[d2], %[w], lsl #2 \n\t"
142 142
143 " mov %[s1], %[src] \n\t" 143 " mov %[s1], %[src] \n\t"
144 " add %[s1], %[h], lsl #2 \n\t" 144 " add %[s1], %[s1], %[h], lsl #2 \n\t"
145 " sub %[s1], %[y], lsl #2 \n\t" 145 " sub %[s1], %[s1], %[y], lsl #2 \n\t"
146 " sub %[s1], #16 \n\t" 146 " sub %[s1], #16 \n\t"
147 147
148 " add %[s2], %[s1], %[h], lsl #2 \n\t" 148 " add %[s2], %[s1], %[h], lsl #2 \n\t"
149 " add %[s2], %[sjmp], lsl #2 \n\t" 149 " add %[s2], %[s2], %[sjmp], lsl #2 \n\t"
150 150
151 " add %[y], #2 \n\t" 151 " add %[y], #2 \n\t"
152 152