From: Janne Grunau <janne-x264@jannau.net>
Date: Tue, 18 Aug 2015 08:25:09 +0000 (+0200)
Subject: aarch64: Fix coeff_level_run* macros with LLVM's assembler
X-Git-Url: https://git.sesse.net/?p=x264;a=commitdiff_plain;h=f2a6be92e5e42e8ef1daf74f63dbdbc4819d2070

aarch64: Fix coeff_level_run* macros with LLVM's assembler

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

diff --git a/common/aarch64/quant-a.S b/common/aarch64/quant-a.S
index 443a91da..3e7e35e4 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