From 1f4e070a56a597038942d595b82476ca5dc249fd Mon Sep 17 00:00:00 2001 From: notaz Date: Mon, 1 Apr 2013 19:43:48 +0300 Subject: [PATCH] asm: fix incorrect offsets --- libpcsxcore/new_dynarec/linkage_arm.S | 8 ++++---- plugins/dfsound/arm_utils.S | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libpcsxcore/new_dynarec/linkage_arm.S b/libpcsxcore/new_dynarec/linkage_arm.S index 0c5b2055..4de406ad 100644 --- 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 cbcc7f75..40794719 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 -- 2.39.2