diff options
| author | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-15 21:52:34 +0000 |
|---|---|---|
| committer | uau <uau@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-02-15 21:52:34 +0000 |
| commit | 1a3fb6c21e277d6c8aefb78e31efcf197b75bdb8 (patch) | |
| tree | af967691ade9c4db7cc48375f3a317e14704b60a /libvo | |
| parent | 24a3faf378488ca40ec8c371eb3977472c9bb29b (diff) | |
| download | mpv-1a3fb6c21e277d6c8aefb78e31efcf197b75bdb8.tar.bz2 mpv-1a3fb6c21e277d6c8aefb78e31efcf197b75bdb8.tar.xz | |
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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26005 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/aclib_template.c | 6 | ||||
| -rw-r--r-- | libvo/osd_template.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libvo/aclib_template.c b/libvo/aclib_template.c index 9ee3c6dfb6..ac08aab3f9 100644 --- a/libvo/aclib_template.c +++ b/libvo/aclib_template.c @@ -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 * to, const void * from, size_t len) 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 * to, const void * from, size_t len) "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" diff --git a/libvo/osd_template.c b/libvo/osd_template.c index 39a682fc5b..45a318b745 100644 --- a/libvo/osd_template.c +++ b/libvo/osd_template.c @@ -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 |