[x264-devel] Fix regression in r2141

[Henrik Gramner]

x264 | branch: master | Henrik Gramner <hengar-6 at student.ltu.se> | Sun Feb  5 20:43:09 2012 +0100| [3f72c99a15a07511b758d9e94217223480865124] | committer: Jason Garrett-Glaser

Fix regression in r2141
Broke register preservation in x264_cpu_cpuid and x264_cpu_xgetbv.
Did not cause any problems.

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

 common/x86/cpu-a.asm |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/common/x86/cpu-a.asm b/common/x86/cpu-a.asm
index 85985b4..0712447 100644
--- a/common/x86/cpu-a.asm
+++ b/common/x86/cpu-a.asm
@@ -41,14 +41,14 @@ cglobal cpu_cpuid, 5,7
     mov  eax, r0d
     xor  ecx, ecx
     cpuid
-    pop  rsi
-    mov [rsi], eax
-    pop  rsi
-    mov [rsi], ebx
-    pop  rsi
-    mov [rsi], ecx
-    pop  rsi
-    mov [rsi], edx
+    pop   r4
+    mov [r4], eax
+    pop   r4
+    mov [r4], ebx
+    pop   r4
+    mov [r4], ecx
+    pop   r4
+    mov [r4], edx
     pop  rbx
     RET
 
@@ -60,10 +60,10 @@ cglobal cpu_xgetbv, 3,7
     push  r1
     mov  ecx, r0d
     xgetbv
-    pop  rsi
-    mov [rsi], eax
-    pop  rsi
-    mov [rsi], edx
+    pop   r4
+    mov [r4], eax
+    pop   r4
+    mov [r4], edx
     RET
 
 %if ARCH_X86_64 == 0