aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-06-23 10:01:39 -0700
committerAndreas Huber <andih@google.com>2010-06-23 10:01:39 -0700
commit9a688754461ebfc91769b5d3c8ba5aba9fe1f376 (patch)
tree50c7c8d0fce3e8bb4ee244ad5bbb340e287ea2e9
parent1a7ca64dd19ab9a5af3c4c3c58c815f764877bf7 (diff)
downloadexternal_tremolo-9a688754461ebfc91769b5d3c8ba5aba9fe1f376.zip
external_tremolo-9a688754461ebfc91769b5d3c8ba5aba9fe1f376.tar.gz
external_tremolo-9a688754461ebfc91769b5d3c8ba5aba9fe1f376.tar.bz2
Make sure this assembly fragment properly supports ARM/THUMB transitions by using the BX, LR instruction instead of antiquated MOV PC, LR.
Change-Id: Ia58b53bf50ccbc471ef001044b18a019631a4df0 related-to-bug: 2774193
-rw-r--r--Tremolo/bitwiseARM.s4
1 files changed, 2 insertions, 2 deletions
diff --git a/Tremolo/bitwiseARM.s b/Tremolo/bitwiseARM.s
index b7c72f1..5805977 100644
--- a/Tremolo/bitwiseARM.s
+++ b/Tremolo/bitwiseARM.s
@@ -169,7 +169,7 @@ oggpack_adv:
ADDLE r12,r12,#32
ADDLE r3,r3,#4
STMIA r0,{r2,r3,r12}
- MOV PC,R14
+ BX LR
adv_slow:
STMFD r13!,{r10,r14}
@@ -227,7 +227,7 @@ oggpack_readinit:
RSB r3,r3,#32 @ r3 = BitsInWord
STMIA r0,{r1,r2,r3}
STR r12,[r0,#20]
- MOV PC,R14
+ BX LR
oggpack_read:
@ r0 = oggpack_buffer *b