shithub: libvpx

Download patch

ref: 510ae7b5a5560d4aed2872743bfc54c9190c5c3a
parent: 2d79df49408873dd62a1b26cf8ed0e067c26dc6d
author: Martin Storsjo <[email protected]>
date: Sat Jul 28 04:02:27 EDT 2018 

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


--- a/build/make/ads2gas.pl
+++ b/build/make/ads2gas.pl
@@ -33,8 +33,8 @@
 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";
 }
 
--- a/build/make/ads2gas_apple.pl
+++ b/build/make/ads2gas_apple.pl
@@ -23,6 +23,7 @@
 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;
--- 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|
 
--- 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
 
--- 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
 
--- 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
 
--- 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