shithub: dav1d

Download patch

ref: 2eee4711e30ccb516a9923c687deb626d8e76057
parent: 08b4c9af3a37bb2a98d2cc2f78d0b51d96db5143
author: Henrik Gramner <[email protected]>
date: Mon Dec 17 17:48:25 EST 2018

Fix AVX2 itx crash on 64-bit Windows

Accidentally broken in eb01bdb.

--- a/src/x86/itx.asm
+++ b/src/x86/itx.asm
@@ -3281,10 +3281,10 @@
 %endmacro
 
 %macro ITX_UNPACK_MULHRSW 7 ; dst1, dst2/src, tmp, coef[1-4]
-    vpbroadcastd        m%3, [r4-pw_201_4091x8+pw_%4_%5x8]
+    vpbroadcastd        m%3, [r5-pw_201_4091x8+pw_%4_%5x8]
     punpcklwd           m%1, m%2, m%2
     pmulhrsw            m%1, m%3
-    vpbroadcastd        m%3, [r4-pw_201_4091x8+pw_%6_%7x8]
+    vpbroadcastd        m%3, [r5-pw_201_4091x8+pw_%6_%7x8]
     punpckhwd           m%2, m%2
     pmulhrsw            m%2, m%3
 %endmacro
@@ -3443,7 +3443,7 @@
     mova [rsp+gprsize+1*32], m1
     mova                 m0, [rsp+gprsize+2*32]
     mova [rsp+gprsize+2*32], m6
-    lea                  r4, [rax-(o_base)+pw_201_4091x8]
+    lea                  r5, [rax-(o_base)+pw_201_4091x8]
     ITX_UNPACK_MULHRSW    1,  8,  6,  201, 4091,  m601, 4052 ; t16a, t31a, t23a, t24a
     ITX_UNPACK_MULHRSW   15,  9,  6,  995, 3973, m1380, 3857 ; t20a, t27a, t19a, t28a
     ITX_UNPACK_MULHRSW   14,  0,  6, 1751, 3703, m2106, 3513 ; t18a, t29a, t21a, t26a