diff options
| author | Twinaphex | 2015-01-25 22:49:32 +0100 |
|---|---|---|
| committer | Twinaphex | 2015-01-25 22:49:32 +0100 |
| commit | cebb70f24ab54693b12aaa27b85a52689e26e1ff (patch) | |
| tree | 854c202544c75e486d4243b34366162f03f082eb /plugins/dfsound/arm_utils.S | |
| parent | be1294d017cba3f18cf66597f0cbed207fed26bf (diff) | |
| parent | 4e9adec1930817da2031fd044dc74c0f454a0079 (diff) | |
| download | pcsx_rearmed-cebb70f24ab54693b12aaa27b85a52689e26e1ff.tar.gz pcsx_rearmed-cebb70f24ab54693b12aaa27b85a52689e26e1ff.tar.bz2 pcsx_rearmed-cebb70f24ab54693b12aaa27b85a52689e26e1ff.zip | |
Merge pull request #12 from notaz/for_libretro
r21 merge
Diffstat (limited to 'plugins/dfsound/arm_utils.S')
| -rw-r--r-- | plugins/dfsound/arm_utils.S | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S index 1726389..9652313 100644 --- a/plugins/dfsound/arm_utils.S +++ b/plugins/dfsound/arm_utils.S @@ -14,7 +14,6 @@ .data .align 2 ptr_ChanBuf: .word ESYM(ChanBuf) -ptr_SSumLR: .word ESYM(SSumLR) #endif .text @@ -36,14 +35,11 @@ ptr_SSumLR: .word ESYM(SSumLR) #ifdef __ARM_NEON__ -FUNCTION(mix_chan): @ (int start, int count, int lv, int rv) +FUNCTION(mix_chan): @ (int *SSumLR, int count, int lv, int rv) vmov.32 d14[0], r2 vmov.32 d14[1], r3 @ multipliers - mov r12, r0 + mov r2, r0 load_varadr r0, ChanBuf - load_varadr r2, SSumLR - add r0, r12, lsl #2 - add r2, r12, lsl #3 0: vldmia r0!, {d0-d1} vldmia r2, {d2-d5} @@ -69,16 +65,12 @@ mc_finish: bx lr -FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv, int *rvb) +FUNCTION(mix_chan_rvb): @ (int *SSumLR, int count, int lv, int rv, int *rvb) vmov.32 d14[0], r2 vmov.32 d14[1], r3 @ multipliers - mov r12, r0 + mov r2, r0 load_varadr r0, ChanBuf ldr r3, [sp] @ rvb - load_varadr r2, SSumLR - add r0, r12, lsl #2 - add r2, r12, lsl #3 - add r3, r12, lsl #3 0: vldmia r0!, {d0-d1} vldmia r2, {d2-d5} @@ -112,15 +104,12 @@ mcr_finish: #elif defined(HAVE_ARMV5) -FUNCTION(mix_chan): @ (int start, int count, int lv, int rv) +FUNCTION(mix_chan): @ (int *SSumLR, int count, int lv, int rv) stmfd sp!, {r4-r8,lr} orr r3, r2, r3, lsl #16 lsl r3, #1 @ packed multipliers << 1 - mov r12, r0 + mov r2, r0 load_varadr r0, ChanBuf - load_varadr r2, SSumLR - add r0, r12, lsl #2 - add r2, r12, lsl #3 0: ldmia r0!, {r4,r5} ldmia r2, {r6-r8,lr} @@ -141,16 +130,13 @@ mc_finish: ldmfd sp!, {r4-r8,pc} -FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv, int *rvb) +FUNCTION(mix_chan_rvb): @ (int *SSumLR, int count, int lv, int rv, int *rvb) stmfd sp!, {r4-r8,lr} orr lr, r2, r3, lsl #16 lsl lr, #1 - ldr r3, [sp] @ rvb - load_varadr r2, SSumLR - load_varadr r4, ChanBuf - add r2, r2, r0, lsl #3 - add r3, r3, r0, lsl #3 - add r0, r4, r0, lsl #2 + mov r2, r0 + load_varadr r0, ChanBuf + ldr r3, [sp, #6*4] @ rvb 0: ldr r4, [r0], #4 ldmia r2, {r6,r7} |