[SCM] libav/experimental: get register names from x86_cpu.h

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:17:11 UTC 2013


The following commit has been merged in the experimental branch:
commit b55aa9a90446c3f6a549b82e0313b221f0fc31ed
Author: Måns Rullgård <mans at mansr.com>
Date:   Mon Mar 17 23:08:19 2008 +0000

    get register names from x86_cpu.h
    
    Originally committed as revision 12482 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/i386/cputest.c b/libavcodec/i386/cputest.c
index 57b85ff..92e3d64 100644
--- a/libavcodec/i386/cputest.c
+++ b/libavcodec/i386/cputest.c
@@ -22,17 +22,10 @@
 
 #include <stdlib.h>
 #include "dsputil.h"
+#include "x86_cpu.h"
 
 #undef printf
 
-#ifdef ARCH_X86_64
-#  define REG_b "rbx"
-#  define REG_S "rsi"
-#else
-#  define REG_b "ebx"
-#  define REG_S "esi"
-#endif
-
 /* ebx saving is necessary for PIC. gcc seems unable to see it alone */
 #define cpuid(index,eax,ebx,ecx,edx)\
     asm volatile\
diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c
index 8789b5f..3904d4d 100644
--- a/libpostproc/postprocess_template.c
+++ b/libpostproc/postprocess_template.c
@@ -23,24 +23,11 @@
  * mmx/mmx2/3dnow postprocess code.
  */
 
+#include "x86_cpu.h"
 
 #ifdef ARCH_X86_64
-#  define REGa  rax
-#  define REGc  rcx
-#  define REGd  rdx
-#  define REG_a  "rax"
-#  define REG_c  "rcx"
-#  define REG_d  "rdx"
-#  define REG_SP "rsp"
 #  define ALIGN_MASK "$0xFFFFFFFFFFFFFFF8"
 #else
-#  define REGa  eax
-#  define REGc  ecx
-#  define REGd  edx
-#  define REG_a  "eax"
-#  define REG_c  "ecx"
-#  define REG_d  "edx"
-#  define REG_SP "esp"
 #  define ALIGN_MASK "$0xFFFFFFF8"
 #endif
 

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list