aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authornotaz2013-04-01 01:08:33 +0300
committernotaz2013-04-01 01:17:20 +0300
commit4ae83961a97c97cf6bf7e775cc08337b292b9853 (patch)
tree3621bc259b567af35f20bf60414df2902df1d6d1 /plugins
parenta288cd9ecba6813f4ac2305019fd738b1aa31f29 (diff)
downloadpcsx_rearmed-4ae83961a97c97cf6bf7e775cc08337b292b9853.tar.gz
pcsx_rearmed-4ae83961a97c97cf6bf7e775cc08337b292b9853.tar.bz2
pcsx_rearmed-4ae83961a97c97cf6bf7e775cc08337b292b9853.zip
still adjusting asm for better as compatibility..
Diffstat (limited to 'plugins')
-rw-r--r--plugins/dfsound/arm_utils.S19
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