aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornotaz2016-02-28 23:03:44 +0200
committernotaz2016-02-28 23:03:44 +0200
commit397614d0d77c7b99f6ecc6d938a36d8df66dcb18 (patch)
tree0ecb1ded21c30cb6794fc1ca6afde10abc680745
parentc3341ffd2f06fadeca07b74279070c334b8d8cc1 (diff)
downloadpcsx_rearmed-397614d0d77c7b99f6ecc6d938a36d8df66dcb18.tar.gz
pcsx_rearmed-397614d0d77c7b99f6ecc6d938a36d8df66dcb18.tar.bz2
pcsx_rearmed-397614d0d77c7b99f6ecc6d938a36d8df66dcb18.zip
drc: handle any immediate
-rw-r--r--libpcsxcore/new_dynarec/assem_arm.c28
1 files changed, 20 insertions, 8 deletions
diff --git a/libpcsxcore/new_dynarec/assem_arm.c b/libpcsxcore/new_dynarec/assem_arm.c
index 6853e9e..708c8ae 100644
--- a/libpcsxcore/new_dynarec/assem_arm.c
+++ b/libpcsxcore/new_dynarec/assem_arm.c
@@ -1167,18 +1167,30 @@ void emit_addimm(u_int rs,int imm,u_int rt)
}else if(genimm(-imm,&armval)) {
assem_debug("sub %s,%s,#%d\n",regname[rt],regname[rs],-imm);
output_w32(0xe2400000|rd_rn_rm(rt,rs,0)|armval);
- }else if(imm<0) {
- assert(imm>-65536);
+ #ifdef HAVE_ARMV7
+ }else if(rt!=rs&&(u_int)imm<65536) {
+ emit_movw(imm&0x0000ffff,rt);
+ emit_add(rs,rt,rt);
+ }else if(rt!=rs&&(u_int)-imm<65536) {
+ emit_movw(-imm&0x0000ffff,rt);
+ emit_sub(rs,rt,rt);
+ #endif
+ }else if((u_int)-imm<65536) {
assem_debug("sub %s,%s,#%d\n",regname[rt],regname[rs],(-imm)&0xFF00);
assem_debug("sub %s,%s,#%d\n",regname[rt],regname[rt],(-imm)&0xFF);
output_w32(0xe2400000|rd_rn_imm_shift(rt,rs,(-imm)>>8,8));
output_w32(0xe2400000|rd_rn_imm_shift(rt,rt,(-imm)&0xff,0));
- }else{
- assert(imm<65536);
- assem_debug("add %s,%s,#%d\n",regname[rt],regname[rs],imm&0xFF00);
- assem_debug("add %s,%s,#%d\n",regname[rt],regname[rt],imm&0xFF);
- output_w32(0xe2800000|rd_rn_imm_shift(rt,rs,imm>>8,8));
- output_w32(0xe2800000|rd_rn_imm_shift(rt,rt,imm&0xff,0));
+ }else {
+ do {
+ int shift = (ffs(imm) - 1) & ~1;
+ int imm8 = imm & (0xff << shift);
+ genimm_checked(imm8,&armval);
+ assem_debug("add %s,%s,#0x%x\n",regname[rt],regname[rs],imm8);
+ output_w32(0xe2800000|rd_rn_rm(rt,rs,0)|armval);
+ rs = rt;
+ imm &= ~imm8;
+ }
+ while (imm != 0);
}
}
else if(rs!=rt) emit_mov(rs,rt);