diff options
| author | notaz | 2013-03-25 02:14:54 +0200 |
|---|---|---|
| committer | notaz | 2013-03-25 03:45:32 +0200 |
| commit | 5c6457c3a3e44b0f39be5221ad4a9d94a432d694 (patch) | |
| tree | 9522602f3105483d77580aabe459c977b2e67c39 /plugins | |
| parent | e5ed711cd97ac448e8378db562515698a4961f69 (diff) | |
| download | pcsx_rearmed-5c6457c3a3e44b0f39be5221ad4a9d94a432d694.tar.gz pcsx_rearmed-5c6457c3a3e44b0f39be5221ad4a9d94a432d694.tar.bz2 pcsx_rearmed-5c6457c3a3e44b0f39be5221ad4a9d94a432d694.zip | |
asm: use a macro for functions
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dfsound/arm_utils.S | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S index f4ef243..ddc3714 100644 --- a/plugins/dfsound/arm_utils.S +++ b/plugins/dfsound/arm_utils.S @@ -15,17 +15,16 @@ .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 - ldr \reg, =\var + ldr \reg, =EVAR(\var) #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 @@ -58,8 +57,7 @@ mc_finish: 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 @@ -103,8 +101,7 @@ mcr_finish: #elif 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 @@ -133,8 +130,7 @@ mc_finish: 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 |