asm: fix incorrect offsets

diff --git a/libpcsxcore/new_dynarec/linkage_arm.S b/libpcsxcore/new_dynarec/linkage_arm.S
index 0c5b205..4de406a 100644 (file)
--- a/libpcsxcore/new_dynarec/linkage_arm.S
+++ b/libpcsxcore/new_dynarec/linkage_arm.S
@@ -120,8 +120,8 @@ ptr_hash_table:
        movw    \reg, #:lower16:\var
        movt    \reg, #:upper16:\var
 #elif defined(__ARM_ARCH_7A__) && defined(__MACH__)
-       movw    \reg, #:lower16:(\var-(1678f+4))
-       movt    \reg, #:upper16:(\var-(1678f+4))
+       movw    \reg, #:lower16:(\var-(1678f+8))
+       movt    \reg, #:upper16:(\var-(1678f+8))
 1678:
        add     \reg, pc
 #else
@@ -131,8 +131,8 @@ ptr_hash_table:
 
 .macro load_varadr_ext reg var
 #if defined(__ARM_ARCH_7A__) && defined(__MACH__) && defined(__PIC__)
-       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

diff --git a/plugins/dfsound/arm_utils.S b/plugins/dfsound/arm_utils.S
index cbcc7f7..4079471 100644 (file)
--- 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