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=2511bb3dde83e44859c4bd0ceb5b99c9d94d2803;hp=22e584432fbf93b8681cde9b7190d52af0d52eae;hb=de4a0279efefdd2e4595c8fc27f1564f4bff9341;hpb=c67af2ac1a8305c7377c7dda844257c5bc1545e3

diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S
index 22e58443..2511bb3d 100644
--- a/plugins/dfsound/arm_utils.S
+++ b/plugins/dfsound/arm_utils.S
@@ -8,28 +8,41 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "arm_features.h"
+
+#ifdef __MACH__
+.data
+.align 2
+ptr_ChanBuf:   .word ESYM(ChanBuf)
+ptr_SSumLR:    .word ESYM(SSumLR)
+#endif
 
 .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: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, =\var
+	ldr	\reg, =ESYM(\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
+    load_varadr r2, SSumLR
     mov         r12, r0
     load_varadr r0, ChanBuf
-    load_varadr r2, SSumLR
+    ldr         r2, [r2]
     add         r0, r12, lsl #2
     add         r2, r12, lsl #3
 0:
@@ -57,15 +70,14 @@ 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, int *rvb)
     vmov.32     d14[0], r2
     vmov.32     d14[1], r3             @ multipliers
+    load_varadr r2, SSumLR
     mov         r12, r0
     load_varadr r0, ChanBuf
-    load_varadr r3, sRVBStart
-    load_varadr r2, SSumLR
-    ldr         r3, [r3]
+    ldr         r3, [sp]               @ rvb
+    ldr         r2, [r2]
     add         r0, r12, lsl #2
     add         r2, r12, lsl #3
     add         r3, r12, lsl #3
@@ -100,16 +112,16 @@ mcr_finish:
     vstmiage    r3!, {d8}
     bx          lr
 
-#else
+#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
+    load_varadr r2, SSumLR
     mov         r12, r0
     load_varadr r0, ChanBuf
-    load_varadr r2, SSumLR
+    ldr         r2, [r2]
     add         r0, r12, lsl #2
     add         r2, r12, lsl #3
 0:
@@ -132,15 +144,14 @@ 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, int *rvb)
     stmfd       sp!, {r4-r8,lr}
     orr         lr, r2, r3, lsl #16
     lsl         lr, #1
-    load_varadr r3, sRVBStart
     load_varadr r2, SSumLR
+    ldr         r3, [sp]               @ rvb
+    ldr         r2, [r2]
     load_varadr r4, ChanBuf
-    ldr         r3, [r3]
     add         r2, r2, r0, lsl #3
     add         r3, r3, r0, lsl #3
     add         r0, r4, r0, lsl #2