| commit | 845097c460f780f65c63b4e3e5ec3de03f23bc66 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 02 11:44:26 2010 -0700 |
| committer | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 02 11:44:26 2010 -0700 |
| tree | 787958b87033fd0296c554c7c149a1527b3a3cf2 | |
| parent | 9a688754461ebfc91769b5d3c8ba5aba9fe1f376 [diff] | |
| parent | 97a3b7c33088e22bbf6cd494c5a014081a4a6d87 [diff] |
merge from open-source master Change-Id: Ib04e99f47b43622005a7fe9c635008b2d91a9a8a
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 @@ 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 @@ 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