aboutsummaryrefslogtreecommitdiff
path: root/plugins/dfsound
diff options
context:
space:
mode:
authortwinaphex2013-04-01 19:04:38 +0200
committertwinaphex2013-04-01 19:04:38 +0200
commit98dacc2f457677c6f4460971bd838d0e13ba5ca3 (patch)
tree2f7c1d1021e714cceaa28f73934b706d094fb5a2 /plugins/dfsound
parentde9b02263c0ffa3ccdb41d2fdee3bbf8d1287825 (diff)
parent1f4e070a56a597038942d595b82476ca5dc249fd (diff)
downloadpcsx_rearmed-98dacc2f457677c6f4460971bd838d0e13ba5ca3.tar.gz
pcsx_rearmed-98dacc2f457677c6f4460971bd838d0e13ba5ca3.tar.bz2
pcsx_rearmed-98dacc2f457677c6f4460971bd838d0e13ba5ca3.zip
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'plugins/dfsound')
-rw-r--r--plugins/dfsound/arm_utils.S10
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S
index cbcc7f7..4079471 100644
--- a/plugins/dfsound/arm_utils.S
+++ b/plugins/dfsound/arm_utils.S
@@ -13,9 +13,9 @@
#ifdef __MACH__
.data
.align 2
-ptr_ChanBuf: .word _ChanBuf
-ptr_SSumLR: .word _SSumLR
-ptr_sRVBStart: .word _sRVBStart
+ptr_ChanBuf: .word ESYM(ChanBuf)
+ptr_SSumLR: .word ESYM(SSumLR)
+ptr_sRVBStart: .word ESYM(sRVBStart)
#endif
.text
@@ -26,8 +26,8 @@ ptr_sRVBStart: .word _sRVBStart
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))
+ movw \reg, #:lower16:(ptr_\var-(1678f+8))
+ movt \reg, #:upper16:(ptr_\var-(1678f+8))
1678:
ldr \reg, [pc, \reg]
#else