diff --git a/mupen64plus-core/src/device/r4300/cp0.h b/mupen64plus-core/src/device/r4300/cp0.h index fb8355a..4fdb91b 100644 --- a/mupen64plus-core/src/device/r4300/cp0.h +++ b/mupen64plus-core/src/device/r4300/cp0.h @@ -172,7 +172,8 @@ enum { CP0_INTERRUPT_HANDLERS_COUNT = 13 }; enum { INTR_UNSAFE_R4300 = 0x01, - INTR_UNSAFE_RSP = 0x02, + INTR_UNSAFE_RSP = 0x02, + INTR_UNSAFE_RDP = 0x04, }; struct cp0 diff --git a/mupen64plus-core/src/device/rcp/rdp/rdp_core.c b/mupen64plus-core/src/device/rcp/rdp/rdp_core.c index bff231c..b8c1861 100644 --- a/mupen64plus-core/src/device/rcp/rdp/rdp_core.c +++ b/mupen64plus-core/src/device/rcp/rdp/rdp_core.c @@ -93,6 +93,7 @@ void poweron_rdp(struct rdp_core* dp) dp->dpc_regs[DPC_STATUS_REG] |= DPC_STATUS_START_GCLK | DPC_STATUS_PIPE_BUSY | DPC_STATUS_CBUF_READY; dp->do_on_unfreeze = 0; + dp->mi->r4300->cp0.interrupt_unsafe_state &= ~INTR_UNSAFE_RDP; poweron_fb(&dp->fb); } @@ -145,6 +146,7 @@ void write_dpc_regs(void* opaque, uint32_t address, uint32_t value, uint32_t mas if (dp->mi->regs[MI_INTR_REG] & MI_INTR_DP) { dp->mi->regs[MI_INTR_REG] &= ~MI_INTR_DP; + dp->mi->r4300->cp0.interrupt_unsafe_state |= INTR_UNSAFE_RDP; if (dp->dpc_regs[DPC_STATUS_REG] & DPC_STATUS_FREEZE) { dp->do_on_unfreeze |= DELAY_DP_INT; } else { @@ -181,6 +183,7 @@ void rdp_interrupt_event(void* opaque) gfx.fullSync(); + dp->mi->r4300->cp0.interrupt_unsafe_state &= ~INTR_UNSAFE_RDP; raise_rcp_interrupt(dp->mi, MI_INTR_DP); } diff --git a/mupen64plus-core/src/device/rcp/rsp/rsp_core.c b/mupen64plus-core/src/device/rcp/rsp/rsp_core.c index b9f5c76..083464a 100644 --- a/mupen64plus-core/src/device/rcp/rsp/rsp_core.c +++ b/mupen64plus-core/src/device/rcp/rsp/rsp_core.c @@ -342,6 +342,7 @@ void do_SP_Task(struct rsp_core* sp) if (sp->mi->regs[MI_INTR_REG] & MI_INTR_DP) { sp->mi->regs[MI_INTR_REG] &= ~MI_INTR_DP; + sp->mi->r4300->cp0.interrupt_unsafe_state |= INTR_UNSAFE_RDP; if (sp->dp->dpc_regs[DPC_STATUS_REG] & DPC_STATUS_FREEZE) { sp->dp->do_on_unfreeze |= DELAY_DP_INT; } else {