[x264-devel] x86inc: Make ym# behave the same way as xm#

[Henrik Gramner]

x264 | branch: master | Henrik Gramner <henrik at gramner.com> | Fri Oct 18 22:43:36 2013 +0200| [0997c288be10ab3f981322723ca7bae99ded1027] | committer: Jason Garrett-Glaser

x86inc: Make ym# behave the same way as xm#

This makes more sense for future implementations of templates with zmm registers.

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

 common/x86/x86inc.asm |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/common/x86/x86inc.asm b/common/x86/x86inc.asm
index a389485..ef45a29 100644
--- a/common/x86/x86inc.asm
+++ b/common/x86/x86inc.asm
@@ -778,9 +778,9 @@ SECTION .note.GNU-stack noalloc noexec nowrite progbits
 %endmacro
 
 ; Merge mmx and sse*
-; m# is a simd regsiter of the currently selected size
-; xm# is the corresponding xmmreg (if selcted xmm or ymm size), or mmreg (if selected mmx)
-; ym# is the corresponding ymmreg (if selcted xmm or ymm size), or mmreg (if selected mmx)
+; m# is a simd register of the currently selected size
+; xm# is the corresponding xmm register if mmsize >= 16, otherwise the same as m#
+; ym# is the corresponding ymm register if mmsize >= 32, otherwise the same as m#
 ; (All 3 remain in sync through SWAP.)
 
 %macro CAT_XDEFINE 3
@@ -866,7 +866,7 @@ INIT_XMM
     %define xmmxmm%1 xmm%1
     %define xmmymm%1 xmm%1
     %define ymmmm%1   mm%1
-    %define ymmxmm%1 ymm%1
+    %define ymmxmm%1 xmm%1
     %define ymmymm%1 ymm%1
     %define xm%1 xmm %+ m%1
     %define ym%1 ymm %+ m%1