aboutsummaryrefslogtreecommitdiff
path: root/libpcsxcore/new_dynarec/assem_arm.c
diff options
context:
space:
mode:
authorTwinaphex2015-02-06 09:39:11 +0100
committerTwinaphex2015-02-06 09:39:11 +0100
commit40dabc0b86e98a2f9b754692bd98404d038f6bce (patch)
tree27a148679e25f6edb7a2dd85c54514139bb72450 /libpcsxcore/new_dynarec/assem_arm.c
parentcebb70f24ab54693b12aaa27b85a52689e26e1ff (diff)
parent2af7e74feec67c0a798ac190774cb4b3e925be76 (diff)
downloadpcsx_rearmed-40dabc0b86e98a2f9b754692bd98404d038f6bce.tar.gz
pcsx_rearmed-40dabc0b86e98a2f9b754692bd98404d038f6bce.tar.bz2
pcsx_rearmed-40dabc0b86e98a2f9b754692bd98404d038f6bce.zip
Merge pull request #14 from notaz/for_libretro
r22 merge
Diffstat (limited to 'libpcsxcore/new_dynarec/assem_arm.c')
-rw-r--r--libpcsxcore/new_dynarec/assem_arm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libpcsxcore/new_dynarec/assem_arm.c b/libpcsxcore/new_dynarec/assem_arm.c
index 9ee832e..6853e9e 100644
--- a/libpcsxcore/new_dynarec/assem_arm.c
+++ b/libpcsxcore/new_dynarec/assem_arm.c
@@ -1285,7 +1285,7 @@ void emit_andimm(int rs,int imm,int rt)
assem_debug("bic %s,%s,#%d\n",regname[rt],regname[rs],imm);
output_w32(0xe3c00000|rd_rn_rm(rt,rs,0)|armval);
}else if(imm==65535) {
- #ifndef HAVE_ARMV7
+ #ifndef HAVE_ARMV6
assem_debug("bic %s,%s,#FF000000\n",regname[rt],regname[rs]);
output_w32(0xe3c00000|rd_rn_rm(rt,rs,0)|0x4FF);
assem_debug("bic %s,%s,#00FF0000\n",regname[rt],regname[rt]);
@@ -1418,7 +1418,7 @@ void emit_shrdimm(int rs,int rs2,u_int imm,int rt)
void emit_signextend16(int rs,int rt)
{
- #ifndef HAVE_ARMV7
+ #ifndef HAVE_ARMV6
emit_shlimm(rs,16,rt);
emit_sarimm(rt,16,rt);
#else
@@ -1429,7 +1429,7 @@ void emit_signextend16(int rs,int rt)
void emit_signextend8(int rs,int rt)
{
- #ifndef HAVE_ARMV7
+ #ifndef HAVE_ARMV6
emit_shlimm(rs,24,rt);
emit_sarimm(rt,24,rt);
#else