Browse Source
Merge commit '9dde6ab06c48f9447cd16f39bee33569cddb7be4'
* commit '9dde6ab06c48f9447cd16f39bee33569cddb7be4': arm: Fix SIGBUS on ARM when compiled with binutils 2.29 Merged-by: James Almer <jamrial@gmail.com>tags/n4.0
James Almer
8 years ago
1 changed files with 12 additions and 8 deletions
Unified View
Diff Options
+ 12
- 8
libavcodec/arm/h264idct_neon.S
View File
| @@ -21,6 +21,7 @@ | |||||
| #include "libavutil/arm/asm.S" | #include "libavutil/arm/asm.S" | ||||
| function ff_h264_idct_add_neon, export=1 | function ff_h264_idct_add_neon, export=1 | ||||
| h264_idct_add_neon_nothumb: | |||||
| vld1.64 {d0-d3}, [r1,:128] | vld1.64 {d0-d3}, [r1,:128] | ||||
| vmov.i16 q15, #0 | vmov.i16 q15, #0 | ||||
| @@ -73,6 +74,7 @@ function ff_h264_idct_add_neon, export=1 | |||||
| endfunc | endfunc | ||||
| function ff_h264_idct_dc_add_neon, export=1 | function ff_h264_idct_dc_add_neon, export=1 | ||||
| h264_idct_dc_add_neon_nothumb: | |||||
| mov r3, #0 | mov r3, #0 | ||||
| vld1.16 {d2[],d3[]}, [r1,:16] | vld1.16 {d2[],d3[]}, [r1,:16] | ||||
| strh r3, [r1] | strh r3, [r1] | ||||
| @@ -113,8 +115,8 @@ function ff_h264_idct_add16_neon, export=1 | |||||
| movne lr, #0 | movne lr, #0 | ||||
| cmp lr, #0 | cmp lr, #0 | ||||
| ite ne | ite ne | ||||
| adrne lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB | |||||
| adreq lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB | |||||
| adrne lr, h264_idct_dc_add_neon_nothumb + CONFIG_THUMB | |||||
| adreq lr, h264_idct_add_neon_nothumb + CONFIG_THUMB | |||||
| blx lr | blx lr | ||||
| 2: subs ip, ip, #1 | 2: subs ip, ip, #1 | ||||
| add r1, r1, #32 | add r1, r1, #32 | ||||
| @@ -138,8 +140,8 @@ function ff_h264_idct_add16intra_neon, export=1 | |||||
| cmp r8, #0 | cmp r8, #0 | ||||
| ldrsh r8, [r1] | ldrsh r8, [r1] | ||||
| iteet ne | iteet ne | ||||
| adrne lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB | |||||
| adreq lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB | |||||
| adrne lr, h264_idct_add_neon_nothumb + CONFIG_THUMB | |||||
| adreq lr, h264_idct_dc_add_neon_nothumb + CONFIG_THUMB | |||||
| cmpeq r8, #0 | cmpeq r8, #0 | ||||
| blxne lr | blxne lr | ||||
| subs ip, ip, #1 | subs ip, ip, #1 | ||||
| @@ -166,8 +168,8 @@ function ff_h264_idct_add8_neon, export=1 | |||||
| cmp r8, #0 | cmp r8, #0 | ||||
| ldrsh r8, [r1] | ldrsh r8, [r1] | ||||
| iteet ne | iteet ne | ||||
| adrne lr, X(ff_h264_idct_add_neon) + CONFIG_THUMB | |||||
| adreq lr, X(ff_h264_idct_dc_add_neon) + CONFIG_THUMB | |||||
| adrne lr, h264_idct_add_neon_nothumb + CONFIG_THUMB | |||||
| adreq lr, h264_idct_dc_add_neon_nothumb + CONFIG_THUMB | |||||
| cmpeq r8, #0 | cmpeq r8, #0 | ||||
| blxne lr | blxne lr | ||||
| add r12, r12, #1 | add r12, r12, #1 | ||||
| @@ -267,6 +269,7 @@ endfunc | |||||
| .endm | .endm | ||||
| function ff_h264_idct8_add_neon, export=1 | function ff_h264_idct8_add_neon, export=1 | ||||
| h264_idct8_add_neon_nothumb: | |||||
| vmov.i16 q3, #0 | vmov.i16 q3, #0 | ||||
| vld1.16 {q8-q9}, [r1,:128] | vld1.16 {q8-q9}, [r1,:128] | ||||
| vst1.16 {q3}, [r1,:128]! | vst1.16 {q3}, [r1,:128]! | ||||
| @@ -328,6 +331,7 @@ function ff_h264_idct8_add_neon, export=1 | |||||
| endfunc | endfunc | ||||
| function ff_h264_idct8_dc_add_neon, export=1 | function ff_h264_idct8_dc_add_neon, export=1 | ||||
| h264_idct8_dc_add_neon_nothumb: | |||||
| mov r3, #0 | mov r3, #0 | ||||
| vld1.16 {d30[],d31[]},[r1,:16] | vld1.16 {d30[],d31[]},[r1,:16] | ||||
| strh r3, [r1] | strh r3, [r1] | ||||
| @@ -388,8 +392,8 @@ function ff_h264_idct8_add4_neon, export=1 | |||||
| movne lr, #0 | movne lr, #0 | ||||
| cmp lr, #0 | cmp lr, #0 | ||||
| ite ne | ite ne | ||||
| adrne lr, X(ff_h264_idct8_dc_add_neon) + CONFIG_THUMB | |||||
| adreq lr, X(ff_h264_idct8_add_neon) + CONFIG_THUMB | |||||
| adrne lr, h264_idct8_dc_add_neon_nothumb + CONFIG_THUMB | |||||
| adreq lr, h264_idct8_add_neon_nothumb + CONFIG_THUMB | |||||
| blx lr | blx lr | ||||
| 2: subs r12, r12, #4 | 2: subs r12, r12, #4 | ||||
| add r1, r1, #128 | add r1, r1, #128 | ||||