RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

svp drc, fix crash in jump patch

Browse source
This commit is contained in:
kub 2023-04-11 19:08:36 +00:00
parent 134092feb7
commit a80b0b42e1
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
cpu/drc/emit_arm.c
View file

@ -479,7 +479,7 @@ static void emith_op_imm2(int cond, int s, int op, int rd, int rn, unsigned int
} }
// count insns needed for mov/orr #imm // count insns needed for mov/orr #imm
#ifdef HAVE_ARMV7 #ifdef HAVE_ARMV7
for (i = 2, u = v; i > 0; i--, u >>= 8) for (i = 2, u = v; i > 0 && u; i--, u >>= 8)
while (u > 0xff && !(u & 3)) while (u > 0xff && !(u & 3))
u >>= 2; u >>= 2;
if (u) { // 3+ insns needed... if (u) { // 3+ insns needed...
@ -492,7 +492,7 @@ static void emith_op_imm2(int cond, int s, int op, int rd, int rn, unsigned int
return; return;
} }
#else #else
for (i = 2, u = v; i > 0; i--, u >>= 8) for (i = 2, u = v; i > 0 && u; i--, u >>= 8)
while (u > 0xff && !(u & 3)) while (u > 0xff && !(u & 3))
u >>= 2; u >>= 2;
if (u) { // 3+ insns needed... if (u) { // 3+ insns needed...
@ -559,6 +559,10 @@ static void emith_op_imm2(int cond, int s, int op, int rd, int rn, unsigned int
rn = rd; rn = rd;
v >>= 8, ror2 -= 8/2; v >>= 8, ror2 -= 8/2;
if (v && s) {
elprintf(EL_STATUS|EL_SVP|EL_ANOMALY, "op+s %x value too big", op);
exit(1);
}
} while (v); } while (v);
} }
@ -617,7 +621,10 @@ static void emith_pool_commit(int jumpover)
if (sz == 0) if (sz == 0)
return; return;
// need branch over pool if not at block end // need branch over pool if not at block end
if (jumpover) { if (jumpover < 0 && sz == sizeof(u32)) {
// hack for SVP drc (patch logic detects distance 4)
sz += sizeof(u32);
} else if (jumpover) {
pool += sizeof(u32); pool += sizeof(u32);
emith_xbranch(A_COND_AL, (u8 *)pool + sz, 0); emith_xbranch(A_COND_AL, (u8 *)pool + sz, 0);
} }

10
pico/carthw/svp/compiler.c
View file

@ -359,7 +359,7 @@ static void tr_mov16(int r, int val)
static void tr_mov16_cond(int cond, int r, int val) static void tr_mov16_cond(int cond, int r, int val)
{ {
emith_op_imm(cond, 0, A_OP_MOV, r, val); emith_move_r_imm_c(cond, r, val);
hostreg_r[r] = -1; hostreg_r[r] = -1;
} }
@ -1437,7 +1437,7 @@ static int translate_op(unsigned int op, int *pc, int imm, int *end_cond, int *j
tmpv = tr_cond_check(op); tmpv = tr_cond_check(op);
if (tmpv != A_COND_AL) { if (tmpv != A_COND_AL) {
jump_op = tcache_ptr; jump_op = tcache_ptr;
EOP_MOV_IMM(0, 0, 0); // placeholder for branch EOP_C_B(tmpv, 0, 0); // placeholder for branch
} }
tr_mov16(0, *pc); tr_mov16(0, *pc);
tr_r0_to_STACK(*pc); tr_r0_to_STACK(*pc);
@ -1792,8 +1792,8 @@ void *ssp_translate_block(int pc)
tr_flush_dirty_ST(); tr_flush_dirty_ST();
tr_flush_dirty_pmcrs(); tr_flush_dirty_pmcrs();
block_end = emit_block_epilogue(ccount, end_cond, jump_pc, pc); block_end = emit_block_epilogue(ccount, end_cond, jump_pc, pc);
emith_pool_commit(0);
emith_flush(); emith_flush();
emith_pool_commit(-1);
if (tcache_ptr - (u32 *)tcache > DRC_TCACHE_SIZE/4) { if (tcache_ptr - (u32 *)tcache > DRC_TCACHE_SIZE/4) {
elprintf(EL_ANOMALY|EL_STATUS|EL_SVP, "tcache overflow!\n"); elprintf(EL_ANOMALY|EL_STATUS|EL_SVP, "tcache overflow!\n");
@ -1803,8 +1803,8 @@ void *ssp_translate_block(int pc)
// stats // stats
nblocks++; nblocks++;
//printf("%i blocks, %i bytes, k=%.3f\n", nblocks, (tcache_ptr - tcache)*4, //printf("%i blocks, %i bytes, k=%.3f\n", nblocks, (u8 *)tcache_ptr - tcache,
// (double)(tcache_ptr - tcache) / (double)n_in_ops); // (double)((u8 *)tcache_ptr - tcache) / (double)n_in_ops);
#ifdef DUMP_BLOCK #ifdef DUMP_BLOCK
{ {