diff options
| author | twinaphex | 2013-04-01 00:50:34 +0200 |
|---|---|---|
| committer | twinaphex | 2013-04-01 00:50:34 +0200 |
| commit | 19414bd6e0f0febe9c04bc3c876f400945861a95 (patch) | |
| tree | 5efe48cb46e67417b0c3e8c376f31793bae8c024 /plugins | |
| parent | b45890371118792a9e992ec92a259f31adc85820 (diff) | |
| parent | cd2306936bb0e14363d91aeb0fb29167eb94dd2a (diff) | |
| download | pcsx_rearmed-19414bd6e0f0febe9c04bc3c876f400945861a95.tar.gz pcsx_rearmed-19414bd6e0f0febe9c04bc3c876f400945861a95.tar.bz2 pcsx_rearmed-19414bd6e0f0febe9c04bc3c876f400945861a95.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/dfsound/arm_utils.S | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S index ddc3714..cbcc7f7 100644 --- a/plugins/dfsound/arm_utils.S +++ b/plugins/dfsound/arm_utils.S @@ -10,15 +10,28 @@ #include "arm_features.h" +#ifdef __MACH__ +.data +.align 2 +ptr_ChanBuf: .word _ChanBuf +ptr_SSumLR: .word _SSumLR +ptr_sRVBStart: .word _sRVBStart +#endif + .text .align 2 .macro load_varadr reg var #if defined(__ARM_ARCH_7A__) && !defined(__PIC__) - movw \reg, #:lower16:EVAR(\var) - movt \reg, #:upper16:EVAR(\var) + movw \reg, #:lower16:ESYM(\var) + movt \reg, #:upper16:ESYM(\var) +#elif defined(__ARM_ARCH_7A__) && defined(__MACH__) + movw \reg, #:lower16:(ptr_\var-(1678f+4)) + movt \reg, #:upper16:(ptr_\var-(1678f+4)) +1678: + ldr \reg, [pc, \reg] #else - ldr \reg, =EVAR(\var) + ldr \reg, =ESYM(\var) #endif .endm |