diff options
| author | Måns Rullgård <mans@mansr.com> | 2008-10-27 00:25:09 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2008-10-27 00:25:09 +0000 |
| commit | c130bedc99346d644f71ff52b0c762c9bf8d38ec (patch) | |
| tree | 7b7325347f537eed2b52d7c3ef26d6ea41cd8aff /libavcodec/armv4l/simple_idct_armv5te.S | |
| parent | c72ab301888952c317030f631c70a16ec83d800f (diff) | |
| download | ffmpeg-c130bedc99346d644f71ff52b0c762c9bf8d38ec.tar.gz | |
ARM: use new macros for assembler function labels
Originally committed as revision 15725 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/armv4l/simple_idct_armv5te.S')
| -rw-r--r-- | libavcodec/armv4l/simple_idct_armv5te.S | 40 |
1 files changed, 9 insertions, 31 deletions
diff --git a/libavcodec/armv4l/simple_idct_armv5te.S b/libavcodec/armv4l/simple_idct_armv5te.S index 8add331272..58040ec1ba 100644 --- a/libavcodec/armv4l/simple_idct_armv5te.S +++ b/libavcodec/armv4l/simple_idct_armv5te.S @@ -21,6 +21,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "asm.S" + #define W1 22725 /* cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 */ #define W2 21407 /* cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 */ #define W3 19266 /* cos(i*M_PI/16)*sqrt(2)*(1<<14) + 0.5 */ @@ -41,10 +43,7 @@ w13: .long W13 w26: .long W26 w57: .long W57 - .align - .type idct_row_armv5te, %function - .func idct_row_armv5te -idct_row_armv5te: +function idct_row_armv5te str lr, [sp, #-4]! ldrd v1, [a1, #8] @@ -262,10 +261,7 @@ row_dc_only: sub fp, fp, a4 .endm - .align - .type idct_col_armv5te, %function - .func idct_col_armv5te -idct_col_armv5te: +function idct_col_armv5te str lr, [sp, #-4]! idct_col @@ -337,10 +333,7 @@ idct_col_armv5te: ldr pc, [sp], #4 .endfunc - .align - .type idct_col_put_armv5te, %function - .func idct_col_put_armv5te -idct_col_put_armv5te: +function idct_col_put_armv5te str lr, [sp, #-4]! idct_col @@ -457,10 +450,7 @@ idct_col_put_armv5te: ldr pc, [sp], #4 .endfunc - .align - .type idct_col_add_armv5te, %function - .func idct_col_add_armv5te -idct_col_add_armv5te: +function idct_col_add_armv5te str lr, [sp, #-4]! idct_col @@ -610,11 +600,7 @@ idct_col_add_armv5te: ldr pc, [sp], #4 .endfunc - .align - .global simple_idct_armv5te - .type simple_idct_armv5te, %function - .func simple_idct_armv5te -simple_idct_armv5te: +function simple_idct_armv5te, export=1 stmfd sp!, {v1, v2, v3, v4, v5, v6, v7, fp, lr} bl idct_row_armv5te @@ -646,11 +632,7 @@ simple_idct_armv5te: ldmfd sp!, {v1, v2, v3, v4, v5, v6, v7, fp, pc} .endfunc - .align - .global simple_idct_add_armv5te - .type simple_idct_add_armv5te, %function - .func simple_idct_add_armv5te -simple_idct_add_armv5te: +function simple_idct_add_armv5te, export=1 stmfd sp!, {a1, a2, v1, v2, v3, v4, v5, v6, v7, fp, lr} mov a1, a3 @@ -685,11 +667,7 @@ simple_idct_add_armv5te: ldmfd sp!, {v1, v2, v3, v4, v5, v6, v7, fp, pc} .endfunc - .align - .global simple_idct_put_armv5te - .type simple_idct_put_armv5te, %function - .func simple_idct_put_armv5te -simple_idct_put_armv5te: +function simple_idct_put_armv5te, export=1 stmfd sp!, {a1, a2, v1, v2, v3, v4, v5, v6, v7, fp, lr} mov a1, a3 |