From 3cd52279c98910972371723c0654facfe3a1b2d1 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 1 Nov 2006 18:34:40 +0000 Subject: [PATCH] Use common define for x86_32 and x86_64. Originally committed as revision 6859 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/bitstream.h | 12 ++++++------ libavcodec/msmpeg4.c | 2 +- libavutil/bswap.h | 4 ++-- libavutil/common.h | 2 +- libavutil/internal.h | 4 ++-- libpostproc/postprocess.c | 10 +++++----- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h index 26b4f8d8c0..af25b6dcf5 100644 --- a/libavcodec/bitstream.h +++ b/libavcodec/bitstream.h @@ -47,7 +47,7 @@ extern const uint8_t ff_reverse[256]; -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if defined(ARCH_X86) // avoid +32 for shift optimization (gcc should do that ...) static inline int32_t NEG_SSR32( int32_t a, int8_t s){ asm ("sarl %1, %0\n\t" @@ -171,7 +171,7 @@ typedef struct RL_VLC_ELEM { #endif /* used to avoid missaligned exceptions on some archs (alpha, ...) */ -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if defined(ARCH_X86) # define unaligned16(a) (*(const uint16_t*)(a)) # define unaligned32(a) (*(const uint32_t*)(a)) # define unaligned64(a) (*(const uint64_t*)(a)) @@ -200,7 +200,7 @@ unaligned(16) unaligned(32) unaligned(64) #undef unaligned -#endif /* defined(ARCH_X86) || defined(ARCH_X86_64) */ +#endif /* defined(ARCH_X86) */ #ifndef ALT_BITSTREAM_WRITER static inline void put_bits(PutBitContext *s, int n, unsigned int value) @@ -247,7 +247,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) static inline void put_bits(PutBitContext *s, int n, unsigned int value) { # ifdef ALIGNED_BITSTREAM_WRITER -# if defined(ARCH_X86) || defined(ARCH_X86_64) +# if defined(ARCH_X86) asm volatile( "movl %0, %%ecx \n\t" "xorl %%eax, %%eax \n\t" @@ -278,7 +278,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) s->index= index; # endif # else //ALIGNED_BITSTREAM_WRITER -# if defined(ARCH_X86) || defined(ARCH_X86_64) +# if defined(ARCH_X86) asm volatile( "movl $7, %%ecx \n\t" "andl %0, %%ecx \n\t" @@ -580,7 +580,7 @@ static inline void skip_bits_long(GetBitContext *s, int n){ name##_bit_count-= 32;\ }\ -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if defined(ARCH_X86) # define SKIP_CACHE(name, gb, num)\ asm(\ "shldl %2, %1, %0 \n\t"\ diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 41c56e1938..2089bd3204 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -659,7 +659,7 @@ static inline int msmpeg4_pred_dc(MpegEncContext * s, int n, necessitate to modify mpegvideo.c. The problem comes from the fact they decided to store the quantized DC (which would lead to problems if Q could vary !) */ -#if (defined(ARCH_X86) || defined(ARCH_X86_64)) && !defined PIC +#if (defined(ARCH_X86)) && !defined PIC asm volatile( "movl %3, %%eax \n\t" "shrl $1, %%eax \n\t" diff --git a/libavutil/bswap.h b/libavutil/bswap.h index 46538f4ada..4614c90458 100644 --- a/libavutil/bswap.h +++ b/libavutil/bswap.h @@ -36,7 +36,7 @@ # define LEGACY_REGS "=q" #endif -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if defined(ARCH_X86) static always_inline uint16_t bswap_16(uint16_t x) { __asm("rorw $8, %0" : @@ -149,7 +149,7 @@ static inline uint64_t bswap_64(uint64_t x) return r.ll; #endif } -#endif /* defined(ARCH_X86) || defined(ARCH_X86_64) */ +#endif /* defined(ARCH_X86) */ #endif /* !HAVE_BYTESWAP_H */ diff --git a/libavutil/common.h b/libavutil/common.h index bb049e9628..583273aed1 100644 --- a/libavutil/common.h +++ b/libavutil/common.h @@ -334,7 +334,7 @@ static inline int ff_get_fourcc(const char *s){ }\ } -#if defined(ARCH_X86) || defined(ARCH_X86_64) || defined(ARCH_POWERPC) +#if defined(ARCH_X86) || defined(ARCH_POWERPC) #if defined(ARCH_X86_64) static inline uint64_t read_time(void) { diff --git a/libavutil/internal.h b/libavutil/internal.h index 4f7e525cfd..1ed6d94b84 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -105,7 +105,7 @@ extern const uint32_t inverse[256]; -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if defined(ARCH_X86) # define FASTDIV(a,b) \ ({\ int ret,dmy;\ @@ -154,7 +154,7 @@ static inline int ff_sqrt(int a) return ret; } -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if defined(ARCH_X86) #define MASK_ABS(mask, level)\ asm volatile(\ "cdq \n\t"\ diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index a81cf20db1..c9f2893e3c 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -105,7 +105,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks #define TEMP_STRIDE 8 //#define NUM_BLOCKS_AT_ONCE 16 //not used yet -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if defined(ARCH_X86) static uint64_t __attribute__((aligned(8))) attribute_used w05= 0x0005000500050005LL; static uint64_t __attribute__((aligned(8))) attribute_used w04= 0x0004000400040004LL; static uint64_t __attribute__((aligned(8))) attribute_used w20= 0x0020002000200020LL; @@ -156,7 +156,7 @@ static const char *replaceTable[]= }; -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if defined(ARCH_X86) static inline void prefetchnta(void *p) { asm volatile( "prefetchnta (%0)\n\t" @@ -581,7 +581,7 @@ static always_inline void do_a_deblock_C(uint8_t *src, int step, int stride, PPC #endif //HAVE_ALTIVEC #endif //ARCH_POWERPC -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if defined(ARCH_X86) #if (defined (HAVE_MMX) && !defined (HAVE_3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT) #define COMPILE_MMX @@ -594,7 +594,7 @@ static always_inline void do_a_deblock_C(uint8_t *src, int step, int stride, PPC #if (defined (HAVE_3DNOW) && !defined (HAVE_MMX2)) || defined (RUNTIME_CPUDETECT) #define COMPILE_3DNOW #endif -#endif /* defined(ARCH_X86) || defined(ARCH_X86_64) */ +#endif /* defined(ARCH_X86) */ #undef HAVE_MMX #undef HAVE_MMX2 @@ -662,7 +662,7 @@ static inline void postProcess(uint8_t src[], int srcStride, uint8_t dst[], int // difference wouldnt be messureable here but its much better because // someone might exchange the cpu whithout restarting mplayer ;) #ifdef RUNTIME_CPUDETECT -#if defined(ARCH_X86) || defined(ARCH_X86_64) +#if defined(ARCH_X86) // ordered per speed fasterst first if(c->cpuCaps & PP_CPU_CAPS_MMX2) postProcess_MMX2(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c);