diff options
| author | Diego Pettenò <flameeyes@gmail.com> | 2008-10-16 13:34:09 +0000 |
|---|---|---|
| committer | Diego Pettenò <flameeyes@gmail.com> | 2008-10-16 13:34:09 +0000 |
| commit | be449fca79a3b0394143f0a77c99784e65868d9f (patch) | |
| tree | 5c5b2bbfe648467292b30cc501265e556acab101 /libavcodec/armv4l/dsputil_iwmmxt.c | |
| parent | a14b362fc650a5e036d413033d9709a526662d89 (diff) | |
| download | ffmpeg-be449fca79a3b0394143f0a77c99784e65868d9f.tar.gz | |
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/armv4l/dsputil_iwmmxt.c')
| -rw-r--r-- | libavcodec/armv4l/dsputil_iwmmxt.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/armv4l/dsputil_iwmmxt.c b/libavcodec/armv4l/dsputil_iwmmxt.c index 6d824e2a14..5699e38578 100644 --- a/libavcodec/armv4l/dsputil_iwmmxt.c +++ b/libavcodec/armv4l/dsputil_iwmmxt.c @@ -22,7 +22,7 @@ #include "libavcodec/dsputil.h" #define DEF(x, y) x ## _no_rnd_ ## y ##_iwmmxt -#define SET_RND(regd) asm volatile ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12"); +#define SET_RND(regd) __asm__ volatile ("mov r12, #1 \n\t tbcsth " #regd ", r12":::"r12"); #define WAVG2B "wavg2b" #include "dsputil_iwmmxt_rnd.h" #undef DEF @@ -30,7 +30,7 @@ #undef WAVG2B #define DEF(x, y) x ## _ ## y ##_iwmmxt -#define SET_RND(regd) asm volatile ("mov r12, #2 \n\t tbcsth " #regd ", r12":::"r12"); +#define SET_RND(regd) __asm__ volatile ("mov r12, #2 \n\t tbcsth " #regd ", r12":::"r12"); #define WAVG2B "wavg2br" #include "dsputil_iwmmxt_rnd.h" #undef DEF @@ -39,7 +39,7 @@ // need scheduling #define OP(AVG) \ - asm volatile ( \ + __asm__ volatile ( \ /* alignment */ \ "and r12, %[pixels], #7 \n\t" \ "bic %[pixels], %[pixels], #7 \n\t" \ @@ -89,7 +89,7 @@ void add_pixels_clamped_iwmmxt(const DCTELEM *block, uint8_t *pixels, int line_s { uint8_t *pixels2 = pixels + line_size; - asm volatile ( + __asm__ volatile ( "mov r12, #4 \n\t" "1: \n\t" "pld [%[pixels], %[line_size2]] \n\t" @@ -125,7 +125,7 @@ void add_pixels_clamped_iwmmxt(const DCTELEM *block, uint8_t *pixels, int line_s static void clear_blocks_iwmmxt(DCTELEM *blocks) { - asm volatile( + __asm__ volatile( "wzero wr0 \n\t" "mov r1, #(128 * 6 / 32) \n\t" "1: \n\t" |