Merge commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 19:20:39 +0000 (21:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Aug 2014 19:20:39 +0000 (21:20 +0200)
* commit '8d27bf1cff35be406b0fd89d832e1852d4c573bc':
  x86: xvid: K&R formatting cosmetics

Conflicts:
libavcodec/x86/xvididct_sse2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/x86/xvididct_mmx.c
libavcodec/x86/xvididct_sse2.c

Simple merge
@@@ -341,53 -342,52 +341,52 @@@ DECLARE_ASM_CONST(16, int32_t, walkenId
      "movdqa   %%xmm6, 4*16("dct")     \n\t" \
      "movdqa   "SREG2", 7*16("dct")    \n\t"
  
 -inline void ff_xvid_idct_sse2(short *block)
 +av_extern_inline void ff_xvid_idct_sse2(short *block)
  {
-     __asm__ volatile(
-     "movq     "MANGLE(m127)", %%mm0                              \n\t"
-     iMTX_MULT("(%0)",     MANGLE(iTab1), ROUND(MANGLE(walkenIdctRounders)),      PUT_EVEN(ROW0))
-     iMTX_MULT("1*16(%0)", MANGLE(iTab2), ROUND("1*16+"MANGLE(walkenIdctRounders)), PUT_ODD(ROW1))
-     iMTX_MULT("2*16(%0)", MANGLE(iTab3), ROUND("2*16+"MANGLE(walkenIdctRounders)), PUT_EVEN(ROW2))
-     TEST_TWO_ROWS("3*16(%0)", "4*16(%0)", "%%eax", "%%ecx", CLEAR_ODD(ROW3), CLEAR_EVEN(ROW4))
-     JZ("%%eax", "1f")
-     iMTX_MULT("3*16(%0)", MANGLE(iTab4), ROUND("3*16+"MANGLE(walkenIdctRounders)), PUT_ODD(ROW3))
-     TEST_TWO_ROWS("5*16(%0)", "6*16(%0)", "%%eax", "%%edx", CLEAR_ODD(ROW5), CLEAR_EVEN(ROW6))
-     TEST_ONE_ROW("7*16(%0)", "%%esi", CLEAR_ODD(ROW7))
-     iLLM_HEAD
-     ".p2align 4 \n\t"
-     JNZ("%%ecx", "2f")
-     JNZ("%%eax", "3f")
-     JNZ("%%edx", "4f")
-     JNZ("%%esi", "5f")
-     iLLM_PASS_SPARSE("%0")
-     "jmp 6f                                                      \n\t"
-     "2:                                                          \n\t"
-     iMTX_MULT("4*16(%0)", MANGLE(iTab1), "#", PUT_EVEN(ROW4))
-     "3:                                                          \n\t"
-     iMTX_MULT("5*16(%0)", MANGLE(iTab4), ROUND("4*16+"MANGLE(walkenIdctRounders)), PUT_ODD(ROW5))
-     JZ("%%edx", "1f")
-     "4:                                                          \n\t"
-     iMTX_MULT("6*16(%0)", MANGLE(iTab3), ROUND("5*16+"MANGLE(walkenIdctRounders)), PUT_EVEN(ROW6))
-     JZ("%%esi", "1f")
-     "5:                                                          \n\t"
-     iMTX_MULT("7*16(%0)", MANGLE(iTab2), ROUND("5*16+"MANGLE(walkenIdctRounders)), PUT_ODD(ROW7))
+     __asm__ volatile (
+         "movq     "MANGLE (m127) ", %%mm0                              \n\t"
 -        iMTX_MULT("(%0)",     MANGLE(iTab1), ROUND(walkenIdctRounders),          PUT_EVEN(ROW0))
 -        iMTX_MULT("1*16(%0)", MANGLE(iTab2), ROUND(walkenIdctRounders + 1 * 16), PUT_ODD(ROW1))
 -        iMTX_MULT("2*16(%0)", MANGLE(iTab3), ROUND(walkenIdctRounders + 2 * 16), PUT_EVEN(ROW2))
++        iMTX_MULT("(%0)",     MANGLE(iTab1), ROUND(MANGLE(walkenIdctRounders)),        PUT_EVEN(ROW0))
++        iMTX_MULT("1*16(%0)", MANGLE(iTab2), ROUND("1*16+"MANGLE(walkenIdctRounders)), PUT_ODD(ROW1))
++        iMTX_MULT("2*16(%0)", MANGLE(iTab3), ROUND("2*16+"MANGLE(walkenIdctRounders)), PUT_EVEN(ROW2))
+         TEST_TWO_ROWS("3*16(%0)", "4*16(%0)", "%%eax", "%%ecx", CLEAR_ODD(ROW3), CLEAR_EVEN(ROW4))
+         JZ("%%eax", "1f")
 -        iMTX_MULT("3*16(%0)", MANGLE(iTab4), ROUND(walkenIdctRounders + 3 * 16), PUT_ODD(ROW3))
++        iMTX_MULT("3*16(%0)", MANGLE(iTab4), ROUND("3*16+"MANGLE(walkenIdctRounders)), PUT_ODD(ROW3))
+         TEST_TWO_ROWS("5*16(%0)", "6*16(%0)", "%%eax", "%%edx", CLEAR_ODD(ROW5), CLEAR_EVEN(ROW6))
+         TEST_ONE_ROW("7*16(%0)", "%%esi", CLEAR_ODD(ROW7))
+         iLLM_HEAD
+         ".p2align 4 \n\t"
+         JNZ("%%ecx", "2f")
+         JNZ("%%eax", "3f")
+         JNZ("%%edx", "4f")
+         JNZ("%%esi", "5f")
+         iLLM_PASS_SPARSE("%0")
+         "jmp 6f                                                      \n\t"
+         "2:                                                          \n\t"
+         iMTX_MULT("4*16(%0)", MANGLE(iTab1), "#", PUT_EVEN(ROW4))
+         "3:                                                          \n\t"
 -        iMTX_MULT("5*16(%0)", MANGLE(iTab4), ROUND(walkenIdctRounders + 4 * 16), PUT_ODD(ROW5))
++        iMTX_MULT("5*16(%0)", MANGLE(iTab4), ROUND("4*16+"MANGLE(walkenIdctRounders)), PUT_ODD(ROW5))
+         JZ("%%edx", "1f")
+         "4:                                                          \n\t"
 -        iMTX_MULT("6*16(%0)", MANGLE(iTab3), ROUND(walkenIdctRounders + 5 * 16), PUT_EVEN(ROW6))
++        iMTX_MULT("6*16(%0)", MANGLE(iTab3), ROUND("5*16+"MANGLE(walkenIdctRounders)), PUT_EVEN(ROW6))
+         JZ("%%esi", "1f")
+         "5:                                                          \n\t"
 -        iMTX_MULT("7*16(%0)", MANGLE(iTab2), ROUND(walkenIdctRounders + 5 * 16), PUT_ODD(ROW7))
++        iMTX_MULT("7*16(%0)", MANGLE(iTab2), ROUND("5*16+"MANGLE(walkenIdctRounders)), PUT_ODD(ROW7))
  #if ARCH_X86_32
-     iLLM_HEAD
+         iLLM_HEAD
  #endif
-     iLLM_PASS("%0")
-     "6:                                                          \n\t"
-     : "+r"(block)
-     : NAMED_CONSTRAINTS_ARRAY(m127,iTab1,walkenIdctRounders,iTab2,iTab3,iTab4,tan3,tan1,tan2,sqrt2)
-     : XMM_CLOBBERS("%xmm0" , "%xmm1" , "%xmm2" , "%xmm3" ,
-                    "%xmm4" , "%xmm5" , "%xmm6" , "%xmm7" ,)
+         iLLM_PASS("%0")
+         "6:                                                          \n\t"
+         : "+r" (block)
 -        :
++        : NAMED_CONSTRAINTS_ARRAY(m127,iTab1,walkenIdctRounders,iTab2,iTab3,iTab4,tan3,tan1,tan2,sqrt2)
+         : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3",
+                        "%xmm4", "%xmm5", "%xmm6", "%xmm7", )
  #if ARCH_X86_64
-       XMM_CLOBBERS("%xmm8" , "%xmm9" , "%xmm10", "%xmm11",
-                    "%xmm12", "%xmm13", "%xmm14",)
+           XMM_CLOBBERS("%xmm8", "%xmm9", "%xmm10", "%xmm11",
+                        "%xmm12", "%xmm13", "%xmm14", )
  #endif
-       "%eax", "%ecx", "%edx", "%esi", "memory"
-     );
+           "%eax", "%ecx", "%edx", "%esi", "memory");
  }
  
  void ff_xvid_idct_sse2_put(uint8_t *dest, int line_size, short *block)