[vlc-commits] arm_neon: updated syntax to suit Apple's current, more strict assembler

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Aug  2 18:33:24 2012 +0200| [099a7dd8bc7a7c5ffc0f67448eeb99a81f1fc69e] | committer: Felix Paul Kühne

arm_neon: updated syntax to suit Apple's current, more strict assembler

Should be tested on Android/Linux.

Thanks to Mans Rullgard for the help.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=099a7dd8bc7a7c5ffc0f67448eeb99a81f1fc69e
---

 modules/arm_neon/i420_rgb.S  |    3 ++-
 modules/arm_neon/i420_yuyv.S |    5 +++--
 modules/arm_neon/i422_yuyv.S |    5 +++--
 modules/arm_neon/nv12_rgb.S  |    3 ++-
 modules/arm_neon/nv21_rgb.S  |    3 ++-
 modules/arm_neon/yuyv_i422.S |    5 +++--
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/modules/arm_neon/i420_rgb.S b/modules/arm_neon/i420_rgb.S
index cbf946d..3d38cbe 100644
--- a/modules/arm_neon/i420_rgb.S
+++ b/modules/arm_neon/i420_rgb.S
@@ -19,6 +19,7 @@
  @ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  @****************************************************************************/
 
+	.syntax unified
 	.fpu neon
 	.text
 
@@ -108,7 +109,7 @@ i420_rgb_neon:
 	sub			YPAD,	YPITCH,	WIDTH
 
 loop_row:
-	movgts	COUNT,	WIDTH
+	movsgt	COUNT,	WIDTH
 	add		O2,	O1,	OPITCH
 	add		Y2,	Y1,	YPITCH
 	/* exit if all rows have been processed */
diff --git a/modules/arm_neon/i420_yuyv.S b/modules/arm_neon/i420_yuyv.S
index 8d28264..0dd04de 100644
--- a/modules/arm_neon/i420_yuyv.S
+++ b/modules/arm_neon/i420_yuyv.S
@@ -18,6 +18,7 @@
  @ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  @****************************************************************************/
 
+	.syntax unified
 	.fpu neon
 	.text
 
@@ -46,7 +47,7 @@ i420_yuyv_neon:
 	sub		OPAD,	OPITCH,	WIDTH,	lsl #1
 	sub		YPAD,	YPITCH,	WIDTH
 1:
-	movgts		COUNT,	WIDTH
+	movsgt		COUNT,	WIDTH
 	add		O2,	O1,	OPITCH
 	add		Y2,	Y1,	YPITCH
 	pople		{r4-r8,r10-r11,pc}
@@ -85,7 +86,7 @@ i420_uyvy_neon:
 	sub		OPAD,	OPITCH,	WIDTH,	lsl #1
 	sub		YPAD,	YPITCH,	WIDTH
 1:
-	movgts		COUNT,	WIDTH
+	movsgt		COUNT,	WIDTH
 	add		O2,	O1,	OPITCH
 	add		Y2,	Y1,	YPITCH
 	pople		{r4-r8,r10-r11,pc}
diff --git a/modules/arm_neon/i422_yuyv.S b/modules/arm_neon/i422_yuyv.S
index 6030f52..0960267 100644
--- a/modules/arm_neon/i422_yuyv.S
+++ b/modules/arm_neon/i422_yuyv.S
@@ -18,6 +18,7 @@
  @ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  @****************************************************************************/
 
+	.syntax unified
 	.fpu neon
 	.text
 
@@ -42,7 +43,7 @@ i422_yuyv_neon:
 	sub		OPAD,	OPAD,	WIDTH,	lsl #1
 	sub		YPAD,	YPAD,	WIDTH
 1:
-	movgts		COUNT,	WIDTH
+	movsgt		COUNT,	WIDTH
 	pople		{r4-r6,pc}
 2:
 	pld		[U, #64]
@@ -75,7 +76,7 @@ i422_uyvy_neon:
 	sub		OPAD,	OPAD,	WIDTH,	lsl #1
 	sub		YPAD,	YPAD,	WIDTH
 1:
-	movgts		COUNT,	WIDTH
+	movsgt		COUNT,	WIDTH
 	pople		{r4-r6,pc}
 2:
 	pld		[U, #64]
diff --git a/modules/arm_neon/nv12_rgb.S b/modules/arm_neon/nv12_rgb.S
index 94c60a7..cf75888 100644
--- a/modules/arm_neon/nv12_rgb.S
+++ b/modules/arm_neon/nv12_rgb.S
@@ -19,6 +19,7 @@
  @ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  @****************************************************************************/
 
+	.syntax unified
 	.fpu neon
 	.text
 
@@ -108,7 +109,7 @@ nv12_rgb_neon:
 	sub			YPAD,	YPITCH,	WIDTH
 
 loop_row:
-	movgts	COUNT,	WIDTH
+	movsgt	COUNT,	WIDTH
 	add		O2,	O1,	OPITCH
 	add		Y2,	Y1,	YPITCH
 	/* exit if all rows have been processed */
diff --git a/modules/arm_neon/nv21_rgb.S b/modules/arm_neon/nv21_rgb.S
index ed25fc8..2d2f579 100644
--- a/modules/arm_neon/nv21_rgb.S
+++ b/modules/arm_neon/nv21_rgb.S
@@ -19,6 +19,7 @@
  @ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  @****************************************************************************/
 
+	.syntax unified
 	.fpu neon
 	.text
 
@@ -108,7 +109,7 @@ nv21_rgb_neon:
 	sub			YPAD,	YPITCH,	WIDTH
 
 loop_row:
-	movgts	COUNT,	WIDTH
+	movsgt	COUNT,	WIDTH
 	add		O2,	O1,	OPITCH
 	add		Y2,	Y1,	YPITCH
 	/* exit if all rows have been processed */
diff --git a/modules/arm_neon/yuyv_i422.S b/modules/arm_neon/yuyv_i422.S
index d149193..c3774f5 100644
--- a/modules/arm_neon/yuyv_i422.S
+++ b/modules/arm_neon/yuyv_i422.S
@@ -18,6 +18,7 @@
  @ Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  @****************************************************************************/
 
+	.syntax unified
 	.fpu neon
 	.text
 
@@ -42,7 +43,7 @@ yuyv_i422_neon:
 	sub		YPAD,	YPAD,	WIDTH
 	sub		IPAD,	IPAD,	WIDTH,	lsl #1
 1:
-	movgts		COUNT,	WIDTH
+	movsgt		COUNT,	WIDTH
 	pople		{r4-r6,pc}
 2:
 	pld		[I, #64]
@@ -73,7 +74,7 @@ uyvy_i422_neon:
 	sub		YPAD,	YPAD,	WIDTH
 	sub		IPAD,	IPAD,	WIDTH,	lsl #1
 1:
-	movgts		COUNT,	WIDTH
+	movsgt		COUNT,	WIDTH
 	pople		{r4-r6,pc}
 2:
 	pld		[I, #64]