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/bfin | |
| 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/bfin')
| -rw-r--r-- | libavcodec/bfin/dsputil_bfin.c | 2 | ||||
| -rw-r--r-- | libavcodec/bfin/mathops.h | 6 | ||||
| -rw-r--r-- | libavcodec/bfin/mpegvideo_bfin.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/bfin/dsputil_bfin.c b/libavcodec/bfin/dsputil_bfin.c index 4737b15218..ccdb19cec6 100644 --- a/libavcodec/bfin/dsputil_bfin.c +++ b/libavcodec/bfin/dsputil_bfin.c @@ -77,7 +77,7 @@ static void bfin_clear_blocks (DCTELEM *blocks) { // This is just a simple memset. // - asm("P0=192; " + __asm__("P0=192; " "I0=%0; " "R0=0; " "LSETUP(clear_blocks_blkfn_lab,clear_blocks_blkfn_lab)LC0=P0;" diff --git a/libavcodec/bfin/mathops.h b/libavcodec/bfin/mathops.h index 7bdffbc9b1..1dd9338f8b 100644 --- a/libavcodec/bfin/mathops.h +++ b/libavcodec/bfin/mathops.h @@ -24,7 +24,7 @@ #ifdef CONFIG_MPEGAUDIO_HP #define MULH(X,Y) ({ int xxo; \ - asm ( \ + __asm__ ( \ "a1 = %2.L * %1.L (FU);\n\t" \ "a1 = a1 >> 16;\n\t" \ "a1 += %2.H * %1.L (IS,M);\n\t" \ @@ -34,7 +34,7 @@ : "=d" (xxo) : "d" (X), "d" (Y) : "A0","A1"); xxo; }) #else #define MULH(X,Y) ({ int xxo; \ - asm ( \ + __asm__ ( \ "a1 = %2.H * %1.L (IS,M);\n\t" \ "a0 = %1.H * %2.H, a1+= %1.H * %2.L (IS,M);\n\t"\ "a1 = a1 >>> 16;\n\t" \ @@ -44,7 +44,7 @@ /* signed 16x16 -> 32 multiply */ #define MUL16(a, b) ({ int xxo; \ - asm ( \ + __asm__ ( \ "%0 = %1.l*%2.l (is);\n\t" \ : "=W" (xxo) : "d" (a), "d" (b) : "A1"); \ xxo; }) diff --git a/libavcodec/bfin/mpegvideo_bfin.c b/libavcodec/bfin/mpegvideo_bfin.c index 70604c92b5..05743e7f50 100644 --- a/libavcodec/bfin/mpegvideo_bfin.c +++ b/libavcodec/bfin/mpegvideo_bfin.c @@ -88,7 +88,7 @@ static int dct_quantize_bfin (MpegEncContext *s, /* block[i] = level; */ /* } */ - asm volatile + __asm__ volatile ("i2=%1;\n\t" "r1=[%1++]; \n\t" "r0=r1>>>15 (v); \n\t" @@ -114,7 +114,7 @@ static int dct_quantize_bfin (MpegEncContext *s, PROF("zzscan",5); - asm volatile + __asm__ volatile ("r0=b[%1--] (x); \n\t" "lsetup (0f,1f) lc0=%3; \n\t" /* for(i=63; i>=start_i; i--) { */ "0: p0=r0; \n\t" /* j = scantable[i]; */ |