From 510ae7b5a5560d4aed2872743bfc54c9190c5c3a Mon Sep 17 00:00:00 2001 From: Martin Storsjo Date: Sat, 28 Jul 2018 08:02:27 +0300 Subject: [PATCH] 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 --- build/make/ads2gas.pl | 2 +- build/make/ads2gas_apple.pl | 1 + vpx_dsp/arm/loopfilter_8_neon.asm | 2 +- vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type1_neon.asm | 1 - vpx_dsp/arm/vpx_convolve8_avg_vert_filter_type2_neon.asm | 1 - vpx_dsp/arm/vpx_convolve8_vert_filter_type1_neon.asm | 1 - vpx_dsp/arm/vpx_convolve8_vert_filter_type2_neon.asm | 1 - 7 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build/make/ads2gas.pl b/build/make/ads2gas.pl index 91609da..0bf4816 100755 --- 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 e1ae7b4..806fdd8 100755 --- 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 a042d40..a81a9d1 100644 --- 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 c053427..d310a83 100644 --- 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 f415b99..c5695fb 100644 --- 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 fa3e0bb..2666d42 100644 --- 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 94007aa..cb5d6d3 100644 --- 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 -- 2.7.4