aboutsummaryrefslogtreecommitdiff
path: root/libpcsxcore/new_dynarec/linkage_arm.S
diff options
context:
space:
mode:
authornotaz2012-11-30 02:53:25 +0200
committernotaz2012-12-02 02:37:11 +0200
commit665f33e1e8ce2e40a7939a33075c3bce1c90790c (patch)
treee698dae48cdae636961762d00fb6a42e80653dcd /libpcsxcore/new_dynarec/linkage_arm.S
parentda710571b75db7031b82924ab3ad47eb645ce215 (diff)
downloadpcsx_rearmed-665f33e1e8ce2e40a7939a33075c3bce1c90790c.tar.gz
pcsx_rearmed-665f33e1e8ce2e40a7939a33075c3bce1c90790c.tar.bz2
pcsx_rearmed-665f33e1e8ce2e40a7939a33075c3bce1c90790c.zip
improve ARM feature detection
Diffstat (limited to 'libpcsxcore/new_dynarec/linkage_arm.S')
-rw-r--r--libpcsxcore/new_dynarec/linkage_arm.S10
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