#include "pcnt.h"
#include "arm_features.h"
-#define CALLER_SAVE_REGS 0x0007ffff
-
#define unused __attribute__((unused))
void do_memhandler_pre();
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" };
|| 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) {
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(dops[i].itype==C1LS||dops[i].itype==C2LS||(rt>=0&&dops[i].rt1!=0)) {
{
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||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)
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_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);
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