diff options
author | Diego Pettenò <flameeyes@gmail.com> | 2008-10-16 17:34:09 +0400 |
---|---|---|
committer | Diego Pettenò <flameeyes@gmail.com> | 2008-10-16 17:34:09 +0400 |
commit | be449fca79a3b0394143f0a77c99784e65868d9f (patch) | |
tree | 5c5b2bbfe648467292b30cc501265e556acab101 /libavcodec/bitstream.h | |
parent | a14b362fc650a5e036d413033d9709a526662d89 (diff) |
Convert asm keyword into __asm__.
Neither the asm() nor the __asm__() keyword is part of the C99
standard, but while GCC accepts the former in C89 syntax, it is not
accepted in C99 unless GNU extensions are turned on (with -fasm). The
latter form is accepted in any syntax as an extension (without
requiring further command-line options).
Sun Studio C99 compiler also does not accept asm() while accepting
__asm__(), albeit reporting warnings that it's not valid C99 syntax.
Originally committed as revision 15627 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/bitstream.h')
-rw-r--r-- | libavcodec/bitstream.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h index 770c1ddd36..5a5db5c9f2 100644 --- a/libavcodec/bitstream.h +++ b/libavcodec/bitstream.h @@ -55,14 +55,14 @@ extern const uint8_t ff_reverse[256]; #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" + __asm__ ("sarl %1, %0\n\t" : "+r" (a) : "ic" ((uint8_t)(-s)) ); return a; } static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ - asm ("shrl %1, %0\n\t" + __asm__ ("shrl %1, %0\n\t" : "+r" (a) : "ic" ((uint8_t)(-s)) ); @@ -248,7 +248,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) { # ifdef ALIGNED_BITSTREAM_WRITER # if defined(ARCH_X86) - asm volatile( + __asm__ volatile( "movl %0, %%ecx \n\t" "xorl %%eax, %%eax \n\t" "shrdl %%cl, %1, %%eax \n\t" @@ -279,7 +279,7 @@ static inline void put_bits(PutBitContext *s, int n, unsigned int value) # endif # else //ALIGNED_BITSTREAM_WRITER # if defined(ARCH_X86) - asm volatile( + __asm__ volatile( "movl $7, %%ecx \n\t" "andl %0, %%ecx \n\t" "addl %3, %%ecx \n\t" @@ -556,7 +556,7 @@ static inline void skip_bits_long(GetBitContext *s, int n){ #if defined(ARCH_X86) # define SKIP_CACHE(name, gb, num)\ - asm(\ + __asm__(\ "shldl %2, %1, %0 \n\t"\ "shll %2, %1 \n\t"\ : "+r" (name##_cache0), "+r" (name##_cache1)\ |