diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:56:25 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 01:56:25 +0100 |
commit | 3141b04c7fd46ca09acbc4a7b4d89788df273dd7 (patch) | |
tree | abcef65d35b4384b8a96bfed45c0c5552c802069 /libavcodec/bfin | |
parent | 91a61c4c156dcc4d5a8ac579b6b5dd310deeaefe (diff) | |
parent | da785231ea0b82b5c2526babbb2871c935b21a87 (diff) |
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>
Diffstat (limited to 'libavcodec/bfin')
-rw-r--r-- | libavcodec/bfin/config_bfin.h | 66 | ||||
-rw-r--r-- | libavcodec/bfin/fdct_bfin.S | 17 | ||||
-rw-r--r-- | libavcodec/bfin/hpel_pixels_bfin.S | 3 | ||||
-rw-r--r-- | libavcodec/bfin/idct_bfin.S | 13 | ||||
-rw-r--r-- | libavcodec/bfin/pixels_bfin.S | 3 | ||||
-rw-r--r-- | libavcodec/bfin/vp3_idct_bfin.S | 13 |
6 files changed, 16 insertions, 99 deletions
diff --git a/libavcodec/bfin/config_bfin.h b/libavcodec/bfin/config_bfin.h deleted file mode 100644 index 682fc1d89d..0000000000 --- a/libavcodec/bfin/config_bfin.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2007 Marc Hoffman <marc.hoffman@analog.com> - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * 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 - -#include "config.h" - -#ifndef DEFUN - -#define mL3 .text -#ifndef mL1 -#if defined(__FDPIC__) && CONFIG_SRAM -#define mL1 .l1.text -#else -#define mL1 mL3 -#endif -#endif /* 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 - -#ifdef __FDPIC__ -#define RELOC(reg, got, obj) reg = [got + obj@GOT17M4] -#else -#define RELOC(reg, got, obj) reg.L = obj; reg.H = obj -#endif - -#endif /* DEFUN */ - -#endif /* AVCODEC_BFIN_CONFIG_BFIN_H */ diff --git a/libavcodec/bfin/fdct_bfin.S b/libavcodec/bfin/fdct_bfin.S index 916957467c..1b839aafb2 100644 --- a/libavcodec/bfin/fdct_bfin.S +++ b/libavcodec/bfin/fdct_bfin.S @@ -127,21 +127,16 @@ root:/u/ffmpeg/bhead/libavcodec> */ -#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 32607941dd..c6b9190a4e 100644 --- a/libavcodec/bfin/hpel_pixels_bfin.S +++ b/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 diff --git a/libavcodec/bfin/idct_bfin.S b/libavcodec/bfin/idct_bfin.S index bd80447bde..0ae3f5ac37 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 2c84deb83f..25bdac2520 100644 --- a/libavcodec/bfin/pixels_bfin.S +++ b/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)): diff --git a/libavcodec/bfin/vp3_idct_bfin.S b/libavcodec/bfin/vp3_idct_bfin.S index 5d88801f95..216926c104 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 |