diff options
| author | Nick Kralevich <nnk@google.com> | 2012-10-19 08:40:01 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-19 08:40:02 -0700 |
| commit | 1baa01a52f24566c134313fade8b19a582654638 (patch) | |
| tree | ad4e9a13850e36024ac27f7a86034efae8eef98c /media/libstagefright/codecs | |
| parent | 6a2d62c1a972da25de53b1718c165f2b7df85a0e (diff) | |
| parent | c40e9b86092e67f245ba8f05244f578b26e49fe2 (diff) | |
| download | frameworks_av-1baa01a52f24566c134313fade8b19a582654638.zip frameworks_av-1baa01a52f24566c134313fade8b19a582654638.tar.gz frameworks_av-1baa01a52f24566c134313fade8b19a582654638.tar.bz2 | |
Merge "hardening: eliminate more .text relocations"
Diffstat (limited to 'media/libstagefright/codecs')
| -rw-r--r-- | media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s index e0b338d..ac2dd13 100644 --- a/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s +++ b/media/libstagefright/codecs/amrwbenc/src/asm/ARMV5E/pred_lt4_1_opt.s @@ -44,7 +44,9 @@ pred_lt4_asm: SUBLT r5, r5, #2 @x-- SUB r5, r5, #30 @x -= 15 RSB r4, r2, #3 @k = 3 - frac - LDR r6, Table + ADRL r8, Table + LDR r6, [r8] + ADD r6, r8 MOV r8, r4, LSL #6 @MOV r7, #0 @j = 0 ADD r8, r6, r8 @ptr2 = &(inter4_2[k][0]) @@ -451,7 +453,7 @@ pred_lt4_end: LDMFD r13!, {r4 - r12, r15} Table: - .word inter4_2 + .word inter4_2-Table @ENDFUNC .END |