diff options
| author | Ard Biesheuvel <ard.biesheuvel@gmail.com> | 2012-08-13 22:55:51 +0200 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@gmail.com> | 2012-08-13 22:55:51 +0200 |
| commit | 22e06318d04074d1a7c90caa173857abdcfd153e (patch) | |
| tree | ad3ba6642d9ff8dd6861b5b15b0a43ef2df95756 /media/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S | |
| parent | 9a2c14b2c96625d5be73e1a7627f5d2a3091c4a2 (diff) | |
| download | frameworks_av-22e06318d04074d1a7c90caa173857abdcfd153e.zip frameworks_av-22e06318d04074d1a7c90caa173857abdcfd153e.tar.gz frameworks_av-22e06318d04074d1a7c90caa173857abdcfd153e.tar.bz2 | |
hardening: eliminate text relocations from h264
Change-Id: I8bdf9746f28f2f7bed6c1109c0f4badbab765a7c
Diffstat (limited to 'media/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S')
| -rw-r--r-- | media/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/media/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S b/media/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S index 66520da..8599cab 100644 --- a/media/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S +++ b/media/libstagefright/codecs/on2/h264dec/omxdl/arm_neon/vc/m4p10/src_gcc/armVCM4P10_Interpolate_Chroma_s.S @@ -9,20 +9,18 @@ .arm .fpu neon - .section .rodata + .text .align 4 armVCM4P10_WidthBranchTableMVIsNotZero: - .word WidthIs2MVIsNotZero, WidthIs2MVIsNotZero - .word WidthIs4MVIsNotZero, WidthIs4MVIsNotZero - .word WidthIs8MVIsNotZero + .word WidthIs2MVIsNotZero-(P0+8), WidthIs2MVIsNotZero-(P0+8) + .word WidthIs4MVIsNotZero-(P0+8), WidthIs4MVIsNotZero-(P0+8) + .word WidthIs8MVIsNotZero-(P0+8) armVCM4P10_WidthBranchTableMVIsZero: - .word WidthIs2MVIsZero, WidthIs2MVIsZero - .word WidthIs4MVIsZero, WidthIs4MVIsZero - .word WidthIs8MVIsZero - - .text + .word WidthIs2MVIsZero-(P0+8), WidthIs2MVIsZero-(P0+8) + .word WidthIs4MVIsZero-(P0+8), WidthIs4MVIsZero-(P0+8) + .word WidthIs8MVIsZero-(P0+8) .global armVCM4P10_Interpolate_Chroma .func armVCM4P10_Interpolate_Chroma @@ -35,9 +33,9 @@ armVCM4P10_Interpolate_Chroma: RSB r9,r7,#8 CMN r6,r7 MOV r10,#1 - LDREQ r11, =armVCM4P10_WidthBranchTableMVIsZero + ADREQ r11, armVCM4P10_WidthBranchTableMVIsZero SUB lr,r1,r10 - LDRNE r11, =armVCM4P10_WidthBranchTableMVIsNotZero + ADRNE r11, armVCM4P10_WidthBranchTableMVIsNotZero VLD1.8 {d0},[r0],r10 SMULBB r12,r8,r9 SMULBB r9,r6,r9 @@ -48,7 +46,8 @@ armVCM4P10_Interpolate_Chroma: VDUP.8 d13,r9 VDUP.8 d14,r8 VDUP.8 d15,r6 - LDR pc,[r11,r4,LSL #1] + LDR r11,[r11, r4, lsl #1] +P0: ADD pc,r11 WidthIs8MVIsNotZero: VLD1.8 {d2},[r0],r10 |