summaryrefslogtreecommitdiffstats
path: root/mp3lib
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-16 20:17:56 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-10-16 20:17:56 +0000
commit26b29f4f2d4284fb81647a00b81530f280881303 (patch)
tree2ab0a30362d6cdf878efc039236befa860e28ae3 /mp3lib
parent2195547220674940ef20e9ea38bb3610541d04b3 (diff)
downloadmpv-26b29f4f2d4284fb81647a00b81530f280881303.tar.bz2
mpv-26b29f4f2d4284fb81647a00b81530f280881303.tar.xz
Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'.
We were using an inconsistent mix of the three variants and 'volatile' should be the most correct and portable variant. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27791 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mp3lib')
-rw-r--r--mp3lib/dct36_3dnow.c2
-rw-r--r--mp3lib/dct64_3dnow.c2
-rw-r--r--mp3lib/dct64_k7.c2
-rw-r--r--mp3lib/dct64_mmx.c2
-rw-r--r--mp3lib/decode_i586.c2
-rw-r--r--mp3lib/decode_mmx.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/mp3lib/dct36_3dnow.c b/mp3lib/dct36_3dnow.c
index 66c9f7b148..02d23975b4 100644
--- a/mp3lib/dct36_3dnow.c
+++ b/mp3lib/dct36_3dnow.c
@@ -39,7 +39,7 @@ void dct36_3dnow(real *inbuf, real *o1,
real *o2, real *wintab, real *tsbuf)
#endif
{
- __asm__ __volatile__(
+ __asm__ volatile(
"movq (%%eax),%%mm0\n\t"
"movq 4(%%eax),%%mm1\n\t"
"pfadd %%mm1,%%mm0\n\t"
diff --git a/mp3lib/dct64_3dnow.c b/mp3lib/dct64_3dnow.c
index 8df9295119..919771a91d 100644
--- a/mp3lib/dct64_3dnow.c
+++ b/mp3lib/dct64_3dnow.c
@@ -18,7 +18,7 @@ static float attribute_used plus_1f = 1.0;
void dct64_MMX_3dnow(short *a,short *b,real *c)
{
char tmp[256];
- __asm__ __volatile(
+ __asm__ volatile(
" movl %2,%%eax\n\t"
" leal 128+%3,%%edx\n\t"
diff --git a/mp3lib/dct64_k7.c b/mp3lib/dct64_k7.c
index 058028ebd1..2d79d7a621 100644
--- a/mp3lib/dct64_k7.c
+++ b/mp3lib/dct64_k7.c
@@ -18,7 +18,7 @@ static float attribute_used plus_1f = 1.0;
void dct64_MMX_3dnowex(short *a,short *b,real *c)
{
char tmp[256];
- __asm__ __volatile(
+ __asm__ volatile(
" movl %2,%%eax\n\t"
" leal 128+%3,%%edx\n\t"
diff --git a/mp3lib/dct64_mmx.c b/mp3lib/dct64_mmx.c
index 317dbb0549..4cce96bd7d 100644
--- a/mp3lib/dct64_mmx.c
+++ b/mp3lib/dct64_mmx.c
@@ -9,7 +9,7 @@
void dct64_MMX(short *a,short *b,real *c)
{
char tmp[256];
- __asm__ __volatile(
+ __asm__ volatile(
" movl %2,%%eax\n\t"
/* Phase 1*/
" flds (%%eax)\n\t"
diff --git a/mp3lib/decode_i586.c b/mp3lib/decode_i586.c
index 9ca1aeb360..8d005735d3 100644
--- a/mp3lib/decode_i586.c
+++ b/mp3lib/decode_i586.c
@@ -41,7 +41,7 @@ int synth_1to1_pent(real *bandPtr, int channel, short *samples)
{
real tmp[3];
register int retval;
- __asm__ __volatile(
+ __asm__ volatile(
" movl %%ebp,"MANGLE(saved_ebp)"\n\t"
" movl %1,%%eax\n\t"/*bandPtr*/
" movl %3,%%esi\n\t"
diff --git a/mp3lib/decode_mmx.c b/mp3lib/decode_mmx.c
index 1d4e3caba9..55dc6a9081 100644
--- a/mp3lib/decode_mmx.c
+++ b/mp3lib/decode_mmx.c
@@ -217,7 +217,7 @@ int synth_1to1_MMX(real *bandPtr, int channel, short *samples)
dct64_MMX_func(a, b, bandPtr);
window = mp3lib_decwins + 16 - bo1;
//printf("DEBUG: channel %d, bo %d, off %d\n", channel, bo, 16 - bo1);
-__asm__ __volatile(
+__asm__ volatile(
ASMALIGN(4)
".L03:\n\t"
"movq (%1),%%mm0\n\t"