Merge commit 'da785231ea0b82b5c2526babbb2871c935b21a87'

* commit 'da785231ea0b82b5c2526babbb2871c935b21a87':
  bfin: Refactor duplicated assembly-related macros

Conflicts:
	libavcodec/bfin/hpel_pixels_bfin.S

Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/bfin/fdct_bfin.S

@@ -127,21 +127,16 @@ root:/u/ffmpeg/bhead/libavcodec>
 
 */
 
-#include "config.h"
+#include "libavutil/bfin/asm.h"
-#include "config_bfin.h"
+
+SECTION_L1_DATA_B
 
-#if defined(__FDPIC__) && CONFIG_SRAM
-.section .l1.data.B,"aw",@progbits
-#else
-.data
-#endif
 .align 4;
 dct_coeff:
 .short 0x5a82, 0x2d41, 0x187e, 0x3b21, 0x0c7c, 0x3ec5, 0x238e, 0x3537;
 
-#if defined(__FDPIC__) && CONFIG_SRAM
+SECTION_L1_DATA_A
-.section .l1.data.A,"aw",@progbits
+
-#endif
 .align 4
 vtmp:   .space 128
 

libavcodec/bfin/hpel_pixels_bfin.S

@@ -18,7 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "config_bfin.h"
+
+#include "libavutil/bfin/asm.h"
 
 /*
   motion compensation

libavcodec/bfin/idct_bfin.S

@@ -55,14 +55,9 @@ IDCT BFINidct: 88.3 kdct/s
 
 */
 
-#include "config.h"
+#include "libavutil/bfin/asm.h"
-#include "config_bfin.h"
 
-#if defined(__FDPIC__) && CONFIG_SRAM
+SECTION_L1_DATA_B
-.section .l1.data.B,"aw",@progbits
-#else
-.data
-#endif
 
 .align 4;
 coefs:
@@ -77,9 +72,7 @@ coefs:
 .short 0x18F9;           //cos(7pi/16)
 .short 0x7D8A;           //cos(pi/16)
 
-#if defined(__FDPIC__) && CONFIG_SRAM
+SECTION_L1_DATA_A
-.section .l1.data.A,"aw",@progbits
-#endif
 
 vtmp: .space 256
 

libavcodec/bfin/pixels_bfin.S

@@ -18,7 +18,8 @@
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
-#include "config_bfin.h"
+
+#include "libavutil/bfin/asm.h"
 
 DEFUN(put_pixels_clamped,mL1,
         (int16_t *block, uint8_t *dest, int line_size)):

libavcodec/bfin/vp3_idct_bfin.S

@@ -28,14 +28,9 @@ Registers Used  : A0, A1, R0-R7, I0-I3, B0, B2, B3, M0-M2, L0-L3, P0-P5, LC0.
 
 */
 
-#include "config.h"
+#include "libavutil/bfin/asm.h"
-#include "config_bfin.h"
 
-#if defined(__FDPIC__) && CONFIG_SRAM
+SECTION_L1_DATA_B
-.section .l1.data.B,"aw",@progbits
-#else
-.data
-#endif
 
 .align 4;
 coefs:
@@ -50,9 +45,7 @@ coefs:
 .short 0x18F9;           //cos(7pi/16)
 .short 0x7D8A;           //cos(pi/16)
 
-#if defined(__FDPIC__) && CONFIG_SRAM
+SECTION_L1_DATA_A
-.section .l1.data.A,"aw",@progbits
-#endif
 
 vtmp: .space 256
 

libavutil/bfin/asm.h

@@ -18,32 +18,22 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-/*
+#ifndef AVUTIL_BFIN_ASM_H
- * low level assembler interface wrapper
+#define AVUTIL_BFIN_ASM_H
- *
- * DEFUN(put_pixels_clamped,mL1,
- *      (int16_t *block, uint8_t *dest, int line_size)):
- *
- *    body
- *
- *    rts;
- */
-
-#ifndef AVCODEC_BFIN_CONFIG_BFIN_H
-#define AVCODEC_BFIN_CONFIG_BFIN_H
 
 #include "config.h"
 
-#ifndef DEFUN
-
 #define mL3 .text
-#ifndef mL1
+
 #if defined(__FDPIC__) && CONFIG_SRAM
 #define mL1 .l1.text
+#define SECTION_L1_DATA_A .section .l1.data.A,"aw",@progbits
+#define SECTION_L1_DATA_B .section .l1.data.B,"aw",@progbits
 #else
 #define mL1 mL3
+#define SECTION_L1_DATA_A
+#define SECTION_L1_DATA_B .data
 #endif
-#endif /* mL1 */
 
 #define DEFUN(fname, where, interface)          \
     .section where;                             \
@@ -61,6 +51,4 @@
 #define RELOC(reg, got, obj) reg.L = obj; reg.H = obj
 #endif
 
-#endif /* DEFUN */
+#endif /* AVUTIL_BFIN_ASM_H */
-
-#endif /* AVCODEC_BFIN_CONFIG_BFIN_H */

libswscale/bfin/internal_bfin.S

@@ -93,24 +93,10 @@ huge variation on the reference codes on Blackfin I guess it must have
 to do with the memory system.
 */
 
-#define mL3 .text
+#include "libavutil/bfin/asm.h"
-#if defined(__FDPIC__) && CONFIG_SRAM
+
-#define mL1 .l1.text
-#else
-#define mL1 mL3
-#endif
 #define MEM mL1
 
-#define DEFUN(fname,where,interface) \
-        .section where;              \
-        .global _ff_bfin_ ## fname;  \
-        .type _ff_bfin_ ## fname, STT_FUNC; \
-        .align 8;                    \
-        _ff_bfin_ ## fname
-
-#define DEFUN_END(fname) \
-        .size _ff_bfin_ ## fname, . - _ff_bfin_ ## fname
-
 
 .text