From da785231ea0b82b5c2526babbb2871c935b21a87 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 22 Jan 2014 05:21:02 -0800 Subject: [PATCH] bfin: Refactor duplicated assembly-related macros --- libavcodec/bfin/fdct_bfin.S | 17 ++++------- libavcodec/bfin/hpel_pixels_bfin.S | 2 +- libavcodec/bfin/idct_bfin.S | 13 ++------- libavcodec/bfin/pixels_bfin.S | 3 +- libavcodec/bfin/vp3_idct_bfin.S | 13 ++------- .../config_bfin.h => libavutil/bfin/asm.h | 28 ++++++------------- libswscale/bfin/internal_bfin.S | 18 ++---------- 7 files changed, 25 insertions(+), 69 deletions(-) rename libavcodec/bfin/config_bfin.h => libavutil/bfin/asm.h (80%) diff --git a/libavcodec/bfin/fdct_bfin.S b/libavcodec/bfin/fdct_bfin.S index c923d760e7..2525e0dd18 100644 --- a/libavcodec/bfin/fdct_bfin.S +++ b/libavcodec/bfin/fdct_bfin.S @@ -125,21 +125,16 @@ DCT BFINfdct: err_inf=2 err2=0.16425938 syserr=0.00795000 maxout=2098 blockSumEr DCT BFINfdct: 92.1 kdct/s */ -#include "config.h" -#include "config_bfin.h" - -#if defined(__FDPIC__) && CONFIG_SRAM -.section .l1.data.B,"aw",@progbits -#else -.data -#endif +#include "libavutil/bfin/asm.h" + +SECTION_L1_DATA_B + .align 4; dct_coeff: .short 0x5a82, 0x2d41, 0x187e, 0x3b21, 0x0c7c, 0x3ec5, 0x238e, 0x3537; -#if defined(__FDPIC__) && CONFIG_SRAM -.section .l1.data.A,"aw",@progbits -#endif +SECTION_L1_DATA_A + .align 4 vtmp: .space 128 diff --git a/libavcodec/bfin/hpel_pixels_bfin.S b/libavcodec/bfin/hpel_pixels_bfin.S index 8bed5c0410..d311fdfe5b 100644 --- a/libavcodec/bfin/hpel_pixels_bfin.S +++ b/libavcodec/bfin/hpel_pixels_bfin.S @@ -19,7 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "config_bfin.h" +#include "libavutil/bfin/asm.h" /* motion compensation diff --git a/libavcodec/bfin/idct_bfin.S b/libavcodec/bfin/idct_bfin.S index 0eeffc2016..dd427e7ffa 100644 --- a/libavcodec/bfin/idct_bfin.S +++ b/libavcodec/bfin/idct_bfin.S @@ -55,14 +55,9 @@ IDCT BFINidct: 88.3 kdct/s */ -#include "config.h" -#include "config_bfin.h" +#include "libavutil/bfin/asm.h" -#if defined(__FDPIC__) && CONFIG_SRAM -.section .l1.data.B,"aw",@progbits -#else -.data -#endif +SECTION_L1_DATA_B .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,"aw",@progbits -#endif +SECTION_L1_DATA_A vtmp: .space 256 diff --git a/libavcodec/bfin/pixels_bfin.S b/libavcodec/bfin/pixels_bfin.S index 70d9de5e7a..e19455b974 100644 --- a/libavcodec/bfin/pixels_bfin.S +++ b/libavcodec/bfin/pixels_bfin.S @@ -18,7 +18,8 @@ * License along with Libav; 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)): diff --git a/libavcodec/bfin/vp3_idct_bfin.S b/libavcodec/bfin/vp3_idct_bfin.S index fec8d78f53..615cae9cc9 100644 --- a/libavcodec/bfin/vp3_idct_bfin.S +++ b/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 "config_bfin.h" +#include "libavutil/bfin/asm.h" -#if defined(__FDPIC__) && CONFIG_SRAM -.section .l1.data.B,"aw",@progbits -#else -.data -#endif +SECTION_L1_DATA_B .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,"aw",@progbits -#endif +SECTION_L1_DATA_A vtmp: .space 256 diff --git a/libavcodec/bfin/config_bfin.h b/libavutil/bfin/asm.h similarity index 80% rename from libavcodec/bfin/config_bfin.h rename to libavutil/bfin/asm.h index 63f9e3224c..6bfa0f3860 100644 --- a/libavcodec/bfin/config_bfin.h +++ b/libavutil/bfin/asm.h @@ -18,32 +18,22 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* - * low level assembler interface wrapper - * - * 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 +#ifndef AVUTIL_BFIN_ASM_H +#define AVUTIL_BFIN_ASM_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 /* AVCODEC_BFIN_CONFIG_BFIN_H */ +#endif /* AVUTIL_BFIN_ASM_H */ diff --git a/libswscale/bfin/internal_bfin.S b/libswscale/bfin/internal_bfin.S index b007f07f53..dca8448a3f 100644 --- a/libswscale/bfin/internal_bfin.S +++ b/libswscale/bfin/internal_bfin.S @@ -93,23 +93,9 @@ huge variation on the reference codes on Blackfin I guess it must have to do with the memory system. */ -#define mL3 .text -#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 +#include "libavutil/bfin/asm.h" -#define DEFUN_END(fname) \ - .size _ff_bfin_ ## fname, . - _ff_bfin_ ## fname +#define MEM mL1 .text