X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=plugins%2Fdfsound%2Farm_utils.S;h=407947198eb62249b048c42fc507826eb9e46c38;hp=ddc37140ec404f20d8edbd184428043fe5ab9ec1;hb=e391d21cdbf06afd68d137537b7e82585ecffa1a;hpb=5c6457c3a3e44b0f39be5221ad4a9d94a432d694

diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S
index ddc37140..40794719 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 ESYM(ChanBuf)
+ptr_SSumLR:    .word ESYM(SSumLR)
+ptr_sRVBStart: .word ESYM(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+8))
+	movt	\reg, #:upper16:(ptr_\var-(1678f+8))
+1678:
+	ldr	\reg, [pc, \reg]
 #else
-	ldr	\reg, =EVAR(\var)
+	ldr	\reg, =ESYM(\var)
 #endif
 .endm