[x264-devel] aarch64: Fix coeff_level_run* macros with LLVM's assembler

[Janne Grunau]

x264 | branch: master | Janne Grunau <janne-x264 at jannau.net> | Tue Aug 18 10:25:09 2015 +0200| [f2a6be92e5e42e8ef1daf74f63dbdbc4819d2070] | committer: Henrik Gramner

aarch64: Fix coeff_level_run* macros with LLVM's assembler

LLVM's integrated assembler does not treat symbols as integer constants.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=f2a6be92e5e42e8ef1daf74f63dbdbc4819d2070
---

 common/aarch64/quant-a.S |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/common/aarch64/quant-a.S b/common/aarch64/quant-a.S
index 443a91d..3e7e35e 100644
--- a/common/aarch64/quant-a.S
+++ b/common/aarch64/quant-a.S
@@ -538,12 +538,10 @@ function x264_coeff_level_run\size\()_neon, export=1
     sub         x0,  x0,  #2
 .endif
 .if         \size < 15
-    .equ        shiftw, 3
     ld1         {v0.8h}, [x0]
     uqxtn       v0.8b,  v0.8h
     cmtst       v0.8b,  v0.8b,  v0.8b
 .else
-    .equ        shiftw, 2
     ld1         {v0.8h,v1.8h}, [x0]
     uqxtn       v0.8b,  v0.8h
     uqxtn2      v0.16b, v1.8h
@@ -557,7 +555,7 @@ function x264_coeff_level_run\size\()_neon, export=1
 
     coeff_level_run_start \size
 
-    coeff_level_run shiftw
+    coeff_level_run (4 - (\size + 1) / 8)
 
     ret
 endfunc