notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: try to make gte stall handling less bloaty
[pcsx_rearmed.git]
/
libpcsxcore
/
new_dynarec
/
assem_arm64.c
diff --git
a/libpcsxcore/new_dynarec/assem_arm64.c
b/libpcsxcore/new_dynarec/assem_arm64.c
index
6380b27
..
17517ef
100644
(file)
--- a/
libpcsxcore/new_dynarec/assem_arm64.c
+++ b/
libpcsxcore/new_dynarec/assem_arm64.c
@@
-813,6
+813,12
@@
static void emit_cmovl_reg(u_int rs,u_int rt)
output_w32(0x1a800000 | (COND_LT << 12) | rm_rn_rd(rt, rs, rt));
}
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]);
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]);
@@
-1448,7
+1454,8
@@
static void do_readstub(int n)
emit_jmp(stubs[n].retaddr);
}
emit_jmp(stubs[n].retaddr);
}
-static void inline_readstub(enum stub_type type, int i, u_int addr, signed char regmap[], int target, int adj, u_int reglist)
+static void inline_readstub(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,target);
int rt=get_reg(regmap,target);
{
int rs=get_reg(regmap,target);
int rt=get_reg(regmap,target);
@@
-1607,7
+1614,8
@@
static void do_writestub(int n)
emit_jmp(stubs[n].retaddr);
}
emit_jmp(stubs[n].retaddr);
}
-static void inline_writestub(enum stub_type type, int i, u_int addr, signed char regmap[], int target, int adj, u_int reglist)
+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 rt = get_reg(regmap,target);
{
int rs = get_reg(regmap,-1);
int rt = get_reg(regmap,target);
@@
-1777,9
+1785,10
@@
static void get_bounds(void *addr, u_char **start, u_char **end)
/* Special assem */
/* Special assem */
-static void c2op_prologue(u_int op,u_int reglist)
+static void c2op_prologue(u_int op,
int i, const struct regstat *i_regs,
u_int reglist)
{
save_load_regs_all(1, reglist);
{
save_load_regs_all(1, reglist);
+ cop2_call_stall_check(op, i, i_regs, 0);
#ifdef PCNT
emit_movimm(op, 0);
emit_far_call(pcnt_gte_start);
#ifdef PCNT
emit_movimm(op, 0);
emit_far_call(pcnt_gte_start);
@@
-1797,7
+1806,7
@@
static void c2op_epilogue(u_int op,u_int reglist)
save_load_regs_all(0, reglist);
}
save_load_regs_all(0, reglist);
}
-static void c2op_assemble(int i,struct regstat *i_regs)
+static void c2op_assemble(int i,
const
struct regstat *i_regs)
{
u_int c2op=source[i]&0x3f;
u_int hr,reglist_full=0,reglist;
{
u_int c2op=source[i]&0x3f;
u_int hr,reglist_full=0,reglist;
@@
-1812,14
+1821,14
@@
static void c2op_assemble(int i,struct regstat *i_regs)
need_ir=(gte_unneeded[i+1]&0xe00)!=0xe00;
assem_debug("gte op %08x, unneeded %016lx, need_flags %d, need_ir %d\n",
source[i],gte_unneeded[i+1],need_flags,need_ir);
need_ir=(gte_unneeded[i+1]&0xe00)!=0xe00;
assem_debug("gte op %08x, unneeded %016lx, need_flags %d, need_ir %d\n",
source[i],gte_unneeded[i+1],need_flags,need_ir);
- if(
new_dynarec_hacks&NDHACK_GTE_NO_FLAGS
)
+ if(
HACK_ENABLED(NDHACK_GTE_NO_FLAGS)
)
need_flags=0;
//int shift = (source[i] >> 19) & 1;
//int lm = (source[i] >> 10) & 1;
switch(c2op) {
default:
(void)need_ir;
need_flags=0;
//int shift = (source[i] >> 19) & 1;
//int lm = (source[i] >> 10) & 1;
switch(c2op) {
default:
(void)need_ir;
- c2op_prologue(c2op,reglist);
+ c2op_prologue(c2op,
i, i_regs,
reglist);
emit_movimm(source[i],1); // opcode
emit_writeword(1,&psxRegs.code);
emit_far_call(need_flags?gte_handlers[c2op]:gte_handlers_nf[c2op]);
emit_movimm(source[i],1); // opcode
emit_writeword(1,&psxRegs.code);
emit_far_call(need_flags?gte_handlers[c2op]:gte_handlers_nf[c2op]);