[x265] [PATCH 10 of 20] x86inc: free up variable name "n" in global namespace

vignesh at multicorewareinc.com vignesh at multicorewareinc.com
Mon Jun 12 07:37:52 CEST 2017


# HG changeset patch
# User Vignesh Vijayakumar
# Date 1496747652 -19800
#      Tue Jun 06 16:44:12 2017 +0530
# Node ID 337a5792d9cb29cc13b0a324ff0036121dc829ca
# Parent  186284517c0f6ad40285fcd93aac95540f5467a1
x86inc: free up variable name "n" in global namespace

diff -r 186284517c0f -r 337a5792d9cb source/common/x86/pixel-a.asm
--- a/source/common/x86/pixel-a.asm	Mon Jun 12 10:27:09 2017 +0530
+++ b/source/common/x86/pixel-a.asm	Tue Jun 06 16:44:12 2017 +0530
@@ -227,7 +227,7 @@
 ; clobber: m3..m7
 ; out: %1 = satd
 %macro SATD_4x4_MMX 3
-    %xdefine %%n n%1
+    %xdefine %%n nn%1
     %assign offset %2*SIZEOF_PIXEL
     LOAD_DIFF m4, m3, none, [r0+     offset], [r2+     offset]
     LOAD_DIFF m5, m3, none, [r0+  r1+offset], [r2+  r3+offset]
diff -r 186284517c0f -r 337a5792d9cb source/common/x86/x86inc.asm
--- a/source/common/x86/x86inc.asm	Mon Jun 12 10:27:09 2017 +0530
+++ b/source/common/x86/x86inc.asm	Tue Jun 06 16:44:12 2017 +0530
@@ -828,12 +828,12 @@
     %assign %%i 0
     %rep 8
         CAT_XDEFINE m, %%i, mm %+ %%i
-        CAT_XDEFINE nmm, %%i, %%i
+        CAT_XDEFINE nnmm, %%i, %%i
         %assign %%i %%i+1
     %endrep
     %rep 8
         CAT_UNDEF m, %%i
-        CAT_UNDEF nmm, %%i
+        CAT_UNDEF nnmm, %%i
         %assign %%i %%i+1
     %endrep
     INIT_CPUFLAGS %1
@@ -854,7 +854,7 @@
     %assign %%i 0
     %rep num_mmregs
     CAT_XDEFINE m, %%i, xmm %+ %%i
-    CAT_XDEFINE nxmm, %%i, %%i
+    CAT_XDEFINE nnxmm, %%i, %%i
     %assign %%i %%i+1
     %endrep
     INIT_CPUFLAGS %1
@@ -875,7 +875,7 @@
     %assign %%i 0
     %rep num_mmregs
         CAT_XDEFINE m, %%i, ymm %+ %%i
-        CAT_XDEFINE nymm, %%i, %%i
+        CAT_XDEFINE nnymm, %%i, %%i
         %assign %%i %%i+1
     %endrep
     INIT_CPUFLAGS %1
@@ -926,7 +926,7 @@
     %endrep
     %rep %0/2
         %xdefine m%1 %%tmp%2
-        CAT_XDEFINE n, m%1, %1
+        CAT_XDEFINE nn, m%1, %1
         %rotate 2
     %endrep
 %endmacro
@@ -944,16 +944,16 @@
         %xdefine %%tmp m%1
         %xdefine m%1 m%2
         %xdefine m%2 %%tmp
-        CAT_XDEFINE n, m%1, %1
-        CAT_XDEFINE n, m%2, %2
+        CAT_XDEFINE nn, m%1, %1
+        CAT_XDEFINE nn, m%2, %2
         %rotate 1
     %endrep
 %endmacro
 
 %macro SWAP_INTERNAL_NAME 2-*
-    %xdefine %%args n %+ %1
+    %xdefine %%args nn %+ %1
     %rep %0-1
-        %xdefine %%args %%args, n %+ %2
+        %xdefine %%args %%args, nn %+ %2
         %rotate 1
     %endrep
     SWAP_INTERNAL_NUM %%args
@@ -980,7 +980,7 @@
         %assign %%i 0
         %rep num_mmregs
             CAT_XDEFINE m, %%i, %1_m %+ %%i
-            CAT_XDEFINE n, m %+ %%i, %%i
+            CAT_XDEFINE nn, m %+ %%i, %%i
             %assign %%i %%i+1
         %endrep
     %endif


More information about the x265-devel mailing list