#include "pcnt.h"
#include "arm_features.h"
-#define CALLER_SAVE_REGS 0x0007ffff
-
#define unused __attribute__((unused))
void do_memhandler_pre();
|| (*ptr&0x7e000000) == 0x34000000) { // cbz/cbnz
// Conditional branch are limited to +/- 1MB
// block max size is 256k so branching beyond the +/- 1MB limit
- // should only happen when jumping to an already compiled block (see add_link)
+ // should only happen when jumping to an already compiled block (see add_jump_out)
// a workaround would be to do a trampoline jump via a stub at the end of the block
assert(-1048576 <= offset && offset < 1048576);
*ptr=(*ptr&0xFF00000F)|(((offset>>2)&0x7ffff)<<5);
assem_debug("adds %s,%s,%s\n",regname64[rt],regname64[rs1],regname64[rs2]);
output_w32(0xab000000 | rm_rn_rd(rs2, rs1, rt));
}
+#define emit_adds_ptr emit_adds64
static void emit_neg(u_int rs, u_int rt)
{
else
abort();
}
+#define emit_readptr emit_readdword
static void emit_readshword(void *addr, u_int rt)
{
static void emit_loadreg(u_int r, u_int hr)
{
int is64 = 0;
- assert(r < 64);
if (r == 0)
emit_zeroreg(hr);
else {
- void *addr = &psxRegs.GPR.r[r];
+ void *addr;
switch (r) {
//case HIREG: addr = &hi; break;
//case LOREG: addr = &lo; break;
case CCREG: addr = &cycle_count; break;
case CSREG: addr = &Status; break;
case INVCP: addr = &invc_ptr; is64 = 1; break;
- default: assert(r < 34); break;
+ case ROREG: addr = &ram_offset; is64 = 1; break;
+ default:
+ assert(r < 34);
+ addr = &psxRegs.GPR.r[r];
+ break;
}
if (is64)
emit_readdword(addr, hr);
emit_addimm_s(1, 0, rt, imm, rt);
}
-static void emit_addimm_no_flags(u_int imm,u_int rt)
-{
- emit_addimm(rt,imm,rt);
-}
-
static void emit_logicop_imm(u_int op, u_int rs, u_int imm, u_int rt)
{
const char *names[] = { "and", "orr", "eor", "ands" };
output_w32(0x1a800000 | (COND_LT << 12) | rm_rn_rd(rt, rs, rt));
}
+static void emit_cmovb_reg(u_int rs,u_int rt)
+{
+ assem_debug("csel %s,%s,%s,cc\n",regname[rt],regname[rs],regname[rt]);
+ output_w32(0x1a800000 | (COND_CC << 12) | rm_rn_rd(rt, rs, rt));
+}
+
static void emit_cmovs_reg(u_int rs,u_int rt)
{
assem_debug("csel %s,%s,%s,mi\n",regname[rt],regname[rs],regname[rt]);
assem_debug("ldr %s, [%s,%s, uxtw #3]\n",regname64[rt],regname64[rs1],regname[rs2]);
output_w32(0xf8605800 | rm_rn_rd(rs2, rs1, rt));
}
+#define emit_readptr_dualindexedx_ptrlen emit_readdword_dualindexedx8
static void emit_ldrb_dualindexed(u_int rs1, u_int rs2, u_int rt)
{
|| is_rotated_mask(v1 ^ v2);
}
-// trashes r2
+static void emit_movimm_from64(u_int rs_val, u_int rs, uintptr_t rt_val, u_int rt)
+{
+ if (rt_val < 0x100000000ull) {
+ emit_movimm_from(rs_val, rs, rt_val, rt);
+ return;
+ }
+ // just move the whole thing. At least on Linux all addresses
+ // seem to be 48bit, so 3 insns - not great not terrible
+ assem_debug("movz %s,#%#lx\n", regname64[rt], rt_val & 0xffff);
+ output_w32(0xd2800000 | imm16_rd(rt_val & 0xffff, rt));
+ assem_debug("movk %s,#%#lx,lsl #16\n", regname64[rt], (rt_val >> 16) & 0xffff);
+ output_w32(0xf2a00000 | imm16_rd((rt_val >> 16) & 0xffff, rt));
+ assem_debug("movk %s,#%#lx,lsl #32\n", regname64[rt], (rt_val >> 32) & 0xffff);
+ output_w32(0xf2c00000 | imm16_rd((rt_val >> 32) & 0xffff, rt));
+ if (rt_val >> 48) {
+ assem_debug("movk %s,#%#lx,lsl #48\n", regname64[rt], (rt_val >> 48) & 0xffff);
+ output_w32(0xf2e00000 | imm16_rd((rt_val >> 48) & 0xffff, rt));
+ }
+}
+
+// trashes x2
static void pass_args64(u_int a0, u_int a1)
{
if(a0==1&&a1==0) {
u_int reglist = stubs[n].e;
const signed char *i_regmap = i_regs->regmap;
int rt;
- if(itype[i]==C1LS||itype[i]==C2LS||itype[i]==LOADLR) {
+ if(dops[i].itype==C1LS||dops[i].itype==C2LS||dops[i].itype==LOADLR) {
rt=get_reg(i_regmap,FTEMP);
}else{
- rt=get_reg(i_regmap,rt1[i]);
+ rt=get_reg(i_regmap,dops[i].rt1);
}
assert(rs>=0);
int r,temp=-1,temp2=HOST_TEMPREG,regs_saved=0;
break;
}
}
- if(rt>=0&&rt1[i]!=0)
+ if(rt>=0&&dops[i].rt1!=0)
reglist&=~(1<<rt);
if(temp==-1) {
save_regs(reglist);
emit_adds64(temp2,temp2,temp2);
handler_jump=out;
emit_jc(0);
- if(itype[i]==C1LS||itype[i]==C2LS||(rt>=0&&rt1[i]!=0)) {
+ if(dops[i].itype==C1LS||dops[i].itype==C2LS||(rt>=0&&dops[i].rt1!=0)) {
switch(type) {
case LOADB_STUB: emit_ldrsb_dualindexed(temp2,rs,rt); break;
case LOADBU_STUB: emit_ldrb_dualindexed(temp2,rs,rt); break;
int cc=get_reg(i_regmap,CCREG);
if(cc<0)
emit_loadreg(CCREG,2);
- emit_addimm(cc<0?2:cc,CLOCK_ADJUST((int)stubs[n].d),2);
+ emit_addimm(cc<0?2:cc,(int)stubs[n].d,2);
emit_far_call(handler);
// (no cycle reload after read)
- if(itype[i]==C1LS||itype[i]==C2LS||(rt>=0&&rt1[i]!=0)) {
+ if(dops[i].itype==C1LS||dops[i].itype==C2LS||(rt>=0&&dops[i].rt1!=0)) {
loadstore_extend(type,0,rt);
}
if(restore_jump)
{
int rs=get_reg(regmap,target);
int rt=get_reg(regmap,target);
- if(rs<0) rs=get_reg(regmap,-1);
+ if(rs<0) rs=get_reg_temp(regmap);
assert(rs>=0);
u_int is_dynamic=0;
uintptr_t host_addr = 0;
void *handler;
int cc=get_reg(regmap,CCREG);
- //if(pcsx_direct_read(type,addr,CLOCK_ADJUST(adj),cc,target?rs:-1,rt))
+ //if(pcsx_direct_read(type,addr,adj,cc,target?rs:-1,rt))
// return;
handler = get_direct_memhandler(mem_rtab, addr, type, &host_addr);
if (handler == NULL) {
- if(rt<0||rt1[i]==0)
+ if(rt<0||dops[i].rt1==0)
return;
- if (addr != host_addr) {
- if (host_addr >= 0x100000000ull)
- abort(); // ROREG not implemented
- emit_movimm_from(addr, rs, host_addr, rs);
- }
+ if (addr != host_addr)
+ emit_movimm_from64(addr, rs, host_addr, rs);
switch(type) {
case LOADB_STUB: emit_movsbl_indexed(0,rs,rt); break;
case LOADBU_STUB: emit_movzbl_indexed(0,rs,rt); break;
}
return;
}
- is_dynamic=pcsxmem_is_handler_dynamic(addr);
- if(is_dynamic) {
+ is_dynamic = pcsxmem_is_handler_dynamic(addr);
+ if (is_dynamic) {
if(type==LOADB_STUB||type==LOADBU_STUB)
handler=jump_handler_read8;
if(type==LOADH_STUB||type==LOADHU_STUB)
}
// call a memhandler
- if(rt>=0&&rt1[i]!=0)
+ if(rt>=0&&dops[i].rt1!=0)
reglist&=~(1<<rt);
save_regs(reglist);
if(target==0)
emit_mov(rs,0);
if(cc<0)
emit_loadreg(CCREG,2);
- emit_addimm(cc<0?2:cc,CLOCK_ADJUST(adj),2);
+ emit_addimm(cc<0?2:cc,adj,2);
if(is_dynamic) {
uintptr_t l1 = ((uintptr_t *)mem_rtab)[addr>>12] << 1;
emit_adrp((void *)l1, 1);
emit_far_call(handler);
// (no cycle reload after read)
- if(rt>=0&&rt1[i]!=0)
+ if(rt>=0&&dops[i].rt1!=0)
loadstore_extend(type, 0, rt);
restore_regs(reglist);
}
u_int reglist=stubs[n].e;
signed char *i_regmap=i_regs->regmap;
int rt,r;
- if(itype[i]==C1LS||itype[i]==C2LS) {
+ if(dops[i].itype==C1LS||dops[i].itype==C2LS) {
rt=get_reg(i_regmap,r=FTEMP);
}else{
- rt=get_reg(i_regmap,r=rs2[i]);
+ rt=get_reg(i_regmap,r=dops[i].rs2);
}
assert(rs>=0);
assert(rt>=0);
emit_jmp(stubs[n].retaddr); // return address (invcode check)
set_jump_target(handler_jump, out);
- // TODO FIXME: regalloc should prefer callee-saved regs
if(!regs_saved)
save_regs(reglist);
void *handler=NULL;
int cc=get_reg(i_regmap,CCREG);
if(cc<0)
emit_loadreg(CCREG,2);
- emit_addimm(cc<0?2:cc,CLOCK_ADJUST((int)stubs[n].d),2);
+ emit_addimm(cc<0?2:cc,(int)stubs[n].d,2);
// returns new cycle_count
emit_far_call(handler);
- emit_addimm(0,-CLOCK_ADJUST((int)stubs[n].d),cc<0?2:cc);
+ emit_addimm(0,-(int)stubs[n].d,cc<0?2:cc);
if(cc<0)
emit_storereg(CCREG,2);
if(restore_jump)
static void inline_writestub(enum stub_type type, int i, u_int addr,
const signed char regmap[], int target, int adj, u_int reglist)
{
- int rs = get_reg(regmap,-1);
+ int rs = get_reg_temp(regmap);
int rt = get_reg(regmap,target);
assert(rs >= 0);
assert(rt >= 0);
uintptr_t host_addr = 0;
void *handler = get_direct_memhandler(mem_wtab, addr, type, &host_addr);
if (handler == NULL) {
- if (addr != host_addr) {
- if (host_addr >= 0x100000000ull)
- abort(); // ROREG not implemented
- emit_movimm_from(addr, rs, host_addr, rs);
- }
+ if (addr != host_addr)
+ emit_movimm_from64(addr, rs, host_addr, rs);
switch (type) {
case STOREB_STUB: emit_writebyte_indexed(rt, 0, rs); break;
case STOREH_STUB: emit_writehword_indexed(rt, 0, rs); break;
cc = cc_use = get_reg(regmap, CCREG);
if (cc < 0)
emit_loadreg(CCREG, (cc_use = 2));
- emit_addimm(cc_use, CLOCK_ADJUST(adj), 2);
+ emit_addimm(cc_use, adj, 2);
emit_far_call(do_memhandler_pre);
emit_far_call(handler);
emit_far_call(do_memhandler_post);
- emit_addimm(0, -CLOCK_ADJUST(adj), cc_use);
+ emit_addimm(0, -adj, cc_use);
if (cc < 0)
emit_storereg(CCREG, cc_use);
restore_regs(reglist);
}
// this output is parsed by verify_dirty, get_bounds, isclean, get_clean_addr
-static void do_dirty_stub_base(u_int vaddr)
+static void do_dirty_stub_base(u_int vaddr, u_int source_len)
{
- assert(slen <= MAXBLOCK);
+ assert(source_len <= MAXBLOCK*4);
emit_loadlp_ofs(0, 0); // ldr x1, source
emit_loadlp_ofs(0, 1); // ldr x2, copy
- emit_movz(slen*4, 2);
+ emit_movz(source_len, 2);
emit_far_call(verify_code_arm64);
void *jmp = out;
emit_cbz(0, 0);
{
assert((ptr[0] & 0xff00001f) == 0x58000000); // ldr x0, source
assert((ptr[1] & 0xff00001f) == 0x58000001); // ldr x1, copy
- assert((ptr[2] & 0xffe0001f) == 0x52800002); // movz w2, #slen*4
+ assert((ptr[2] & 0xffe0001f) == 0x52800002); // movz w2, #source_len
assert( ptr[8] == 0xd61f0000); // br x0
}
output_w64((uintptr_t)copy);
}
-static void *do_dirty_stub(int i)
+static void *do_dirty_stub(int i, u_int source_len)
{
assem_debug("do_dirty_stub %x\n",start+i*4);
u_int *loadlps = (void *)out;
- do_dirty_stub_base(start + i*4);
+ do_dirty_stub_base(start + i*4, source_len);
void *entry = out;
load_regs_entry(i);
if (entry == out)
return entry;
}
-static void do_dirty_stub_ds(void)
+static void do_dirty_stub_ds(u_int source_len)
{
u_int *loadlps = (void *)out;
- do_dirty_stub_base(start + 1);
+ do_dirty_stub_base(start + 1, source_len);
void *lit_jumpover = out;
emit_jmp(out + 8*2);
do_dirty_stub_emit_literals(loadlps);
assert_dirty_stub(ptr);
source = (void *)get_from_ldr_literal(&ptr[0]); // ldr x1, source
copy = (void *)get_from_ldr_literal(&ptr[1]); // ldr x1, copy
- len = get_from_movz(&ptr[2]); // movz w3, #slen*4
+ len = get_from_movz(&ptr[2]); // movz w3, #source_len
return !memcmp(source, copy, len);
}
const u_int *ptr = addr;
assert_dirty_stub(ptr);
*start = (u_char *)get_from_ldr_literal(&ptr[0]); // ldr x1, source
- *end = *start + get_from_movz(&ptr[2]); // movz w3, #slen*4
+ *end = *start + get_from_movz(&ptr[2]); // movz w3, #source_len
}
/* Special assem */
static void c2op_prologue(u_int op, int i, const struct regstat *i_regs, u_int reglist)
{
save_load_regs_all(1, reglist);
- cop2_call_stall_check(op, i, i_regs, 0);
+ cop2_do_stall_check(op, i, i_regs, 0);
#ifdef PCNT
emit_movimm(op, 0);
emit_far_call(pcnt_gte_start);
host_tempreg_release();
}
-static void multdiv_assemble_arm64(int i,struct regstat *i_regs)
+static void multdiv_assemble_arm64(int i, const struct regstat *i_regs)
{
// case 0x18: MULT
// case 0x19: MULTU
// case 0x1A: DIV
// case 0x1B: DIVU
- if(rs1[i]&&rs2[i])
+ if(dops[i].rs1&&dops[i].rs2)
{
- switch(opcode2[i])
+ switch(dops[i].opcode2)
{
case 0x18: // MULT
case 0x19: // MULTU
{
- signed char m1=get_reg(i_regs->regmap,rs1[i]);
- signed char m2=get_reg(i_regs->regmap,rs2[i]);
+ signed char m1=get_reg(i_regs->regmap,dops[i].rs1);
+ signed char m2=get_reg(i_regs->regmap,dops[i].rs2);
signed char hi=get_reg(i_regs->regmap,HIREG);
signed char lo=get_reg(i_regs->regmap,LOREG);
assert(m1>=0);
assert(hi>=0);
assert(lo>=0);
- if(opcode2[i]==0x18) // MULT
+ if(dops[i].opcode2==0x18) // MULT
emit_smull(m1,m2,hi);
else // MULTU
emit_umull(m1,m2,hi);
case 0x1A: // DIV
case 0x1B: // DIVU
{
- signed char numerator=get_reg(i_regs->regmap,rs1[i]);
- signed char denominator=get_reg(i_regs->regmap,rs2[i]);
+ signed char numerator=get_reg(i_regs->regmap,dops[i].rs1);
+ signed char denominator=get_reg(i_regs->regmap,dops[i].rs2);
signed char quotient=get_reg(i_regs->regmap,LOREG);
signed char remainder=get_reg(i_regs->regmap,HIREG);
assert(numerator>=0);
assert(quotient>=0);
assert(remainder>=0);
- if (opcode2[i] == 0x1A) // DIV
+ if (dops[i].opcode2 == 0x1A) // DIV
emit_sdiv(numerator,denominator,quotient);
else // DIVU
emit_udiv(numerator,denominator,quotient);
// div 0 quotient (remainder is already correct)
host_tempreg_acquire();
- if (opcode2[i] == 0x1A) // DIV
+ if (dops[i].opcode2 == 0x1A) // DIV
emit_sub_asrimm(0,numerator,31,HOST_TEMPREG);
else
emit_movimm(~0,HOST_TEMPREG);
{
signed char hr=get_reg(i_regs->regmap,HIREG);
signed char lr=get_reg(i_regs->regmap,LOREG);
- if ((opcode2[i]==0x1A || opcode2[i]==0x1B) && rs2[i]==0) // div 0
+ if ((dops[i].opcode2==0x1A || dops[i].opcode2==0x1B) && dops[i].rs2==0) // div 0
{
- if (rs1[i]) {
- signed char numerator = get_reg(i_regs->regmap, rs1[i]);
+ if (dops[i].rs1) {
+ signed char numerator = get_reg(i_regs->regmap, dops[i].rs1);
assert(numerator >= 0);
if (hr >= 0)
emit_mov(numerator,hr);
if (lr >= 0) {
- if (opcode2[i] == 0x1A) // DIV
+ if (dops[i].opcode2 == 0x1A) // DIV
emit_sub_asrimm(0,numerator,31,lr);
else
emit_movimm(~0,lr);