diff options
| author | twinaphex | 2012-12-02 18:06:01 +0100 |
|---|---|---|
| committer | twinaphex | 2012-12-02 18:06:01 +0100 |
| commit | 1cb2b455712a0c9ae814b441a5a46e24e32a808c (patch) | |
| tree | a355bc7e46c9577f358281259e32024100ac6d6a /libpcsxcore/new_dynarec/linkage_arm.S | |
| parent | 01f0020f8c4d96ce7ff425c0cab66ad93bf2159c (diff) | |
| parent | a1a232ad65a5c15314cbfe753f734a0a3ad6cef5 (diff) | |
| download | pcsx_rearmed-1cb2b455712a0c9ae814b441a5a46e24e32a808c.tar.gz pcsx_rearmed-1cb2b455712a0c9ae814b441a5a46e24e32a808c.tar.bz2 pcsx_rearmed-1cb2b455712a0c9ae814b441a5a46e24e32a808c.zip | |
Merge git://github.com/notaz/pcsx_rearmed
Diffstat (limited to 'libpcsxcore/new_dynarec/linkage_arm.S')
| -rw-r--r-- | libpcsxcore/new_dynarec/linkage_arm.S | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libpcsxcore/new_dynarec/linkage_arm.S b/libpcsxcore/new_dynarec/linkage_arm.S index 4748078..5b70745 100644 --- a/libpcsxcore/new_dynarec/linkage_arm.S +++ b/libpcsxcore/new_dynarec/linkage_arm.S @@ -19,6 +19,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +#include "arm_features.h" + + .global dynarec_local .global reg .global hi @@ -163,6 +166,13 @@ FCR31 = align0 .type FCR31, %object .size FCR31, 4 +#ifndef HAVE_ARMV5 +.macro blx rd + mov lr, pc + bx \rd +.endm +#endif + .macro load_varadr reg var #if defined(__ARM_ARCH_7A__) && !defined(__PIC__) movw \reg, #:lower16:\var |