alex/agb
1
0
Fork 0
mirror of https://github.com/italicsjenga/agb.git synced 2024-12-25 01:01:34 +11:00
Code Issues Packages Projects Releases Wiki Activity

Remove loads of whitespace

Browse source
This commit is contained in:
Gwilym Kuiper 2021-08-01 20:44:37 +01:00
parent 09ad082f3f
commit d1c312ab79
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
agb/src/sound/mixer/mixer.s
View file

@ -16,30 +16,30 @@ agb_rs__mixer_add:
push {r4-r10, lr} push {r4-r10, lr}
ldr lr, [sp, #32] @ load the right channel modification amount into lr ldr lr, [sp, #32] @ load the right channel modification amount into lr
mov r12, #0 @ current write offset into the resulting buffer mov r12, #0 @ current write offset into the resulting buffer
mov r8, #352 @ the offset for writing to the resulting buffer between left and right channels mov r8, #352 @ the offset for writing to the resulting buffer between left and right channels
mov r5, #0 @ current index we're reading from mov r5, #0 @ current index we're reading from
1: 1:
add r4, r0, r5, asr #8 @ calculate the address of the next read form the sound buffer add r4, r0, r5, asr #8 @ calculate the address of the next read form the sound buffer
add r5, r5, r2 @ calculate the position to read the next step from add r5, r5, r2 @ calculate the position to read the next step from
ldrsb r10, [r4] @ load the current value we want to read ldrsb r10, [r4] @ load the current value we want to read
mov r6, r1 @ r6 = current buffer location mov r6, r1 @ r6 = current buffer location
ldrh r9, [r6, r12]! @ load the current buffer value (r12 being the offset) but pre-increment r6 by r12 ldrh r9, [r6, r12]! @ load the current buffer value (r12 being the offset) but pre-increment r6 by r12
mla r7, r10, r3, r9 @ r7 = r10 * r3 + r9 = current sound value * left amount + previous buffer value mla r7, r10, r3, r9 @ r7 = r10 * r3 + r9 = current sound value * left amount + previous buffer value
strh r7, [r6], r8 @ *(r6 + r8) = r7, r8 = 352 = offset for the right hand side strh r7, [r6], r8 @ *(r6 + r8) = r7, r8 = 352 = offset for the right hand side
ldrh r7, [r6] @ same for the right hand side (slightly confused here, but this is what was generated) ldrh r7, [r6] @ same for the right hand side (slightly confused here, but this is what was generated)
mla r4, r10, lr, r7 mla r4, r10, lr, r7
strh r4, [r6] strh r4, [r6]
add r12, r12, #2 @ increment the current write offset in the resulting buffer add r12, r12, #2 @ increment the current write offset in the resulting buffer
cmp r12, #352 @ check if we're done cmp r12, #352 @ check if we're done
bne 1b bne 1b
pop {r4-r10, lr} pop {r4-r10, lr}