From 86429dbf1eca8ee0e08176997f508647c3abf6bd Mon Sep 17 00:00:00 2001 From: Chris Chua Date: Sun, 19 Mar 2023 06:22:08 +1100 Subject: Using ARM Unified Assembler Language Change-Id: Iae32a8ba8eff6087330e458fafc912a12fee4509 --- lib/rbcodec/dsp/dsp_arm.S | 6 +++--- lib/rbcodec/dsp/dsp_arm_v6.S | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'lib/rbcodec/dsp') diff --git a/lib/rbcodec/dsp/dsp_arm.S b/lib/rbcodec/dsp/dsp_arm.S index 16394b8690..864abee4b6 100644 --- a/lib/rbcodec/dsp/dsp_arm.S +++ b/lib/rbcodec/dsp/dsp_arm.S @@ -323,7 +323,7 @@ resample_hermite: add r6, r6, r0, lsl #2 @ r6 = &s[pos] cmp r0, #3 @ pos >= 3? history not needed - ldmgedb r6, { r1-r3 } @ x3..x1 = s[pos-3]..s[pos-1] + ldmdbge r6, { r1-r3 } @ x3..x1 = s[pos-3]..s[pos-1] bge .hrs_loadhist_done @ add r10, r0, r0, lsl #1 @ branch pc + pos*12 add pc, pc, r10, lsl #2 @ @@ -496,7 +496,7 @@ resample_hermite: ldmfd sp!, { r10, r12 } @ recover ch, h subs r10, r10, #1 @ --ch stmia r12!, { r1-r3 } @ h[0..2] = x3..x1 - ldmgtia sp, { r0-r2 } @ load data, src, dst + ldmiagt sp, { r0-r2 } @ load data, src, dst bgt .hrs_channel_loop ldmfd sp!, { r1-r3 } @ pop data, src, dst @@ -614,7 +614,7 @@ filter_process: ldr r0, [sp] @ r0 = history[channels-ch-1] subs r3, r3, #1 @ all channels processed? stmia r0!, { r9-r12 } @ save back history, history++ - ldmhsib sp, { r1-r2 } @ r1 = buf, r2 = count + ldmibhs sp, { r1-r2 } @ r1 = buf, r2 = count strhs r3, [sp, #12] @ store ch strhs r0, [sp] @ store history[channels-ch-1] bhs .fp_channelloop diff --git a/lib/rbcodec/dsp/dsp_arm_v6.S b/lib/rbcodec/dsp/dsp_arm_v6.S index a36760f744..aa27ec90f6 100644 --- a/lib/rbcodec/dsp/dsp_arm_v6.S +++ b/lib/rbcodec/dsp/dsp_arm_v6.S @@ -18,6 +18,7 @@ * KIND, either express or implied. * ****************************************************************************/ + #include "rbcodecconfig.h" /**************************************************************************** * void sample_output_mono(struct sample_io_data *this, @@ -56,7 +57,7 @@ sample_output_mono: stmia r3!, { r12, r14 } @ store So0, So1 bgt 1b @ @ - ldmltfd sp!, { r4, pc } @ if count was even, we're done + ldmfdlt sp!, { r4, pc } @ if count was even, we're done @ 2: @ ldr r12, [r2] @ round, scale, saturate @@ -113,7 +114,7 @@ sample_output_stereo: stmia r3!, { r6, r7 } @ store So0, So1 bgt 1b @ @ - ldmltfd sp!, { r4-r7, pc } @ if count was even, we're done + ldmfdlt sp!, { r4-r7, pc } @ if count was even, we're done @ 2: @ ldr r6, [r2] @ r6 = Li -- cgit v1.2.3