notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libretro: rework makefile
[pcsx_rearmed.git]
/
plugins
/
dfsound
/
arm_utils.S
diff --git
a/plugins/dfsound/arm_utils.S
b/plugins/dfsound/arm_utils.S
index
22e5844
..
ddc3714
100644
(file)
--- a/
plugins/dfsound/arm_utils.S
+++ b/
plugins/dfsound/arm_utils.S
@@
-8,23
+8,23
@@
* See the COPYING file in the top-level directory.
*/
* See the COPYING file in the top-level directory.
*/
+#include "arm_features.h"
.text
.align 2
.macro load_varadr reg var
#if defined(__ARM_ARCH_7A__) && !defined(__PIC__)
.text
.align 2
.macro load_varadr reg var
#if defined(__ARM_ARCH_7A__) && !defined(__PIC__)
- movw \reg, #:lower16:
\var
- movt \reg, #:upper16:
\var
+ movw \reg, #:lower16:
EVAR(\var)
+ movt \reg, #:upper16:
EVAR(\var)
#else
#else
- ldr \reg, =
\var
+ ldr \reg, =
EVAR(\var)
#endif
.endm
#ifdef __ARM_NEON__
#endif
.endm
#ifdef __ARM_NEON__
-.global mix_chan @ (int start, int count, int lv, int rv)
-mix_chan:
+FUNCTION(mix_chan): @ (int start, int count, int lv, int rv)
vmov.32 d14[0], r2
vmov.32 d14[1], r3 @ multipliers
mov r12, r0
vmov.32 d14[0], r2
vmov.32 d14[1], r3 @ multipliers
mov r12, r0
@@
-57,8
+57,7
@@
mc_finish:
bx lr
bx lr
-.global mix_chan_rvb @ (int start, int count, int lv, int rv)
-mix_chan_rvb:
+FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv)
vmov.32 d14[0], r2
vmov.32 d14[1], r3 @ multipliers
mov r12, r0
vmov.32 d14[0], r2
vmov.32 d14[1], r3 @ multipliers
mov r12, r0
@@
-100,10
+99,9
@@
mcr_finish:
vstmiage r3!, {d8}
bx lr
vstmiage r3!, {d8}
bx lr
-#el
se
+#el
if defined(HAVE_ARMV5)
-.global mix_chan @ (int start, int count, int lv, int rv)
-mix_chan:
+FUNCTION(mix_chan): @ (int start, int count, int lv, int rv)
stmfd sp!, {r4-r8,lr}
orr r3, r2, r3, lsl #16
lsl r3, #1 @ packed multipliers << 1
stmfd sp!, {r4-r8,lr}
orr r3, r2, r3, lsl #16
lsl r3, #1 @ packed multipliers << 1
@@
-132,8
+130,7
@@
mc_finish:
ldmfd sp!, {r4-r8,pc}
ldmfd sp!, {r4-r8,pc}
-.global mix_chan_rvb @ (int start, int count, int lv, int rv)
-mix_chan_rvb:
+FUNCTION(mix_chan_rvb): @ (int start, int count, int lv, int rv)
stmfd sp!, {r4-r8,lr}
orr lr, r2, r3, lsl #16
lsl lr, #1
stmfd sp!, {r4-r8,lr}
orr lr, r2, r3, lsl #16
lsl lr, #1