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

2 files changed, 22 insertions, 22 deletions

diff --git a/liba52/imdct_3dnow.h b/liba52/imdct_3dnow.h
index 4a54fde26e..2291158950 100644
--- a/liba52/imdct_3dnow.h
+++ b/liba52/imdct_3dnow.h
@@ -45,7 +45,7 @@ static void FFT_4_3DNOW(complex_t *x)
   /* delta_p = 1 here */
   /* x[k] = sum_{i=0..3} x[i] * w^{i*k}, w=e^{-2*pi/4} 
    */
-  __asm__ __volatile__(
+  __asm__ volatile(
 	"movq	24(%1), %%mm3\n\t"
 	"movq	8(%1), %%mm1\n\t"
 	"pxor	%2, %%mm3\n\t" /* mm3.re | -mm3.im */
@@ -90,7 +90,7 @@ static void FFT_8_3DNOW(complex_t *x)
    */
   complex_t wT1, wB1, wB2;
   
-  __asm__ __volatile__(
+  __asm__ volatile(
 	"movq	8(%2), %%mm0\n\t"
 	"movq	24(%2), %%mm1\n\t"
 	"movq	%%mm0, %0\n\t"  /* wT1 = x[1]; */
@@ -99,7 +99,7 @@ static void FFT_8_3DNOW(complex_t *x)
 	:"r"(x)
 	:"memory");
 
-  __asm__ __volatile__(
+  __asm__ volatile(
 	"movq	16(%0), %%mm2\n\t"
 	"movq	32(%0), %%mm3\n\t"
 	"movq	%%mm2, 8(%0)\n\t"  /* x[1] = x[2]; */
@@ -114,7 +114,7 @@ static void FFT_8_3DNOW(complex_t *x)
   
   /* x[0] x[4] x[2] x[6] */
   
-  __asm__ __volatile__(
+  __asm__ volatile(
       "movq	40(%1), %%mm0\n\t"
       "movq	%%mm0,	%%mm3\n\t"
       "movq	56(%1),	%%mm1\n\t"
@@ -153,7 +153,7 @@ static void FFT_8_3DNOW(complex_t *x)
       :"memory");
   
   /* x[1] x[5] */
-  __asm__ __volatile__ (
+  __asm__ volatile (
 	"movq	%6,	%%mm6\n\t"
 	"movq	%5,	%%mm7\n\t"
 	"movq	%1,	%%mm0\n\t"
@@ -203,7 +203,7 @@ static void FFT_8_3DNOW(complex_t *x)
 
 
   /* x[3] x[7] */
-  __asm__ __volatile__(
+  __asm__ volatile(
 	"movq	%1,	%%mm0\n\t"
 #ifdef HAVE_3DNOWEX
 	"pswapd	%3,	%%mm1\n\t"
@@ -358,13 +358,13 @@ imdct_do_512_3dnow
 	
     /* Pre IFFT complex multiply plus IFFT cmplx conjugate & reordering*/
 #if 1
-      __asm__ __volatile__ (
+      __asm__ volatile (
 	"movq %0, %%mm7\n\t"
 	::"m"(x_plus_minus_3dnow)
 	:"memory");
 	for( i=0; i < 128; i++) {
 		int j = pm128[i];
-	__asm__ __volatile__ (
+	__asm__ volatile (
 		"movd	%1, %%mm0\n\t"
 		"movd	%3, %%mm1\n\t"
 		"punpckldq %2, %%mm0\n\t" /* mm0 = data[256-2*j-1] | data[2*j]*/
@@ -394,7 +394,7 @@ imdct_do_512_3dnow
 		buf[i].im = (data[256-2*j-1] * xsin1[j] + data[2*j] * xcos1[j])*(-1.0);*/
 	}
 #else
-  __asm__ __volatile__ ("femms":::"memory");
+  __asm__ volatile ("femms":::"memory");
     for( i=0; i < 128; i++) {
 	/* z[i] = (X[256-2*i-1] + j * X[2*i]) * (xcos1[i] + j * xsin1[i]) ; */ 
 	int j= pm128[i];
@@ -435,14 +435,14 @@ imdct_do_512_3dnow
     
     /* Post IFFT complex multiply  plus IFFT complex conjugate*/
 #if 1  
-  __asm__ __volatile__ (
+  __asm__ volatile (
 	"movq %0, %%mm7\n\t"
 	"movq %1, %%mm6\n\t"
 	::"m"(x_plus_minus_3dnow),
 	"m"(x_minus_plus_3dnow)
 	:"eax","memory");
 	for (i=0; i < 128; i++) {
-	    __asm__ __volatile__ (
+	    __asm__ volatile (
 		"movq %1, %%mm0\n\t" /* ac3_buf[i].re | ac3_buf[i].im */
 		"movq %%mm0, %%mm1\n\t" /* ac3_buf[i].re | ac3_buf[i].im */
 #ifndef HAVE_3DNOWEX
@@ -473,7 +473,7 @@ imdct_do_512_3dnow
 		ac3_buf[i].im =(tmp_a_r * ac3_xsin1[i])  -  (tmp_a_i  * ac3_xcos1[i]);*/
 	}
 #else    
-  __asm__ __volatile__ ("femms":::"memory");
+  __asm__ volatile ("femms":::"memory");
     for( i=0; i < 128; i++) {
 	/* y[n] = z[n] * (xcos1[n] + j * xsin1[n]) ; */
 	tmp_a_r =        buf[i].real;
@@ -496,7 +496,7 @@ imdct_do_512_3dnow
 	);
 	for (i=0; i< 64; i++) {
 /* merge two loops in one to enable working of 2 decoders */
-	__asm__ __volatile__ (
+	__asm__ volatile (
 		"movd	516(%1), %%mm0\n\t"
 		"movd	(%1), %%mm1\n\t" /**data_ptr++=-buf[64+i].im**window_ptr+++*delay_ptr++;*/
 		"punpckldq (%2), %%mm0\n\t"/*data_ptr[128]=-buf[i].re*window_ptr[128]+delay_ptr[128];*/
@@ -520,7 +520,7 @@ imdct_do_512_3dnow
 	}
 	window_ptr += 128;
 #else    
-  __asm__ __volatile__ ("femms":::"memory");
+  __asm__ volatile ("femms":::"memory");
     for(i=0; i< 64; i++) { 
 	*data_ptr++   = -buf[64+i].imag   * *window_ptr++ + *delay_ptr++ + bias; 
 	*data_ptr++   =  buf[64-i-1].real * *window_ptr++ + *delay_ptr++ + bias; 
@@ -538,7 +538,7 @@ imdct_do_512_3dnow
 	for(i=0; i< 64; i++) {
 /* merge two loops in one to enable working of 2 decoders */
 	    window_ptr -=2;
-	    __asm__ __volatile__(
+	    __asm__ volatile(
 		"movd	508(%1), %%mm0\n\t"
 		"movd	(%1), %%mm1\n\t"
 		"punpckldq (%2), %%mm0\n\t"
@@ -565,9 +565,9 @@ imdct_do_512_3dnow
 		:"memory");
 		delay_ptr += 2;
 	}
-  __asm__ __volatile__ ("femms":::"memory");
+  __asm__ volatile ("femms":::"memory");
 #else    
-  __asm__ __volatile__ ("femms":::"memory");
+  __asm__ volatile ("femms":::"memory");
     for(i=0; i< 64; i++) { 
 	*delay_ptr++  = -buf[64+i].real   * *--window_ptr; 
 	*delay_ptr++  =  buf[64-i-1].imag * *--window_ptr; 
diff --git a/liba52/srfftp_3dnow.h b/liba52/srfftp_3dnow.h
index c5e6dd1c24..9f26c59b43 100644
--- a/liba52/srfftp_3dnow.h
+++ b/liba52/srfftp_3dnow.h
@@ -39,7 +39,7 @@ typedef struct
 }i_cmplx_t;
 
 #define TRANS_FILL_MM6_MM7_3DNOW()\
-    __asm__ __volatile__(\
+    __asm__ volatile(\
 	"movq	%1, %%mm7\n\t"\
 	"movq	%0, %%mm6\n\t"\
 	::"m"(x_plus_minus_3dnow),\
@@ -66,7 +66,7 @@ typedef struct
 
 #define TRANSZERO_3DNOW(A0,A4,A8,A12) \
 { \
-    __asm__ __volatile__(\
+    __asm__ volatile(\
 	"movq	%4, %%mm0\n\t" /* mm0 = wTB[0]*/\
 	"movq	%5, %%mm1\n\t" /* mm1 = wTB[k*2]*/ \
 	"movq	%%mm0, %%mm5\n\t"/*u.re = wTB[0].re + wTB[k*2].re;*/\
@@ -95,7 +95,7 @@ typedef struct
 
 #define TRANSHALF_16_3DNOW(A2,A6,A10,A14)\
 {\
-    __asm__ __volatile__(\
+    __asm__ volatile(\
 	"movq	%4, %%mm0\n\t"/*u.re = wTB[2].im + wTB[2].re;*/\
 	"movq	%%mm0, %%mm1\n\t"\
 	"pxor	%%mm7, %%mm1\n\t"\
@@ -136,7 +136,7 @@ typedef struct
 
 #define TRANS_3DNOW(A1,A5,A9,A13,WT,WB,D,D3)\
 { \
-    __asm__ __volatile__(\
+    __asm__ volatile(\
 	"movq	%1,	%%mm4\n\t"\
 	"movq	%%mm4,	%%mm5\n\t"\
 	"punpckldq %%mm4, %%mm4\n\t"/*mm4 = D.re | D.re */\
@@ -166,7 +166,7 @@ typedef struct
 	:\
 	:"m"(WT), "m"(D), "m"(WB), "m"(D3)\
 	:"memory");\
-    __asm__ __volatile__(\
+    __asm__ volatile(\
 	"movq	%4, %%mm0\n\t"/* a1 = A1*/\
 	"movq	%5, %%mm2\n\t"/* a1 = A5*/\
 	"movq	%%mm0, %%mm1\n\t"\