Browse Source

Blackfin: use SRAM only when CONFIG_SRAM is set

Originally committed as revision 21565 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.6
Måns Rullgård 15 years ago
parent
commit
d132d50fb8
5 changed files with 13 additions and 8 deletions
  1. +3
    -1
      libavcodec/bfin/config_bfin.h
  2. +1
    -1
      libavcodec/bfin/dsputil_bfin.h
  3. +3
    -2
      libavcodec/bfin/fdct_bfin.S
  4. +3
    -2
      libavcodec/bfin/idct_bfin.S
  5. +3
    -2
      libavcodec/bfin/vp3_idct_bfin.S

+ 3
- 1
libavcodec/bfin/config_bfin.h View File

@@ -31,11 +31,13 @@ DEFUN(put_pixels_clamped,mL1,
#ifndef AVCODEC_BFIN_CONFIG_BFIN_H
#define AVCODEC_BFIN_CONFIG_BFIN_H

#include "config.h"

#ifndef DEFUN

#define mL3 .text
#ifndef mL1
#ifdef __FDPIC__
#if defined(__FDPIC__) && CONFIG_SRAM
#define mL1 .l1.text
#else
#define mL1 mL3


+ 1
- 1
libavcodec/bfin/dsputil_bfin.h View File

@@ -24,7 +24,7 @@
#ifndef AVCODEC_BFIN_DSPUTIL_BFIN_H
#define AVCODEC_BFIN_DSPUTIL_BFIN_H

#ifdef __FDPIC__
#if defined(__FDPIC__) && CONFIG_SRAM
#define attribute_l1_text __attribute__ ((l1_text))
#define attribute_l1_data_b __attribute__((l1_data_B))
#else


+ 3
- 2
libavcodec/bfin/fdct_bfin.S View File

@@ -127,9 +127,10 @@ root:/u/ffmpeg/bhead/libavcodec>

*/

#include "config.h"
#include "config_bfin.h"

#ifdef __FDPIC__
#if defined(__FDPIC__) && CONFIG_SRAM
.section .l1.data.B,"aw",@progbits
#else
.data
@@ -138,7 +139,7 @@ root:/u/ffmpeg/bhead/libavcodec>
dct_coeff:
.short 0x5a82, 0x2d41, 0x187e, 0x3b21, 0x0c7c, 0x3ec5, 0x238e, 0x3537;

#ifdef __FDPIC__
#if defined(__FDPIC__) && CONFIG_SRAM
.section .l1.data.A,"aw",@progbits
#endif
.align 4


+ 3
- 2
libavcodec/bfin/idct_bfin.S View File

@@ -55,9 +55,10 @@ IDCT BFINidct: 88.3 kdct/s

*/

#include "config.h"
#include "config_bfin.h"

#ifdef __FDPIC__
#if defined(__FDPIC__) && CONFIG_SRAM
.section .l1.data.B,"aw",@progbits
#else
.data
@@ -76,7 +77,7 @@ coefs:
.short 0x18F9; //cos(7pi/16)
.short 0x7D8A; //cos(pi/16)

#ifdef __FDPIC__
#if defined(__FDPIC__) && CONFIG_SRAM
.section .l1.data.A,"aw",@progbits
#endif



+ 3
- 2
libavcodec/bfin/vp3_idct_bfin.S View File

@@ -28,9 +28,10 @@ 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"

#ifdef __FDPIC__
#if defined(__FDPIC__) && CONFIG_SRAM
.section .l1.data.B,"aw",@progbits
#else
.data
@@ -49,7 +50,7 @@ coefs:
.short 0x18F9; //cos(7pi/16)
.short 0x7D8A; //cos(pi/16)

#ifdef __FDPIC__
#if defined(__FDPIC__) && CONFIG_SRAM
.section .l1.data.A
#endif



Loading…
Cancel
Save