Commit d13effb0 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '7e18a727'

* commit '7e18a727':
  arm: cosmetics: Consistently use lowercase for shift operators
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents cd4497d8 7e18a727
......@@ -338,7 +338,7 @@ T orr AC0, AC0, AC1
.endm
.macro switch_on_fir_taps mask_minus1, shift_0, shift_8, iir_taps
A ldr pc, [pc, a3, LSL #2] // firorder is in range 0-(8-iir_taps)
A ldr pc, [pc, a3, lsl #2] // firorder is in range 0-(8-iir_taps)
T tbh [pc, a3, lsl #1]
0:
A .word 0, 70f, 71f, 72f, 73f, 74f
......@@ -379,7 +379,7 @@ T .hword (78f - 0b) / 2
.endm
.macro switch_on_iir_taps mask_minus1, shift_0, shift_8
A ldr pc, [pc, a4, LSL #2] // irorder is in range 0-4
A ldr pc, [pc, a4, lsl #2] // irorder is in range 0-4
T tbh [pc, a4, lsl #1]
0:
A .word 0, 60f, 61f, 62f, 63f, 64f
......
......@@ -124,7 +124,7 @@ function ff_synth_filter_float_vfp, export=1
push {r3-r7,lr}
vpush {s16-s31}
ldr lr, [P_SB_OFF]
add a2, ORIG_P_SB, lr, LSL #2 @ calculate synth_buf to pass to imdct_half
add a2, ORIG_P_SB, lr, lsl #2 @ calculate synth_buf to pass to imdct_half
mov P_SB, a2 @ and keep a copy for ourselves
bic J_WRAP, lr, #63 @ mangled to make testing for wrap easier in inner loop
sub lr, lr, #32
......
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