diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-13 00:21:14 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-08-13 00:21:14 +0000 |
commit | b89020afc81892ed27f2ad3da5f0dd1169621bdd (patch) | |
tree | 4cb57d6b412576aeb210a5fc23e845d6e0233cc1 /libmpcodecs | |
parent | 992379a376a9df9aa5b2e28a13b3a1c97568dd8b (diff) | |
download | mpv-b89020afc81892ed27f2ad3da5f0dd1169621bdd.tar.bz2 mpv-b89020afc81892ed27f2ad3da5f0dd1169621bdd.tar.xz |
Replace asmalign.h hack by ASMALIGN cpp macros from config.h.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19378 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/vf_decimate.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vf_divtc.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vf_eq.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vf_eq2.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vf_fspp.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vf_halfpack.c | 3 | ||||
-rw-r--r-- | libmpcodecs/vf_ilpack.c | 7 | ||||
-rw-r--r-- | libmpcodecs/vf_ivtc.c | 7 | ||||
-rw-r--r-- | libmpcodecs/vf_noise.c | 7 |
9 files changed, 15 insertions, 24 deletions
diff --git a/libmpcodecs/vf_decimate.c b/libmpcodecs/vf_decimate.c index 03c05a4af5..614af13e46 100644 --- a/libmpcodecs/vf_decimate.c +++ b/libmpcodecs/vf_decimate.c @@ -5,7 +5,6 @@ #include "config.h" #include "mp_msg.h" #include "cpudetect.h" -#include "asmalign.h" #include "img_format.h" #include "mp_image.h" @@ -29,7 +28,7 @@ static int diff_MMX(unsigned char *old, unsigned char *new, int os, int ns) "pxor %%mm4, %%mm4 \n\t" "pxor %%mm7, %%mm7 \n\t" - ASMALIGN16 + ASMALIGN(4) "1: \n\t" "movq (%%"REG_S"), %%mm0 \n\t" diff --git a/libmpcodecs/vf_divtc.c b/libmpcodecs/vf_divtc.c index 2efd7a33be..2b0b4e6377 100644 --- a/libmpcodecs/vf_divtc.c +++ b/libmpcodecs/vf_divtc.c @@ -8,7 +8,6 @@ #include "mp_msg.h" #include "cpudetect.h" #include "bswap.h" -#include "asmalign.h" #include "img_format.h" #include "mp_image.h" @@ -42,7 +41,7 @@ static int diff_MMX(unsigned char *old, unsigned char *new, int os, int ns) "pxor %%mm4, %%mm4 \n\t" "pxor %%mm7, %%mm7 \n\t" - ASMALIGN16 + ASMALIGN(4) "1: \n\t" "movq (%%"REG_S"), %%mm0 \n\t" diff --git a/libmpcodecs/vf_eq.c b/libmpcodecs/vf_eq.c index ae05aede7c..571244f6f4 100644 --- a/libmpcodecs/vf_eq.c +++ b/libmpcodecs/vf_eq.c @@ -6,7 +6,6 @@ #include "config.h" #include "mp_msg.h" #include "cpudetect.h" -#include "asmalign.h" #include "img_format.h" #include "mp_image.h" @@ -51,7 +50,7 @@ static void process_MMX(unsigned char *dest, int dstride, unsigned char *src, in "movq (%6), %%mm4 \n\t" "pxor %%mm0, %%mm0 \n\t" "movl %4, %%eax\n\t" - ASMALIGN16 + ASMALIGN(4) "1: \n\t" "movq (%0), %%mm1 \n\t" "movq (%0), %%mm2 \n\t" diff --git a/libmpcodecs/vf_eq2.c b/libmpcodecs/vf_eq2.c index faac982f75..e4be137582 100644 --- a/libmpcodecs/vf_eq2.c +++ b/libmpcodecs/vf_eq2.c @@ -18,7 +18,6 @@ #include "config.h" #include "mp_msg.h" #include "cpudetect.h" -#include "asmalign.h" #include "img_format.h" #include "mp_image.h" @@ -136,7 +135,7 @@ void affine_1d_MMX (eq2_param_t *par, unsigned char *dst, unsigned char *src, "movq (%6), %%mm4 \n\t" "pxor %%mm0, %%mm0 \n\t" "movl %4, %%eax\n\t" - ASMALIGN16 + ASMALIGN(4) "1: \n\t" "movq (%0), %%mm1 \n\t" "movq (%0), %%mm2 \n\t" diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c index fc475630a2..89b63ad701 100644 --- a/libmpcodecs/vf_fspp.c +++ b/libmpcodecs/vf_fspp.c @@ -37,7 +37,6 @@ #include <math.h> #include "config.h" -#include "asmalign.h" #include "mp_msg.h" #include "cpudetect.h" @@ -884,7 +883,7 @@ static void column_fidct_c(int16_t* thr_adr, DCTELEM *data, DCTELEM *output, int static void column_fidct_mmx(int16_t* thr_adr, DCTELEM *data, DCTELEM *output, int cnt) { asm volatile( - ASMALIGN16 + ASMALIGN(4) "1: \n\t" "movq "DCTSIZE_S"*0*2(%%"REG_S"), %%mm1 \n\t" // diff --git a/libmpcodecs/vf_halfpack.c b/libmpcodecs/vf_halfpack.c index 67da7959fd..12acb89839 100644 --- a/libmpcodecs/vf_halfpack.c +++ b/libmpcodecs/vf_halfpack.c @@ -6,7 +6,6 @@ #include "config.h" #include "mp_msg.h" #include "cpudetect.h" -#include "asmalign.h" #include "img_format.h" #include "mp_image.h" @@ -41,7 +40,7 @@ static void halfpack_MMX(unsigned char *dst, unsigned char *src[3], for (h/=2; h; h--) { asm ( "pxor %%mm0, %%mm0 \n\t" - ASMALIGN16 + ASMALIGN(4) "1: \n\t" "movq (%0), %%mm1 \n\t" "movq (%0), %%mm2 \n\t" diff --git a/libmpcodecs/vf_ilpack.c b/libmpcodecs/vf_ilpack.c index 3123f9226a..f039a17548 100644 --- a/libmpcodecs/vf_ilpack.c +++ b/libmpcodecs/vf_ilpack.c @@ -6,7 +6,6 @@ #include "config.h" #include "mp_msg.h" #include "cpudetect.h" -#include "asmalign.h" #include "img_format.h" #include "mp_image.h" @@ -66,7 +65,7 @@ static void pack_nn_MMX(unsigned char *dst, unsigned char *y, { int j; asm volatile ("" - ASMALIGN16 + ASMALIGN(4) "1: \n\t" "movq (%0), %%mm1 \n\t" "movq (%0), %%mm2 \n\t" @@ -105,7 +104,7 @@ static void pack_li_0_MMX(unsigned char *dst, unsigned char *y, #endif "pxor %%mm0, %%mm0 \n\t" - ASMALIGN16 + ASMALIGN(4) ".Lli0: \n\t" "movq (%%"REG_S"), %%mm1 \n\t" "movq (%%"REG_S"), %%mm2 \n\t" @@ -213,7 +212,7 @@ static void pack_li_1_MMX(unsigned char *dst, unsigned char *y, #endif "pxor %%mm0, %%mm0 \n\t" - ASMALIGN16 + ASMALIGN(4) ".Lli1: \n\t" "movq (%%"REG_S"), %%mm1 \n\t" "movq (%%"REG_S"), %%mm2 \n\t" diff --git a/libmpcodecs/vf_ivtc.c b/libmpcodecs/vf_ivtc.c index 50cabe0ee1..9c30a02477 100644 --- a/libmpcodecs/vf_ivtc.c +++ b/libmpcodecs/vf_ivtc.c @@ -5,7 +5,6 @@ #include "config.h" #include "mp_msg.h" #include "cpudetect.h" -#include "asmalign.h" #include "img_format.h" #include "mp_image.h" @@ -68,7 +67,7 @@ static void block_diffs_MMX(struct metrics *m, unsigned char *old, unsigned char "pxor %%mm5, %%mm5 \n\t" // 4 odd difference sums "pxor %%mm7, %%mm7 \n\t" // all zeros - ASMALIGN16 + ASMALIGN(4) "1: \n\t" // Even difference @@ -128,7 +127,7 @@ static void block_diffs_MMX(struct metrics *m, unsigned char *old, unsigned char "pxor %%mm5, %%mm5 \n\t" // Temporal noise "pxor %%mm6, %%mm6 \n\t" // Current spacial noise - ASMALIGN16 + ASMALIGN(4) "2: \n\t" "movq (%%"REG_S"), %%mm0 \n\t" @@ -182,7 +181,7 @@ static void block_diffs_MMX(struct metrics *m, unsigned char *old, unsigned char "pxor %%mm5, %%mm5 \n\t" "pxor %%mm6, %%mm6 \n\t" - ASMALIGN16 + ASMALIGN(4) "3: \n\t" "movq (%%"REG_S"), %%mm0 \n\t" diff --git a/libmpcodecs/vf_noise.c b/libmpcodecs/vf_noise.c index 33c344ec06..d430ef3281 100644 --- a/libmpcodecs/vf_noise.c +++ b/libmpcodecs/vf_noise.c @@ -25,7 +25,6 @@ #include "config.h" #include "mp_msg.h" #include "cpudetect.h" -#include "asmalign.h" #ifdef HAVE_MALLOC_H #include <malloc.h> @@ -154,7 +153,7 @@ static inline void lineNoise_MMX(uint8_t *dst, uint8_t *src, int8_t *noise, int "pcmpeqb %%mm7, %%mm7 \n\t" "psllw $15, %%mm7 \n\t" "packsswb %%mm7, %%mm7 \n\t" - ASMALIGN16 + ASMALIGN(4) "1: \n\t" "movq (%0, %%"REG_a"), %%mm0 \n\t" "movq (%1, %%"REG_a"), %%mm1 \n\t" @@ -183,7 +182,7 @@ static inline void lineNoise_MMX2(uint8_t *dst, uint8_t *src, int8_t *noise, int "pcmpeqb %%mm7, %%mm7 \n\t" "psllw $15, %%mm7 \n\t" "packsswb %%mm7, %%mm7 \n\t" - ASMALIGN16 + ASMALIGN(4) "1: \n\t" "movq (%0, %%"REG_a"), %%mm0 \n\t" "movq (%1, %%"REG_a"), %%mm1 \n\t" @@ -221,7 +220,7 @@ static inline void lineNoiseAvg_MMX(uint8_t *dst, uint8_t *src, int len, int8_t asm volatile( "mov %5, %%"REG_a" \n\t" - ASMALIGN16 + ASMALIGN(4) "1: \n\t" "movq (%1, %%"REG_a"), %%mm1 \n\t" "movq (%0, %%"REG_a"), %%mm0 \n\t" |