From 9a688754461ebfc91769b5d3c8ba5aba9fe1f376 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Wed, 23 Jun 2010 10:01:39 -0700 Subject: 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 --- Tremolo/bitwiseARM.s | 4 ++-- 1 file 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 -- cgit v1.1