diff options
author | twinaphex | 2013-04-01 19:04:38 +0200 |
---|---|---|
committer | twinaphex | 2013-04-01 19:04:38 +0200 |
commit | 98dacc2f457677c6f4460971bd838d0e13ba5ca3 (patch) | |
tree | 2f7c1d1021e714cceaa28f73934b706d094fb5a2 /libpcsxcore | |
parent | de9b02263c0ffa3ccdb41d2fdee3bbf8d1287825 (diff) | |
parent | 1f4e070a56a597038942d595b82476ca5dc249fd (diff) | |
download | pcsx_rearmed-98dacc2f457677c6f4460971bd838d0e13ba5ca3.tar.gz pcsx_rearmed-98dacc2f457677c6f4460971bd838d0e13ba5ca3.tar.bz2 pcsx_rearmed-98dacc2f457677c6f4460971bd838d0e13ba5ca3.zip |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'libpcsxcore')
-rw-r--r-- | libpcsxcore/new_dynarec/linkage_arm.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libpcsxcore/new_dynarec/linkage_arm.S b/libpcsxcore/new_dynarec/linkage_arm.S index 0c5b205..4de406a 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 |