aarch64: vp9 16bpp: Fix assembling with Xcode 6.2 and older
authorMemphiz <memphis@machzwo.de>
Sun, 18 Jun 2017 10:29:38 +0000 (12:29 +0200)
committerMartin Storsjö <martin@martin.st>
Wed, 21 Jun 2017 06:08:14 +0000 (09:08 +0300)
Properly use the b.eq form instead of the nonstandard form (which
both gas and newer clang accept though), and expand the register
lists that used a range (which the Xcode 6.2 clang, based on clang
3.5 svn, didn't support).

Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/aarch64/vp9itxfm_16bpp_neon.S
libavcodec/aarch64/vp9mc_16bpp_neon.S

index 0befe38..68296d9 100644 (file)
@@ -1925,8 +1925,8 @@ function vp9_idct_idct_32x32_add_16_neon
 2:
         subs            x1,  x1,  #1
 .rept 4
-        st1             {v16.4s-v19.4s},  [x0], #64
-        st1             {v16.4s-v19.4s},  [x0], #64
+        st1             {v16.4s,v17.4s,v18.4s,v19.4s},  [x0], #64
+        st1             {v16.4s,v17.4s,v18.4s,v19.4s},  [x0], #64
 .endr
         b.ne            2b
 3:
@@ -1991,8 +1991,8 @@ function idct32x32_\size\()_add_16_neon
         movi            v19.4s,  #0
 
 .rept 4
-        st1             {v16.4s-v19.4s},  [x0], #64
-        st1             {v16.4s-v19.4s},  [x0], #64
+        st1             {v16.4s,v17.4s,v18.4s,v19.4s},  [x0], #64
+        st1             {v16.4s,v17.4s,v18.4s,v19.4s},  [x0], #64
 .endr
 
 3:
index 98ffd2e..cac6428 100644 (file)
@@ -275,7 +275,7 @@ function \type\()_8tap_\size\()h
         subs            x9,  x9,  #32
         st1             {v1.8h,  v2.8h},  [x0], #32
         st1             {v24.8h, v25.8h}, [x6], #32
-        beq             3f
+        b.eq            3f
         mov             v5.16b,  v7.16b
         mov             v16.16b, v18.16b
         ld1             {v6.8h,  v7.8h},  [x2], #32