arm: Consistently use unified syntax for asm

The ".syntax unified" directives in a few source files aren't valid
ADS assembly directives, and they break compilation for windows,
since ads2armasm_ms.pl doesn't handle them.

Explicity add them via ads2gas.pl and ads2gas_apple.pl instead,
and tweak one instruction to be valid unified syntax.

Change-Id: I37f1709f163d11474597161fe02eb433859cb9b8

diff --git a/build/make/ads2gas.pl b/build/make/ads2gas.pl
index 91609da7323c41fa0255874dd52e7c027ecca9b1..0bf4816cc98f1e7279d2f5804148ab33847adc3d 100755 (executable)
--- a/build/make/ads2gas.pl
+++ b/build/make/ads2gas.pl
@@ -33,8 +33,8 @@ foreach my $arg (@ARGV) {
 print "@ This file was created from a .asm file\n";
 print "@  using the ads2gas.pl script.\n";
 print "\t.equ DO1STROUNDING, 0\n";
+print "\t.syntax unified\n";
 if ($thumb) {
-    print "\t.syntax unified\n";
     print "\t.thumb\n";
 }
 

diff --git a/build/make/ads2gas_apple.pl b/build/make/ads2gas_apple.pl
index e1ae7b4f871189ab7c2ec32d3886a70afb3f3bb3..806fdd8b3945b93c58586e3e1bafe3ec92ae5c13 100755 (executable)
--- a/build/make/ads2gas_apple.pl
+++ b/build/make/ads2gas_apple.pl
@@ -23,6 +23,7 @@ print "@  using the ads2gas_apple.pl script.\n\n";
 print "\t.set WIDE_REFERENCE, 0\n";
 print "\t.set ARCHITECTURE, 5\n";
 print "\t.set DO1STROUNDING, 0\n";
+print "\t.syntax unified\n";
 
 my %register_aliases;
 my %macro_aliases;

diff --git a/vpx_dsp/arm/loopfilter_8_neon.asm b/vpx_dsp/arm/loopfilter_8_neon.asm
index a042d40acb2cf3bab77ed6a34d0fab01979541fc..a81a9d10132fbdcac4c109defc6de6985a03c084 100644 (file)
--- a/vpx_dsp/arm/loopfilter_8_neon.asm
+++ b/vpx_dsp/arm/loopfilter_8_neon.asm
@@ -201,7 +201,7 @@
     str         lr, [sp, #16]              ; thresh1
     add         sp, #4
     pop         {r0-r1, lr}
-    add         r0, r1, lsl #3             ; s + 8 * pitch
+    add         r0, r0, r1, lsl #3         ; s + 8 * pitch
     b           vpx_lpf_vertical_8_neon
     ENDP        ; |vpx_lpf_vertical_8_dual_neon|
 

diff --git a/vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type1_neon.asm b/vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type1_neon.asm
index c0534275756524f6837b852f79b8e162d17bb55d..d310a83dad801b232fe60e6bcd043beba5d3d384 100644 (file)
--- a/vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type1_neon.asm
+++ b/vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type1_neon.asm
@@ -20,7 +20,6 @@
     ARM
     REQUIRE8
     PRESERVE8
-    .syntax unified
 
     AREA  ||.text||, CODE, READONLY, ALIGN=2
 

diff --git a/vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type2_neon.asm b/vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type2_neon.asm
index f415b99b95c5f7f02ea2cd564593b010dbedc6fd..c5695fbda84585cb2c8f083306fa49fa5dc7faf7 100644 (file)
--- a/vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type2_neon.asm
+++ b/vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type2_neon.asm
@@ -20,7 +20,6 @@
     ARM
     REQUIRE8
     PRESERVE8
-    .syntax unified
 
     AREA  ||.text||, CODE, READONLY, ALIGN=2
 

diff --git a/vpx_dsp/arm/vpx_convolve8_vert_filter_type1_neon.asm b/vpx_dsp/arm/vpx_convolve8_vert_filter_type1_neon.asm
index fa3e0bb622602929b25362bb4ea7fd380ec780d5..2666d4253e448f775daddd271bbece6e14081a79 100644 (file)
--- a/vpx_dsp/arm/vpx_convolve8_vert_filter_type1_neon.asm
+++ b/vpx_dsp/arm/vpx_convolve8_vert_filter_type1_neon.asm
@@ -20,7 +20,6 @@
     ARM
     REQUIRE8
     PRESERVE8
-    .syntax unified
 
     AREA  ||.text||, CODE, READONLY, ALIGN=2
 

diff --git a/vpx_dsp/arm/vpx_convolve8_vert_filter_type2_neon.asm b/vpx_dsp/arm/vpx_convolve8_vert_filter_type2_neon.asm
index 94007aa967c96843d6c099abdd46e6ec01047722..cb5d6d3fe5cce2b50b9f1802f30d47e43ab83b32 100644 (file)
--- a/vpx_dsp/arm/vpx_convolve8_vert_filter_type2_neon.asm
+++ b/vpx_dsp/arm/vpx_convolve8_vert_filter_type2_neon.asm
@@ -20,7 +20,6 @@
     ARM
     REQUIRE8
     PRESERVE8
-    .syntax unified
 
     AREA  ||.text||, CODE, READONLY, ALIGN=2