diff options
| author | Twinaphex | 2014-12-20 20:43:18 +0100 |
|---|---|---|
| committer | Twinaphex | 2014-12-20 20:43:18 +0100 |
| commit | 247fc699be6b3bd95fd9126541e0804cc8dffdd4 (patch) | |
| tree | d38e169e68e48a3ccbf8a3805f9cb87197ed894a /plugins/dfsound/arm_utils.S | |
| parent | 3e5b01fcef8ef20dacca45ea7a7b0c461e6bd666 (diff) | |
| parent | 7931825ed8ef51dab3e37475d8126103ebc9fb6f (diff) | |
| download | pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.tar.gz pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.tar.bz2 pcsx_rearmed-247fc699be6b3bd95fd9126541e0804cc8dffdd4.zip | |
Merge pull request #11 from notaz/upstream_merge
Upstream merge
Diffstat (limited to 'plugins/dfsound/arm_utils.S')
| -rw-r--r-- | plugins/dfsound/arm_utils.S | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S index 4079471..1726389 100644 --- a/plugins/dfsound/arm_utils.S +++ b/plugins/dfsound/arm_utils.S @@ -15,7 +15,6 @@ .align 2 ptr_ChanBuf: .word ESYM(ChanBuf) ptr_SSumLR: .word ESYM(SSumLR) -ptr_sRVBStart: .word ESYM(sRVBStart) #endif .text @@ -70,14 +69,13 @@ mc_finish: bx lr -FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv) +FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv, int *rvb) vmov.32 d14[0], r2 vmov.32 d14[1], r3 @ multipliers mov r12, r0 load_varadr r0, ChanBuf - load_varadr r3, sRVBStart + ldr r3, [sp] @ rvb load_varadr r2, SSumLR - ldr r3, [r3] add r0, r12, lsl #2 add r2, r12, lsl #3 add r3, r12, lsl #3 @@ -143,14 +141,13 @@ mc_finish: ldmfd sp!, {r4-r8,pc} -FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv) +FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv, int *rvb) stmfd sp!, {r4-r8,lr} orr lr, r2, r3, lsl #16 lsl lr, #1 - load_varadr r3, sRVBStart + ldr r3, [sp] @ rvb load_varadr r2, SSumLR load_varadr r4, ChanBuf - ldr r3, [r3] add r2, r2, r0, lsl #3 add r3, r3, r0, lsl #3 add r0, r4, r0, lsl #2 |