From 293cb148cc605a0e0dd3fddd6d09df91194380de Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Wed, 20 Jul 2022 21:58:35 -0600 Subject: [PATCH] update core --- .../src/device/r4300/mips_instructions.def | 92 +++++++++---------- .../src/device/rcp/rsp/rsp_core.c | 4 +- 2 files changed, 49 insertions(+), 47 deletions(-) diff --git a/mupen64plus-core/src/device/r4300/mips_instructions.def b/mupen64plus-core/src/device/r4300/mips_instructions.def index d6be404..8f04ddf 100644 --- a/mupen64plus-core/src/device/r4300/mips_instructions.def +++ b/mupen64plus-core/src/device/r4300/mips_instructions.def @@ -591,7 +591,7 @@ DECLARE_INSTRUCTION(NOR) { DECLARE_R4300 rrd = ~(rrs | rrt); - cp0_add_count(r4300, 28, 1); + cp0_add_count(r4300, 28, 0); ADD_TO_PC(1); } @@ -724,7 +724,7 @@ DECLARE_INSTRUCTION(MULT) temp = rrs32 * (int64_t)rrt32; *r4300_mult_hi(r4300) = temp >> 32; *r4300_mult_lo(r4300) = SE32(temp); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -735,7 +735,7 @@ DECLARE_INSTRUCTION(MULTU) temp = (uint32_t) rrs * (uint64_t) ((uint32_t) rrt); *r4300_mult_hi(r4300) = (int64_t) temp >> 32; *r4300_mult_lo(r4300) = SE32(temp); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -783,7 +783,7 @@ DECLARE_INSTRUCTION(DMULT) if (!*r4300_mult_lo(r4300)) { (*r4300_mult_hi(r4300))++; } else { *r4300_mult_lo(r4300) = ~*r4300_mult_lo(r4300) + 1; } } - cp0_add_count(r4300, 4, 0); + cp0_add_count(r4300, 3, 1); ADD_TO_PC(1); } @@ -812,7 +812,7 @@ DECLARE_INSTRUCTION(DMULTU) *r4300_mult_lo(r4300) = result1 | (result2 << 32); *r4300_mult_hi(r4300) = (result3 & UINT64_C(0xFFFFFFFF)) | (result4 << 32); - cp0_add_count(r4300, 4, 0); + cp0_add_count(r4300, 3, 1); ADD_TO_PC(1); } @@ -837,7 +837,7 @@ DECLARE_INSTRUCTION(DIV) *r4300_mult_lo(r4300) = rrs32 < 0 ? 1 : -1; *r4300_mult_hi(r4300) = SE32(rrs32); } - cp0_add_count(r4300, 18, 1); + cp0_add_count(r4300, 18, 0); ADD_TO_PC(1); } @@ -854,7 +854,7 @@ DECLARE_INSTRUCTION(DIVU) *r4300_mult_lo(r4300) = -1; *r4300_mult_hi(r4300) = SE32(rrs32); } - cp0_add_count(r4300, 18, 1); + cp0_add_count(r4300, 18, 0); ADD_TO_PC(1); } @@ -879,7 +879,7 @@ DECLARE_INSTRUCTION(DDIV) *r4300_mult_lo(r4300) = rrs < 0 ? 1 : -1; *r4300_mult_hi(r4300) = rrs; } - cp0_add_count(r4300, 34, 1); + cp0_add_count(r4300, 34, 0); ADD_TO_PC(1); } @@ -896,7 +896,7 @@ DECLARE_INSTRUCTION(DDIVU) *r4300_mult_lo(r4300) = -1; *r4300_mult_hi(r4300) = rrs; } - cp0_add_count(r4300, 34, 1); + cp0_add_count(r4300, 34, 0); ADD_TO_PC(1); } @@ -1530,7 +1530,7 @@ DECLARE_INSTRUCTION(ABS_S) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } abs_s((r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 1, 1); + cp0_add_count(r4300, 1, 0); ADD_TO_PC(1); } @@ -1539,7 +1539,7 @@ DECLARE_INSTRUCTION(ABS_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } abs_d((r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 1, 1); + cp0_add_count(r4300, 1, 0); ADD_TO_PC(1); } @@ -1548,7 +1548,7 @@ DECLARE_INSTRUCTION(ADD_S) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } add_s(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cfft], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 1, 1); + cp0_add_count(r4300, 1, 0); ADD_TO_PC(1); } @@ -1557,7 +1557,7 @@ DECLARE_INSTRUCTION(ADD_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } add_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cfft], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 1, 1); + cp0_add_count(r4300, 1, 0); ADD_TO_PC(1); } @@ -1570,7 +1570,7 @@ DECLARE_INSTRUCTION(DIV_S) DebugMessage(M64MSG_ERROR, "DIV_S by 0"); } div_s(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cfft], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 14, 1); + cp0_add_count(r4300, 14, 0); ADD_TO_PC(1); } @@ -1588,7 +1588,7 @@ DECLARE_INSTRUCTION(DIV_D) //return; } div_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cfft], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 29, 0); + cp0_add_count(r4300, 28, 1); ADD_TO_PC(1); } @@ -1613,7 +1613,7 @@ DECLARE_INSTRUCTION(MUL_S) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } mul_s(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cfft], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1622,7 +1622,7 @@ DECLARE_INSTRUCTION(MUL_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } mul_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cfft], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 4, 0); + cp0_add_count(r4300, 3, 1); ADD_TO_PC(1); } @@ -1647,7 +1647,7 @@ DECLARE_INSTRUCTION(SQRT_S) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } sqrt_s(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 14, 1); + cp0_add_count(r4300, 14, 0); ADD_TO_PC(1); } @@ -1656,7 +1656,7 @@ DECLARE_INSTRUCTION(SQRT_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } sqrt_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 29, 0); + cp0_add_count(r4300, 28, 1); ADD_TO_PC(1); } @@ -1665,7 +1665,7 @@ DECLARE_INSTRUCTION(SUB_S) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } sub_s(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cfft], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 1, 1); + cp0_add_count(r4300, 1, 0); ADD_TO_PC(1); } @@ -1674,7 +1674,7 @@ DECLARE_INSTRUCTION(SUB_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } sub_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cfft], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 1, 1); + cp0_add_count(r4300, 1, 0); ADD_TO_PC(1); } @@ -1683,7 +1683,7 @@ DECLARE_INSTRUCTION(TRUNC_W_S) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } trunc_w_s((r4300_cp1_regs_simple(&r4300->cp1))[cffs], (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1692,7 +1692,7 @@ DECLARE_INSTRUCTION(TRUNC_W_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } trunc_w_d((r4300_cp1_regs_double(&r4300->cp1))[cffs], (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1701,7 +1701,7 @@ DECLARE_INSTRUCTION(TRUNC_L_S) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } trunc_l_s((r4300_cp1_regs_simple(&r4300->cp1))[cffs], (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1710,7 +1710,7 @@ DECLARE_INSTRUCTION(TRUNC_L_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } trunc_l_d((r4300_cp1_regs_double(&r4300->cp1))[cffs], (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1719,7 +1719,7 @@ DECLARE_INSTRUCTION(ROUND_W_S) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } round_w_s((r4300_cp1_regs_simple(&r4300->cp1))[cffs], (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1728,7 +1728,7 @@ DECLARE_INSTRUCTION(ROUND_W_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } round_w_d((r4300_cp1_regs_double(&r4300->cp1))[cffs], (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1737,7 +1737,7 @@ DECLARE_INSTRUCTION(ROUND_L_S) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } round_l_s((r4300_cp1_regs_simple(&r4300->cp1))[cffs], (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1746,7 +1746,7 @@ DECLARE_INSTRUCTION(ROUND_L_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } round_l_d((r4300_cp1_regs_double(&r4300->cp1))[cffs], (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1755,7 +1755,7 @@ DECLARE_INSTRUCTION(CEIL_W_S) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } ceil_w_s((r4300_cp1_regs_simple(&r4300->cp1))[cffs], (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1764,7 +1764,7 @@ DECLARE_INSTRUCTION(CEIL_W_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } ceil_w_d((r4300_cp1_regs_double(&r4300->cp1))[cffs], (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1773,7 +1773,7 @@ DECLARE_INSTRUCTION(CEIL_L_S) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } ceil_l_s((r4300_cp1_regs_simple(&r4300->cp1))[cffs], (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1782,7 +1782,7 @@ DECLARE_INSTRUCTION(CEIL_L_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } ceil_l_d((r4300_cp1_regs_double(&r4300->cp1))[cffs], (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1791,7 +1791,7 @@ DECLARE_INSTRUCTION(FLOOR_W_S) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } floor_w_s((r4300_cp1_regs_simple(&r4300->cp1))[cffs], (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1800,7 +1800,7 @@ DECLARE_INSTRUCTION(FLOOR_W_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } floor_w_d((r4300_cp1_regs_double(&r4300->cp1))[cffs], (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1809,7 +1809,7 @@ DECLARE_INSTRUCTION(FLOOR_L_S) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } floor_l_s((r4300_cp1_regs_simple(&r4300->cp1))[cffs], (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1818,7 +1818,7 @@ DECLARE_INSTRUCTION(FLOOR_L_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } floor_l_d((r4300_cp1_regs_double(&r4300->cp1))[cffs], (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1827,7 +1827,7 @@ DECLARE_INSTRUCTION(CVT_S_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } cvt_s_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 1, 0); + cp0_add_count(r4300, 0, 1); ADD_TO_PC(1); } @@ -1836,7 +1836,7 @@ DECLARE_INSTRUCTION(CVT_S_W) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } cvt_s_w(*r4300_cp1_fcr31(&r4300->cp1), (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1845,7 +1845,7 @@ DECLARE_INSTRUCTION(CVT_S_L) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } cvt_s_l(*r4300_cp1_fcr31(&r4300->cp1), (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1862,7 +1862,7 @@ DECLARE_INSTRUCTION(CVT_D_W) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } cvt_d_w((int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1871,7 +1871,7 @@ DECLARE_INSTRUCTION(CVT_D_L) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } cvt_d_l(*r4300_cp1_fcr31(&r4300->cp1), (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffs], (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1880,7 +1880,7 @@ DECLARE_INSTRUCTION(CVT_W_S) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } cvt_w_s(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1889,7 +1889,7 @@ DECLARE_INSTRUCTION(CVT_W_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } cvt_w_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (int32_t*) (r4300_cp1_regs_simple(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1898,7 +1898,7 @@ DECLARE_INSTRUCTION(CVT_L_S) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } cvt_l_s(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_simple(&r4300->cp1))[cffs], (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } @@ -1907,7 +1907,7 @@ DECLARE_INSTRUCTION(CVT_L_D) DECLARE_R4300 if (check_cop1_unusable(r4300)) { return; } cvt_l_d(*r4300_cp1_fcr31(&r4300->cp1), (r4300_cp1_regs_double(&r4300->cp1))[cffs], (int64_t*) (r4300_cp1_regs_double(&r4300->cp1))[cffd]); - cp0_add_count(r4300, 2, 1); + cp0_add_count(r4300, 2, 0); ADD_TO_PC(1); } diff --git a/mupen64plus-core/src/device/rcp/rsp/rsp_core.c b/mupen64plus-core/src/device/rcp/rsp/rsp_core.c index 49f6b3c..7d782b3 100644 --- a/mupen64plus-core/src/device/rcp/rsp/rsp_core.c +++ b/mupen64plus-core/src/device/rcp/rsp/rsp_core.c @@ -335,7 +335,7 @@ void do_SP_Task(struct rsp_core* sp) if (sp->dp->dpc_regs[DPC_STATUS_REG] & DPC_STATUS_FREEZE) { sp->dp->do_on_unfreeze |= DELAY_DP_INT; } else { - add_interrupt_event(&sp->mi->r4300->cp0, DP_INT, sp_delay_time + 4000); + add_interrupt_event(&sp->mi->r4300->cp0, DP_INT, sp_delay_time * 4); } } protect_framebuffers(&sp->dp->fb); @@ -360,6 +360,8 @@ void do_SP_Task(struct rsp_core* sp) sp->regs2[SP_PC_REG] |= save_pc; } + if (sp->rsp_status) + sp_delay_time = sp->rsp_delay_time; sp->rsp_status = sp->regs[SP_STATUS_REG]; if ((sp->regs[SP_STATUS_REG] & (SP_STATUS_HALT | SP_STATUS_BROKE)) == 0 && !get_event(&sp->mi->r4300->cp0.q, RSP_TSK_EVT)) {