From e313d12c58bd5354fbe197cd85f034db172c4430 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Thu, 21 Jan 2010 12:46:35 +0200 Subject: Style cleanups in fir.h and mmx.h Coding style issues only. No functional change. --- drivers/staging/echo/fir.h | 10 +- drivers/staging/echo/mmx.h | 382 ++++++++++++++++++++++----------------------- 2 files changed, 197 insertions(+), 195 deletions(-) diff --git a/drivers/staging/echo/fir.h b/drivers/staging/echo/fir.h index 092df08..288bffc 100644 --- a/drivers/staging/echo/fir.h +++ b/drivers/staging/echo/fir.h @@ -159,10 +159,11 @@ static inline int16_t fir16(struct fir16_state_t *fir, int16_t sample) fir->history[fir->curr_pos + fir->taps] = sample; mmx_coeffs = (union mmx_t *) fir->coeffs; - mmx_hist = (union mmx_t *) & fir->history[fir->curr_pos]; + mmx_hist = (union mmx_t *) &fir->history[fir->curr_pos]; i = fir->taps; pxor_r2r(mm4, mm4); - /* 8 samples per iteration, so the filter must be a multiple of 8 long. */ + /* 8 samples per iteration, so the filter must be a multiple of + 8 long. */ while (i > 0) { movq_m2r(mmx_coeffs[0], mm0); movq_m2r(mmx_coeffs[1], mm2); @@ -190,10 +191,11 @@ static inline int16_t fir16(struct fir16_state_t *fir, int16_t sample) fir->history[fir->curr_pos + fir->taps] = sample; xmm_coeffs = (union xmm_t *) fir->coeffs; - xmm_hist = (union xmm_t *) & fir->history[fir->curr_pos]; + xmm_hist = (union xmm_t *) &fir->history[fir->curr_pos]; i = fir->taps; pxor_r2r(xmm4, xmm4); - /* 16 samples per iteration, so the filter must be a multiple of 16 long. */ + /* 16 samples per iteration, so the filter must be a multiple of + 16 long. */ while (i > 0) { movdqu_m2r(xmm_coeffs[0], xmm0); movdqu_m2r(xmm_coeffs[1], xmm2); diff --git a/drivers/staging/echo/mmx.h b/drivers/staging/echo/mmx.h index ffbf72b..50e076b 100644 --- a/drivers/staging/echo/mmx.h +++ b/drivers/staging/echo/mmx.h @@ -28,15 +28,15 @@ */ union mmx_t { - long long q; /* Quadword (64-bit) value */ - unsigned long long uq; /* Unsigned Quadword */ - int d[2]; /* 2 Doubleword (32-bit) values */ - unsigned int ud[2]; /* 2 Unsigned Doubleword */ - short w[4]; /* 4 Word (16-bit) values */ - unsigned short uw[4]; /* 4 Unsigned Word */ - char b[8]; /* 8 Byte (8-bit) values */ - unsigned char ub[8]; /* 8 Unsigned Byte */ - float s[2]; /* Single-precision (32-bit) value */ + long long q; /* Quadword (64-bit) value */ + unsigned long long uq; /* Unsigned Quadword */ + int d[2]; /* 2 Doubleword (32-bit) values */ + unsigned int ud[2]; /* 2 Unsigned Doubleword */ + short w[4]; /* 4 Word (16-bit) values */ + unsigned short uw[4]; /* 4 Unsigned Word */ + char b[8]; /* 8 Byte (8-bit) values */ + unsigned char ub[8]; /* 8 Unsigned Byte */ + float s[2]; /* Single-precision (32-bit) value */ }; /* On an 8-byte (64-bit) boundary */ /* SSE registers */ @@ -46,215 +46,215 @@ union xmm_t { #define mmx_i2r(op,imm,reg) \ - __asm__ __volatile__ (#op " %0, %%" #reg \ - : /* nothing */ \ - : "i" (imm) ) + __asm__ __volatile__ (#op " %0, %%" #reg \ + : /* nothing */ \ + : "i" (imm) ) #define mmx_m2r(op,mem,reg) \ - __asm__ __volatile__ (#op " %0, %%" #reg \ - : /* nothing */ \ - : "m" (mem)) + __asm__ __volatile__ (#op " %0, %%" #reg \ + : /* nothing */ \ + : "m" (mem)) #define mmx_r2m(op,reg,mem) \ - __asm__ __volatile__ (#op " %%" #reg ", %0" \ - : "=m" (mem) \ - : /* nothing */ ) + __asm__ __volatile__ (#op " %%" #reg ", %0" \ + : "=m" (mem) \ + : /* nothing */ ) #define mmx_r2r(op,regs,regd) \ - __asm__ __volatile__ (#op " %" #regs ", %" #regd) + __asm__ __volatile__ (#op " %" #regs ", %" #regd) #define emms() __asm__ __volatile__ ("emms") -#define movd_m2r(var,reg) mmx_m2r (movd, var, reg) -#define movd_r2m(reg,var) mmx_r2m (movd, reg, var) -#define movd_r2r(regs,regd) mmx_r2r (movd, regs, regd) - -#define movq_m2r(var,reg) mmx_m2r (movq, var, reg) -#define movq_r2m(reg,var) mmx_r2m (movq, reg, var) -#define movq_r2r(regs,regd) mmx_r2r (movq, regs, regd) - -#define packssdw_m2r(var,reg) mmx_m2r (packssdw, var, reg) -#define packssdw_r2r(regs,regd) mmx_r2r (packssdw, regs, regd) -#define packsswb_m2r(var,reg) mmx_m2r (packsswb, var, reg) -#define packsswb_r2r(regs,regd) mmx_r2r (packsswb, regs, regd) - -#define packuswb_m2r(var,reg) mmx_m2r (packuswb, var, reg) -#define packuswb_r2r(regs,regd) mmx_r2r (packuswb, regs, regd) - -#define paddb_m2r(var,reg) mmx_m2r (paddb, var, reg) -#define paddb_r2r(regs,regd) mmx_r2r (paddb, regs, regd) -#define paddd_m2r(var,reg) mmx_m2r (paddd, var, reg) -#define paddd_r2r(regs,regd) mmx_r2r (paddd, regs, regd) -#define paddw_m2r(var,reg) mmx_m2r (paddw, var, reg) -#define paddw_r2r(regs,regd) mmx_r2r (paddw, regs, regd) - -#define paddsb_m2r(var,reg) mmx_m2r (paddsb, var, reg) -#define paddsb_r2r(regs,regd) mmx_r2r (paddsb, regs, regd) -#define paddsw_m2r(var,reg) mmx_m2r (paddsw, var, reg) -#define paddsw_r2r(regs,regd) mmx_r2r (paddsw, regs, regd) - -#define paddusb_m2r(var,reg) mmx_m2r (paddusb, var, reg) -#define paddusb_r2r(regs,regd) mmx_r2r (paddusb, regs, regd) -#define paddusw_m2r(var,reg) mmx_m2r (paddusw, var, reg) -#define paddusw_r2r(regs,regd) mmx_r2r (paddusw, regs, regd) - -#define pand_m2r(var,reg) mmx_m2r (pand, var, reg) -#define pand_r2r(regs,regd) mmx_r2r (pand, regs, regd) - -#define pandn_m2r(var,reg) mmx_m2r (pandn, var, reg) -#define pandn_r2r(regs,regd) mmx_r2r (pandn, regs, regd) - -#define pcmpeqb_m2r(var,reg) mmx_m2r (pcmpeqb, var, reg) -#define pcmpeqb_r2r(regs,regd) mmx_r2r (pcmpeqb, regs, regd) -#define pcmpeqd_m2r(var,reg) mmx_m2r (pcmpeqd, var, reg) -#define pcmpeqd_r2r(regs,regd) mmx_r2r (pcmpeqd, regs, regd) -#define pcmpeqw_m2r(var,reg) mmx_m2r (pcmpeqw, var, reg) -#define pcmpeqw_r2r(regs,regd) mmx_r2r (pcmpeqw, regs, regd) - -#define pcmpgtb_m2r(var,reg) mmx_m2r (pcmpgtb, var, reg) -#define pcmpgtb_r2r(regs,regd) mmx_r2r (pcmpgtb, regs, regd) -#define pcmpgtd_m2r(var,reg) mmx_m2r (pcmpgtd, var, reg) -#define pcmpgtd_r2r(regs,regd) mmx_r2r (pcmpgtd, regs, regd) -#define pcmpgtw_m2r(var,reg) mmx_m2r (pcmpgtw, var, reg) -#define pcmpgtw_r2r(regs,regd) mmx_r2r (pcmpgtw, regs, regd) - -#define pmaddwd_m2r(var,reg) mmx_m2r (pmaddwd, var, reg) -#define pmaddwd_r2r(regs,regd) mmx_r2r (pmaddwd, regs, regd) - -#define pmulhw_m2r(var,reg) mmx_m2r (pmulhw, var, reg) -#define pmulhw_r2r(regs,regd) mmx_r2r (pmulhw, regs, regd) - -#define pmullw_m2r(var,reg) mmx_m2r (pmullw, var, reg) -#define pmullw_r2r(regs,regd) mmx_r2r (pmullw, regs, regd) - -#define por_m2r(var,reg) mmx_m2r (por, var, reg) -#define por_r2r(regs,regd) mmx_r2r (por, regs, regd) - -#define pslld_i2r(imm,reg) mmx_i2r (pslld, imm, reg) -#define pslld_m2r(var,reg) mmx_m2r (pslld, var, reg) -#define pslld_r2r(regs,regd) mmx_r2r (pslld, regs, regd) -#define psllq_i2r(imm,reg) mmx_i2r (psllq, imm, reg) -#define psllq_m2r(var,reg) mmx_m2r (psllq, var, reg) -#define psllq_r2r(regs,regd) mmx_r2r (psllq, regs, regd) -#define psllw_i2r(imm,reg) mmx_i2r (psllw, imm, reg) -#define psllw_m2r(var,reg) mmx_m2r (psllw, var, reg) -#define psllw_r2r(regs,regd) mmx_r2r (psllw, regs, regd) - -#define psrad_i2r(imm,reg) mmx_i2r (psrad, imm, reg) -#define psrad_m2r(var,reg) mmx_m2r (psrad, var, reg) -#define psrad_r2r(regs,regd) mmx_r2r (psrad, regs, regd) -#define psraw_i2r(imm,reg) mmx_i2r (psraw, imm, reg) -#define psraw_m2r(var,reg) mmx_m2r (psraw, var, reg) -#define psraw_r2r(regs,regd) mmx_r2r (psraw, regs, regd) - -#define psrld_i2r(imm,reg) mmx_i2r (psrld, imm, reg) -#define psrld_m2r(var,reg) mmx_m2r (psrld, var, reg) -#define psrld_r2r(regs,regd) mmx_r2r (psrld, regs, regd) -#define psrlq_i2r(imm,reg) mmx_i2r (psrlq, imm, reg) -#define psrlq_m2r(var,reg) mmx_m2r (psrlq, var, reg) -#define psrlq_r2r(regs,regd) mmx_r2r (psrlq, regs, regd) -#define psrlw_i2r(imm,reg) mmx_i2r (psrlw, imm, reg) -#define psrlw_m2r(var,reg) mmx_m2r (psrlw, var, reg) -#define psrlw_r2r(regs,regd) mmx_r2r (psrlw, regs, regd) - -#define psubb_m2r(var,reg) mmx_m2r (psubb, var, reg) -#define psubb_r2r(regs,regd) mmx_r2r (psubb, regs, regd) -#define psubd_m2r(var,reg) mmx_m2r (psubd, var, reg) -#define psubd_r2r(regs,regd) mmx_r2r (psubd, regs, regd) -#define psubw_m2r(var,reg) mmx_m2r (psubw, var, reg) -#define psubw_r2r(regs,regd) mmx_r2r (psubw, regs, regd) - -#define psubsb_m2r(var,reg) mmx_m2r (psubsb, var, reg) -#define psubsb_r2r(regs,regd) mmx_r2r (psubsb, regs, regd) -#define psubsw_m2r(var,reg) mmx_m2r (psubsw, var, reg) -#define psubsw_r2r(regs,regd) mmx_r2r (psubsw, regs, regd) - -#define psubusb_m2r(var,reg) mmx_m2r (psubusb, var, reg) -#define psubusb_r2r(regs,regd) mmx_r2r (psubusb, regs, regd) -#define psubusw_m2r(var,reg) mmx_m2r (psubusw, var, reg) -#define psubusw_r2r(regs,regd) mmx_r2r (psubusw, regs, regd) - -#define punpckhbw_m2r(var,reg) mmx_m2r (punpckhbw, var, reg) -#define punpckhbw_r2r(regs,regd) mmx_r2r (punpckhbw, regs, regd) -#define punpckhdq_m2r(var,reg) mmx_m2r (punpckhdq, var, reg) -#define punpckhdq_r2r(regs,regd) mmx_r2r (punpckhdq, regs, regd) -#define punpckhwd_m2r(var,reg) mmx_m2r (punpckhwd, var, reg) -#define punpckhwd_r2r(regs,regd) mmx_r2r (punpckhwd, regs, regd) - -#define punpcklbw_m2r(var,reg) mmx_m2r (punpcklbw, var, reg) -#define punpcklbw_r2r(regs,regd) mmx_r2r (punpcklbw, regs, regd) -#define punpckldq_m2r(var,reg) mmx_m2r (punpckldq, var, reg) -#define punpckldq_r2r(regs,regd) mmx_r2r (punpckldq, regs, regd) -#define punpcklwd_m2r(var,reg) mmx_m2r (punpcklwd, var, reg) -#define punpcklwd_r2r(regs,regd) mmx_r2r (punpcklwd, regs, regd) - -#define pxor_m2r(var,reg) mmx_m2r (pxor, var, reg) -#define pxor_r2r(regs,regd) mmx_r2r (pxor, regs, regd) +#define movd_m2r(var,reg) mmx_m2r(movd, var, reg) +#define movd_r2m(reg,var) mmx_r2m(movd, reg, var) +#define movd_r2r(regs,regd) mmx_r2r(movd, regs, regd) + +#define movq_m2r(var,reg) mmx_m2r(movq, var, reg) +#define movq_r2m(reg,var) mmx_r2m(movq, reg, var) +#define movq_r2r(regs,regd) mmx_r2r(movq, regs, regd) + +#define packssdw_m2r(var,reg) mmx_m2r(packssdw, var, reg) +#define packssdw_r2r(regs,regd) mmx_r2r(packssdw, regs, regd) +#define packsswb_m2r(var,reg) mmx_m2r(packsswb, var, reg) +#define packsswb_r2r(regs,regd) mmx_r2r(packsswb, regs, regd) + +#define packuswb_m2r(var,reg) mmx_m2r(packuswb, var, reg) +#define packuswb_r2r(regs,regd) mmx_r2r(packuswb, regs, regd) + +#define paddb_m2r(var,reg) mmx_m2r(paddb, var, reg) +#define paddb_r2r(regs,regd) mmx_r2r(paddb, regs, regd) +#define paddd_m2r(var,reg) mmx_m2r(paddd, var, reg) +#define paddd_r2r(regs,regd) mmx_r2r(paddd, regs, regd) +#define paddw_m2r(var,reg) mmx_m2r(paddw, var, reg) +#define paddw_r2r(regs,regd) mmx_r2r(paddw, regs, regd) + +#define paddsb_m2r(var,reg) mmx_m2r(paddsb, var, reg) +#define paddsb_r2r(regs,regd) mmx_r2r(paddsb, regs, regd) +#define paddsw_m2r(var,reg) mmx_m2r(paddsw, var, reg) +#define paddsw_r2r(regs,regd) mmx_r2r(paddsw, regs, regd) + +#define paddusb_m2r(var,reg) mmx_m2r(paddusb, var, reg) +#define paddusb_r2r(regs,regd) mmx_r2r(paddusb, regs, regd) +#define paddusw_m2r(var,reg) mmx_m2r(paddusw, var, reg) +#define paddusw_r2r(regs,regd) mmx_r2r(paddusw, regs, regd) + +#define pand_m2r(var,reg) mmx_m2r(pand, var, reg) +#define pand_r2r(regs,regd) mmx_r2r(pand, regs, regd) + +#define pandn_m2r(var,reg) mmx_m2r(pandn, var, reg) +#define pandn_r2r(regs,regd) mmx_r2r(pandn, regs, regd) + +#define pcmpeqb_m2r(var,reg) mmx_m2r(pcmpeqb, var, reg) +#define pcmpeqb_r2r(regs,regd) mmx_r2r(pcmpeqb, regs, regd) +#define pcmpeqd_m2r(var,reg) mmx_m2r(pcmpeqd, var, reg) +#define pcmpeqd_r2r(regs,regd) mmx_r2r(pcmpeqd, regs, regd) +#define pcmpeqw_m2r(var,reg) mmx_m2r(pcmpeqw, var, reg) +#define pcmpeqw_r2r(regs,regd) mmx_r2r(pcmpeqw, regs, regd) + +#define pcmpgtb_m2r(var,reg) mmx_m2r(pcmpgtb, var, reg) +#define pcmpgtb_r2r(regs,regd) mmx_r2r(pcmpgtb, regs, regd) +#define pcmpgtd_m2r(var,reg) mmx_m2r(pcmpgtd, var, reg) +#define pcmpgtd_r2r(regs,regd) mmx_r2r(pcmpgtd, regs, regd) +#define pcmpgtw_m2r(var,reg) mmx_m2r(pcmpgtw, var, reg) +#define pcmpgtw_r2r(regs,regd) mmx_r2r(pcmpgtw, regs, regd) + +#define pmaddwd_m2r(var,reg) mmx_m2r(pmaddwd, var, reg) +#define pmaddwd_r2r(regs,regd) mmx_r2r(pmaddwd, regs, regd) + +#define pmulhw_m2r(var,reg) mmx_m2r(pmulhw, var, reg) +#define pmulhw_r2r(regs,regd) mmx_r2r(pmulhw, regs, regd) + +#define pmullw_m2r(var,reg) mmx_m2r(pmullw, var, reg) +#define pmullw_r2r(regs,regd) mmx_r2r(pmullw, regs, regd) + +#define por_m2r(var,reg) mmx_m2r(por, var, reg) +#define por_r2r(regs,regd) mmx_r2r(por, regs, regd) + +#define pslld_i2r(imm,reg) mmx_i2r(pslld, imm, reg) +#define pslld_m2r(var,reg) mmx_m2r(pslld, var, reg) +#define pslld_r2r(regs,regd) mmx_r2r(pslld, regs, regd) +#define psllq_i2r(imm,reg) mmx_i2r(psllq, imm, reg) +#define psllq_m2r(var,reg) mmx_m2r(psllq, var, reg) +#define psllq_r2r(regs,regd) mmx_r2r(psllq, regs, regd) +#define psllw_i2r(imm,reg) mmx_i2r(psllw, imm, reg) +#define psllw_m2r(var,reg) mmx_m2r(psllw, var, reg) +#define psllw_r2r(regs,regd) mmx_r2r(psllw, regs, regd) + +#define psrad_i2r(imm,reg) mmx_i2r(psrad, imm, reg) +#define psrad_m2r(var,reg) mmx_m2r(psrad, var, reg) +#define psrad_r2r(regs,regd) mmx_r2r(psrad, regs, regd) +#define psraw_i2r(imm,reg) mmx_i2r(psraw, imm, reg) +#define psraw_m2r(var,reg) mmx_m2r(psraw, var, reg) +#define psraw_r2r(regs,regd) mmx_r2r(psraw, regs, regd) + +#define psrld_i2r(imm,reg) mmx_i2r(psrld, imm, reg) +#define psrld_m2r(var,reg) mmx_m2r(psrld, var, reg) +#define psrld_r2r(regs,regd) mmx_r2r(psrld, regs, regd) +#define psrlq_i2r(imm,reg) mmx_i2r(psrlq, imm, reg) +#define psrlq_m2r(var,reg) mmx_m2r(psrlq, var, reg) +#define psrlq_r2r(regs,regd) mmx_r2r(psrlq, regs, regd) +#define psrlw_i2r(imm,reg) mmx_i2r(psrlw, imm, reg) +#define psrlw_m2r(var,reg) mmx_m2r(psrlw, var, reg) +#define psrlw_r2r(regs,regd) mmx_r2r(psrlw, regs, regd) + +#define psubb_m2r(var,reg) mmx_m2r(psubb, var, reg) +#define psubb_r2r(regs,regd) mmx_r2r(psubb, regs, regd) +#define psubd_m2r(var,reg) mmx_m2r(psubd, var, reg) +#define psubd_r2r(regs,regd) mmx_r2r(psubd, regs, regd) +#define psubw_m2r(var,reg) mmx_m2r(psubw, var, reg) +#define psubw_r2r(regs,regd) mmx_r2r(psubw, regs, regd) + +#define psubsb_m2r(var,reg) mmx_m2r(psubsb, var, reg) +#define psubsb_r2r(regs,regd) mmx_r2r(psubsb, regs, regd) +#define psubsw_m2r(var,reg) mmx_m2r(psubsw, var, reg) +#define psubsw_r2r(regs,regd) mmx_r2r(psubsw, regs, regd) + +#define psubusb_m2r(var,reg) mmx_m2r(psubusb, var, reg) +#define psubusb_r2r(regs,regd) mmx_r2r(psubusb, regs, regd) +#define psubusw_m2r(var,reg) mmx_m2r(psubusw, var, reg) +#define psubusw_r2r(regs,regd) mmx_r2r(psubusw, regs, regd) + +#define punpckhbw_m2r(var,reg) mmx_m2r(punpckhbw, var, reg) +#define punpckhbw_r2r(regs,regd) mmx_r2r(punpckhbw, regs, regd) +#define punpckhdq_m2r(var,reg) mmx_m2r(punpckhdq, var, reg) +#define punpckhdq_r2r(regs,regd) mmx_r2r(punpckhdq, regs, regd) +#define punpckhwd_m2r(var,reg) mmx_m2r(punpckhwd, var, reg) +#define punpckhwd_r2r(regs,regd) mmx_r2r(punpckhwd, regs, regd) + +#define punpcklbw_m2r(var,reg) mmx_m2r(punpcklbw, var, reg) +#define punpcklbw_r2r(regs,regd) mmx_r2r(punpcklbw, regs, regd) +#define punpckldq_m2r(var,reg) mmx_m2r(punpckldq, var, reg) +#define punpckldq_r2r(regs,regd) mmx_r2r(punpckldq, regs, regd) +#define punpcklwd_m2r(var,reg) mmx_m2r(punpcklwd, var, reg) +#define punpcklwd_r2r(regs,regd) mmx_r2r(punpcklwd, regs, regd) + +#define pxor_m2r(var,reg) mmx_m2r(pxor, var, reg) +#define pxor_r2r(regs,regd) mmx_r2r(pxor, regs, regd) /* 3DNOW extensions */ -#define pavgusb_m2r(var,reg) mmx_m2r (pavgusb, var, reg) -#define pavgusb_r2r(regs,regd) mmx_r2r (pavgusb, regs, regd) +#define pavgusb_m2r(var,reg) mmx_m2r(pavgusb, var, reg) +#define pavgusb_r2r(regs,regd) mmx_r2r(pavgusb, regs, regd) /* AMD MMX extensions - also available in intel SSE */ #define mmx_m2ri(op,mem,reg,imm) \ - __asm__ __volatile__ (#op " %1, %0, %%" #reg \ - : /* nothing */ \ - : "m" (mem), "i" (imm)) + __asm__ __volatile__ (#op " %1, %0, %%" #reg \ + : /* nothing */ \ + : "m" (mem), "i" (imm)) #define mmx_r2ri(op,regs,regd,imm) \ - __asm__ __volatile__ (#op " %0, %%" #regs ", %%" #regd \ - : /* nothing */ \ - : "i" (imm) ) + __asm__ __volatile__ (#op " %0, %%" #regs ", %%" #regd \ + : /* nothing */ \ + : "i" (imm) ) #define mmx_fetch(mem,hint) \ - __asm__ __volatile__ ("prefetch" #hint " %0" \ - : /* nothing */ \ - : "m" (mem)) + __asm__ __volatile__ ("prefetch" #hint " %0" \ + : /* nothing */ \ + : "m" (mem)) -#define maskmovq(regs,maskreg) mmx_r2ri (maskmovq, regs, maskreg) +#define maskmovq(regs,maskreg) mmx_r2ri(maskmovq, regs, maskreg) -#define movntq_r2m(mmreg,var) mmx_r2m (movntq, mmreg, var) +#define movntq_r2m(mmreg,var) mmx_r2m(movntq, mmreg, var) -#define pavgb_m2r(var,reg) mmx_m2r (pavgb, var, reg) -#define pavgb_r2r(regs,regd) mmx_r2r (pavgb, regs, regd) -#define pavgw_m2r(var,reg) mmx_m2r (pavgw, var, reg) -#define pavgw_r2r(regs,regd) mmx_r2r (pavgw, regs, regd) +#define pavgb_m2r(var,reg) mmx_m2r(pavgb, var, reg) +#define pavgb_r2r(regs,regd) mmx_r2r(pavgb, regs, regd) +#define pavgw_m2r(var,reg) mmx_m2r(pavgw, var, reg) +#define pavgw_r2r(regs,regd) mmx_r2r(pavgw, regs, regd) -#define pextrw_r2r(mmreg,reg,imm) mmx_r2ri (pextrw, mmreg, reg, imm) +#define pextrw_r2r(mmreg,reg,imm) mmx_r2ri(pextrw, mmreg, reg, imm) -#define pinsrw_r2r(reg,mmreg,imm) mmx_r2ri (pinsrw, reg, mmreg, imm) +#define pinsrw_r2r(reg,mmreg,imm) mmx_r2ri(pinsrw, reg, mmreg, imm) -#define pmaxsw_m2r(var,reg) mmx_m2r (pmaxsw, var, reg) -#define pmaxsw_r2r(regs,regd) mmx_r2r (pmaxsw, regs, regd) +#define pmaxsw_m2r(var,reg) mmx_m2r(pmaxsw, var, reg) +#define pmaxsw_r2r(regs,regd) mmx_r2r(pmaxsw, regs, regd) -#define pmaxub_m2r(var,reg) mmx_m2r (pmaxub, var, reg) -#define pmaxub_r2r(regs,regd) mmx_r2r (pmaxub, regs, regd) +#define pmaxub_m2r(var,reg) mmx_m2r(pmaxub, var, reg) +#define pmaxub_r2r(regs,regd) mmx_r2r(pmaxub, regs, regd) -#define pminsw_m2r(var,reg) mmx_m2r (pminsw, var, reg) -#define pminsw_r2r(regs,regd) mmx_r2r (pminsw, regs, regd) +#define pminsw_m2r(var,reg) mmx_m2r(pminsw, var, reg) +#define pminsw_r2r(regs,regd) mmx_r2r(pminsw, regs, regd) -#define pminub_m2r(var,reg) mmx_m2r (pminub, var, reg) -#define pminub_r2r(regs,regd) mmx_r2r (pminub, regs, regd) +#define pminub_m2r(var,reg) mmx_m2r(pminub, var, reg) +#define pminub_r2r(regs,regd) mmx_r2r(pminub, regs, regd) #define pmovmskb(mmreg,reg) \ - __asm__ __volatile__ ("movmskps %" #mmreg ", %" #reg) + __asm__ __volatile__ ("movmskps %" #mmreg ", %" #reg) -#define pmulhuw_m2r(var,reg) mmx_m2r (pmulhuw, var, reg) -#define pmulhuw_r2r(regs,regd) mmx_r2r (pmulhuw, regs, regd) +#define pmulhuw_m2r(var,reg) mmx_m2r(pmulhuw, var, reg) +#define pmulhuw_r2r(regs,regd) mmx_r2r(pmulhuw, regs, regd) -#define prefetcht0(mem) mmx_fetch (mem, t0) -#define prefetcht1(mem) mmx_fetch (mem, t1) -#define prefetcht2(mem) mmx_fetch (mem, t2) -#define prefetchnta(mem) mmx_fetch (mem, nta) +#define prefetcht0(mem) mmx_fetch(mem, t0) +#define prefetcht1(mem) mmx_fetch(mem, t1) +#define prefetcht2(mem) mmx_fetch(mem, t2) +#define prefetchnta(mem) mmx_fetch(mem, nta) -#define psadbw_m2r(var,reg) mmx_m2r (psadbw, var, reg) -#define psadbw_r2r(regs,regd) mmx_r2r (psadbw, regs, regd) +#define psadbw_m2r(var,reg) mmx_m2r(psadbw, var, reg) +#define psadbw_r2r(regs,regd) mmx_r2r(psadbw, regs, regd) #define pshufw_m2r(var,reg,imm) mmx_m2ri(pshufw, var, reg, imm) #define pshufw_r2r(regs,regd,imm) mmx_r2ri(pshufw, regs, regd, imm) @@ -269,20 +269,20 @@ union xmm_t { #define pshufd_r2r(regs,regd,imm) mmx_r2ri(pshufd, regs, regd, imm) -#define movdqa_m2r(var,reg) mmx_m2r (movdqa, var, reg) -#define movdqa_r2m(reg,var) mmx_r2m (movdqa, reg, var) -#define movdqa_r2r(regs,regd) mmx_r2r (movdqa, regs, regd) -#define movdqu_m2r(var,reg) mmx_m2r (movdqu, var, reg) -#define movdqu_r2m(reg,var) mmx_r2m (movdqu, reg, var) -#define movdqu_r2r(regs,regd) mmx_r2r (movdqu, regs, regd) +#define movdqa_m2r(var,reg) mmx_m2r(movdqa, var, reg) +#define movdqa_r2m(reg,var) mmx_r2m(movdqa, reg, var) +#define movdqa_r2r(regs,regd) mmx_r2r(movdqa, regs, regd) +#define movdqu_m2r(var,reg) mmx_m2r(movdqu, var, reg) +#define movdqu_r2m(reg,var) mmx_r2m(movdqu, reg, var) +#define movdqu_r2r(regs,regd) mmx_r2r(movdqu, regs, regd) -#define pmullw_r2m(reg,var) mmx_r2m (pmullw, reg, var) +#define pmullw_r2m(reg,var) mmx_r2m(pmullw, reg, var) -#define pslldq_i2r(imm,reg) mmx_i2r (pslldq, imm, reg) -#define psrldq_i2r(imm,reg) mmx_i2r (psrldq, imm, reg) +#define pslldq_i2r(imm,reg) mmx_i2r(pslldq, imm, reg) +#define psrldq_i2r(imm,reg) mmx_i2r(psrldq, imm, reg) -#define punpcklqdq_r2r(regs,regd) mmx_r2r (punpcklqdq, regs, regd) -#define punpckhqdq_r2r(regs,regd) mmx_r2r (punpckhqdq, regs, regd) +#define punpcklqdq_r2r(regs,regd) mmx_r2r(punpcklqdq, regs, regd) +#define punpckhqdq_r2r(regs,regd) mmx_r2r(punpckhqdq, regs, regd) #endif /* AVCODEC_I386MMX_H */ -- cgit v1.2.3