Commit 8445673d authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Martin Storsjo

Upstream commit "hardening: eliminate text relocations from amrwb"

Change-Id: I47235fc4afe6b916da1e999401fb3c8b12c94e62

Adapted from upstream commit 74bc3e133bd59a65dbed70b5fc89549f04a545e2.
parent bbe8cb99
......@@ -43,7 +43,9 @@ Filt_6k_7k_asm:
MOV r2, #30 @ L_FIR - 1
BL voAWB_Copy @ memcpy(x, mem, (L_FIR - 1)<<1)
LDR r10, Lable1 @ get fir_7k address
ADR r3, Lable1 @ get fir_7k address
LDR r10, [r3]
ADD r10, r3
MOV r14, #0
MOV r3, r8 @ change myMemCopy to Copy, due to Copy will change r3 content
......@@ -178,7 +180,7 @@ Filt_6k_7k_end:
LDMFD r13!, {r4 - r12, r15}
Lable1:
.word voAWB_fir_6k_7k
.word voAWB_fir_6k_7k-Lable1
@ENDFUNC
.END
......
......@@ -49,7 +49,9 @@ Filt_6k_7k_asm:
LDR r10, Lable1 @ get fir_7k address
ADR r3, Lable1 @ get fir_7k address
LDR r10, [r3]
ADD r10, r3
MOV r3, r8 @ change myMemCopy to Copy, due to Copy will change r3 content
ADD r6, r13, #60 @ get x[L_FIR - 1] address
MOV r7, r3 @ get signal[i]
......@@ -221,7 +223,7 @@ Filt_6k_7k_end:
LDMFD r13!, {r0 - r12, r15}
Lable1:
.word voAWB_fir_6k_7k
.word voAWB_fir_6k_7k-Lable1
@ENDFUNC
.END
......
......@@ -40,7 +40,9 @@ pred_lt4_asm:
ADDLT r2, r2, #4 @ frac += UP_SAMP
SUBLT r4, r4, #2 @ x--
LDR r11, Lable1
ADR r8, Lable1
LDR r11, [r8]
ADD r11, r8
RSB r2, r2, #3 @ k = UP_SAMP - 1 - frac
MOV r8, #0 @ j = 0
ADD r11, r11, r2, LSL #6 @ get inter4_2[k][]
......@@ -94,7 +96,7 @@ pred_lt4_end:
LDMFD r13!, {r4 - r12, r15}
Lable1:
.word voAWB_inter4_2
.word voAWB_inter4_2-Lable1
@ENDFUNC
.END
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment