diff options
| author | James Cowgill <james410@cowgill.org.uk> | 2015-03-05 17:40:15 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-06 14:37:44 +0100 |
| commit | 157d6f0d5b95261bf053566d8a1c2652387da30c (patch) | |
| tree | ca481834165a1f3c103eea9dc50fd5e877bbcbde /libavcodec/mips/aacsbr_mips.h | |
| parent | eae13eae9d6499e81cd77bcd9e13f7bcb31b5577 (diff) | |
mips: port optimizations to mips n64
This mainly consists of replacing all the pointer arithmatic 'addiu'
instructions with PTR_ADDIU which will handle the differences in pointer
sizes when compiled on 64 bit mips systems.
The header asmdefs.h contains the PTR_ macros which expend to the correct mips
instructions to manipulate registers containing pointers.
Signed-off-by: James Cowgill <james410@cowgill.org.uk>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mips/aacsbr_mips.h')
| -rw-r--r-- | libavcodec/mips/aacsbr_mips.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/libavcodec/mips/aacsbr_mips.h b/libavcodec/mips/aacsbr_mips.h index 8e6ad7d839..da8389f484 100644 --- a/libavcodec/mips/aacsbr_mips.h +++ b/libavcodec/mips/aacsbr_mips.h @@ -56,6 +56,7 @@ #include "libavcodec/aac.h" #include "libavcodec/sbr.h" +#include "libavutil/mips/asmdefs.h" #if HAVE_INLINE_ASM static void sbr_qmf_analysis_mips(AVFloatDSPContext *fdsp, FFTContext *mdct, @@ -89,8 +90,8 @@ static void sbr_qmf_analysis_mips(AVFloatDSPContext *fdsp, FFTContext *mdct, "sw %[temp5], 20(%[w0]) \n\t" "sw %[temp6], 24(%[w0]) \n\t" "sw %[temp7], 28(%[w0]) \n\t" - "addiu %[w0], %[w0], 32 \n\t" - "addiu %[w1], %[w1], 32 \n\t" + PTR_ADDIU " %[w0], %[w0], 32 \n\t" + PTR_ADDIU " %[w1], %[w1], 32 \n\t" : [w0]"+r"(w0), [w1]"+r"(w1), [temp0]"=&r"(temp0), [temp1]"=&r"(temp1), @@ -124,8 +125,8 @@ static void sbr_qmf_analysis_mips(AVFloatDSPContext *fdsp, FFTContext *mdct, "sw %[temp5], 20(%[w0]) \n\t" "sw %[temp6], 24(%[w0]) \n\t" "sw %[temp7], 28(%[w0]) \n\t" - "addiu %[w0], %[w0], 32 \n\t" - "addiu %[w1], %[w1], 32 \n\t" + PTR_ADDIU " %[w0], %[w0], 32 \n\t" + PTR_ADDIU " %[w1], %[w1], 32 \n\t" : [w0]"+r"(w0), [w1]"+r"(w1), [temp0]"=&r"(temp0), [temp1]"=&r"(temp1), @@ -298,13 +299,13 @@ static void sbr_qmf_synthesis_mips(FFTContext *mdct, "lwc1 %[temp7], 2052(%[s0]) \n\t" "madd.s %[temp0], %[temp0], %[temp12], %[temp13] \n\t" "lwc1 %[temp8], 4104(%[v0]) \n\t" - "addiu %[dst], %[dst], 16 \n\t" + PTR_ADDIU "%[dst], %[dst], 16 \n\t" "madd.s %[temp1], %[temp1], %[temp14], %[temp15] \n\t" "lwc1 %[temp9], 2056(%[s0]) \n\t" - "addiu %[s0], %[s0], 16 \n\t" + PTR_ADDIU " %[s0], %[s0], 16 \n\t" "madd.s %[temp2], %[temp2], %[temp16], %[temp17] \n\t" "lwc1 %[temp10], 4108(%[v0]) \n\t" - "addiu %[v0], %[v0], 16 \n\t" + PTR_ADDIU " %[v0], %[v0], 16 \n\t" "madd.s %[temp3], %[temp3], %[temp18], %[temp19] \n\t" "lwc1 %[temp11], 2044(%[s0]) \n\t" "lwc1 %[temp12], 4848(%[v0]) \n\t" @@ -445,7 +446,7 @@ static void sbr_qmf_synthesis_mips(FFTContext *mdct, "madd.s %[temp3], %[temp3], %[temp10], %[temp11] \n\t" "lwc1 %[temp19], 2316(%[s0]) \n\t" "madd.s %[temp0], %[temp0], %[temp12], %[temp13] \n\t" - "addiu %[dst], %[dst], 16 \n\t" + PTR_ADDIU "%[dst], %[dst], 16 \n\t" "madd.s %[temp1], %[temp1], %[temp14], %[temp15] \n\t" "madd.s %[temp2], %[temp2], %[temp16], %[temp17] \n\t" "madd.s %[temp3], %[temp3], %[temp18], %[temp19] \n\t" |