[MPlayer-cvslog] r26005 - in trunk/libvo: aclib_template.c osd_template.c

[uau]

Author: uau
Date: Fri Feb 15 22:52:34 2008
New Revision: 26005

Log:
libvo: change asm syntax to use ASMALIGN and " # nop"

Change ".balign 16\n\t" to ASMALIGN(4) and "/nop" to " # nop". The new
version is what other code in MPlayer uses, and works with old
assembler versions like that used on OS X.


Modified:
   trunk/libvo/aclib_template.c
   trunk/libvo/osd_template.c

Modified: trunk/libvo/aclib_template.c
==============================================================================
--- trunk/libvo/aclib_template.c	(original)
+++ trunk/libvo/aclib_template.c	Fri Feb 15 22:52:34 2008
@@ -109,7 +109,7 @@ __asm__ __volatile__(\
 #elif defined ( HAVE_3DNOW )
 #define PREFETCH  "prefetch"
 #else
-#define PREFETCH "/nop"
+#define PREFETCH " # nop"
 #endif
 
 /* On K6 femms is faster of emms. On K7 femms is directly mapped on emms. */
@@ -258,7 +258,7 @@ static void * RENAME(fast_memcpy)(void *
 	if(i>=BLOCK_SIZE/64)
 		asm volatile(
 			"xor %%"REG_a", %%"REG_a"	\n\t"
-			".balign 16		\n\t"
+			ASMALIGN(4)
 			"1:			\n\t"
 				"movl (%0, %%"REG_a"), %%ebx 	\n\t"
 				"movl 32(%0, %%"REG_a"), %%ebx 	\n\t"
@@ -270,7 +270,7 @@ static void * RENAME(fast_memcpy)(void *
 
 			"xor %%"REG_a", %%"REG_a"	\n\t"
 
-				".balign 16		\n\t"
+				ASMALIGN(4)
 				"2:			\n\t"
 				"movq (%0, %%"REG_a"), %%mm0\n"
 				"movq 8(%0, %%"REG_a"), %%mm1\n"

Modified: trunk/libvo/osd_template.c
==============================================================================
--- trunk/libvo/osd_template.c	(original)
+++ trunk/libvo/osd_template.c	Fri Feb 15 22:52:34 2008
@@ -16,8 +16,8 @@
 #define PREFETCHW "prefetcht0"
 #define PAVGB	  "pavgb"
 #else
-#define PREFETCH "/nop"
-#define PREFETCHW "/nop"
+#define PREFETCH " # nop"
+#define PREFETCHW " # nop"
 #endif
 
 #ifdef HAVE_3DNOW