update core

This commit is contained in:
Logan McNaughton committed 2022-08-18 13:07:00 -06:00
1 parent e0a9294f3c
commit 370e3edfd4
5 files changed
+30 -13

No files matched your search

+4 -2
View File
@@ -76,7 +76,8 @@ void icache_step(struct r4300_core* r4300)
(*r4300_pc_struct(r4300))->ops == cached_interp_NOTCOMPILED2 || \
(*r4300_pc_struct(r4300))->ops == cached_interp_FIN_BLOCK)
return;
do_SP_Task(r4300->sp);
if (!r4300->sp->rsp_wait)
do_SP_Task(r4300->sp);
cp0_base_cycle(r4300);
uint32_t address = (*r4300_pc_struct(r4300))->phys_addr;
if ((*r4300_pc_struct(r4300))->cached)
@@ -94,7 +95,8 @@ void icache_step(struct r4300_core* r4300)
uint32_t* icache_fetch(struct r4300_core* r4300, uint32_t address)
{
do_SP_Task(r4300->sp);
if (!r4300->sp->rsp_wait)
do_SP_Task(r4300->sp);
cp0_base_cycle(r4300);
if (r4300_translate_address(r4300, &address, &r4300->cached, 2))
return NULL;
@@ -44,6 +44,7 @@ static void update_dpc_status(struct rdp_core* dp, uint32_t w)
{
gfx.fullSync();
dp->mi->r4300->cp0.interrupt_unsafe_state &= ~INTR_UNSAFE_RDP;
dp->sp->rsp_wait &= ~WAIT_PENDING_DP_SYNC;
signal_rcp_interrupt(dp->mi, MI_INTR_DP);
}
if (dp->do_on_unfreeze & DELAY_UPDATESCREEN)
@@ -188,6 +189,7 @@ void rdp_interrupt_event(void* opaque)
gfx.fullSync();
dp->mi->r4300->cp0.interrupt_unsafe_state &= ~INTR_UNSAFE_RDP;
dp->sp->rsp_wait &= ~WAIT_PENDING_DP_SYNC;
raise_rcp_interrupt(dp->mi, MI_INTR_DP);
}
+12 -9
View File
@@ -137,13 +137,18 @@ static void fifo_pop(struct rsp_core* sp)
static void update_sp_status(struct rsp_core* sp, uint32_t w)
{
/* clear / set halt */
if ((w & SP_CLR_HALT) && !(w & SP_SET_HALT)) sp->regs[SP_STATUS_REG] &= ~SP_STATUS_HALT;
if ((w & SP_CLR_HALT) && !(w & SP_SET_HALT))
{
sp->rsp_wait &= ~WAIT_HALTED;
sp->regs[SP_STATUS_REG] &= ~SP_STATUS_HALT;
}
if ((w & SP_SET_HALT) && !(w & SP_CLR_HALT))
{
remove_event(&sp->mi->r4300->cp0.q, SP_INT);
sp->rsp_status = 0;
sp->first_run = 1;
sp->next_rsp_run = 0;
sp->rsp_wait |= WAIT_HALTED;
sp->regs[SP_STATUS_REG] |= SP_STATUS_HALT;
}
@@ -154,6 +159,7 @@ static void update_sp_status(struct rsp_core* sp, uint32_t w)
if ((w & SP_CLR_INTR) && !(w & SP_SET_INTR))
{
clear_rcp_interrupt(sp->mi, MI_INTR_SP);
sp->rsp_wait &= ~WAIT_PENDING_SP_INT;
}
/* set SP interrupt */
if ((w & SP_SET_INTR) && !(w & SP_CLR_INTR))
@@ -225,6 +231,7 @@ void poweron_rsp(struct rsp_core* sp)
sp->first_run = 1;
sp->next_rsp_run = 0;
sp->last_cp0_count = 0;
sp->rsp_wait = 0;
sp->mi->r4300->cp0.interrupt_unsafe_state &= ~INTR_UNSAFE_RSP;
sp->regs[SP_STATUS_REG] = 1;
}
@@ -319,14 +326,6 @@ void write_rsp_regs2(void* opaque, uint32_t address, uint32_t value, uint32_t ma
void do_SP_Task(struct rsp_core* sp)
{
if (sp->regs[SP_STATUS_REG] & SP_STATUS_HALT)
return;
if (get_event(&sp->mi->r4300->cp0.q, SP_INT))
return;
if (get_event(&sp->mi->r4300->cp0.q, DP_INT))
return;
if (sp->mi->regs[MI_INTR_REG] & MI_INTR_SP)
return;
const uint32_t* cp0_regs = r4300_cp0_regs(&sp->mi->r4300->cp0);
sp->next_rsp_run += cp0_regs[CP0_COUNT_REG] - sp->last_cp0_count;
sp->last_cp0_count = cp0_regs[CP0_COUNT_REG];
@@ -343,6 +342,7 @@ void do_SP_Task(struct rsp_core* sp)
{
sp->mi->regs[MI_INTR_REG] &= ~MI_INTR_DP;
sp->mi->r4300->cp0.interrupt_unsafe_state |= INTR_UNSAFE_RDP;
sp->rsp_wait |= WAIT_PENDING_DP_SYNC;
if (sp->dp->dpc_regs[DPC_STATUS_REG] & DPC_STATUS_FREEZE) {
sp->dp->do_on_unfreeze |= DELAY_DP_INT;
} else {
@@ -358,16 +358,19 @@ void do_SP_Task(struct rsp_core* sp)
}
else
{
sp->rsp_wait |= WAIT_HALTED;
sp->next_rsp_run = 0;
sp->first_run = 1;
}
if ((sp->regs[SP_STATUS_REG] & SP_STATUS_BROKE) && (sp->regs[SP_STATUS_REG] & SP_STATUS_INTR_BREAK))
{
sp->rsp_wait |= WAIT_PENDING_SP_INT;
add_interrupt_event(&sp->mi->r4300->cp0, SP_INT, rsp_cycles);
sp->regs[SP_STATUS_REG] = saved_status;
}
else if (sp->mi->regs[MI_INTR_REG] & MI_INTR_SP)
{
sp->rsp_wait |= WAIT_PENDING_SP_INT;
add_interrupt_event(&sp->mi->r4300->cp0, SP_INT, rsp_cycles);
}
sp->mi->r4300->cp0.interrupt_unsafe_state |= INTR_UNSAFE_RSP;
@@ -111,6 +111,13 @@ enum sp_dma_dir
SP_DMA_WRITE
};
enum sp_rsp_wait
{
WAIT_PENDING_SP_INT = 0x1,
WAIT_PENDING_DP_SYNC = 0x2,
WAIT_HALTED = 0x4
};
enum { SP_DMA_FIFO_SIZE = 2} ;
struct sp_dma
@@ -130,6 +137,7 @@ struct rsp_core
uint32_t first_run;
uint32_t last_cp0_count;
int32_t next_rsp_run;
uint32_t rsp_wait;
struct mi_controller* mi;
struct rdp_core* dp;
+4 -2
View File
@@ -205,7 +205,7 @@ static int savestates_load_m64p(struct device* dev, char *filepath)
char queue[1024];
unsigned char using_tlb_data[4];
unsigned char data_0001_0200[4096]; // 4k for extra state from v1.2
unsigned char data_0001_0900[2129936]; // extra state from v1.9
unsigned char data_0001_0900[2129940]; // extra state from v1.9
uint32_t* cp0_regs = r4300_cp0_regs(&dev->r4300.cp0);
@@ -913,6 +913,7 @@ static int savestates_load_m64p(struct device* dev, char *filepath)
dev->sp.first_run = GETDATA(curr, uint32_t);
dev->sp.last_cp0_count = GETDATA(curr, uint32_t);
dev->sp.next_rsp_run = GETDATA(curr, int32_t);
dev->sp.rsp_wait = GETDATA(curr, uint32_t);
}
}
else
@@ -1575,7 +1576,7 @@ static int savestates_save_m64p(const struct device* dev, char *filepath)
save_eventqueue_infos(&dev->r4300.cp0, queue);
// Allocate memory for the save state data
save->size = 16788288 + sizeof(queue) + 4 + 4096 + 2129936;
save->size = 16788288 + sizeof(queue) + 4 + 4096 + 2129940;
save->data = curr = malloc(save->size);
if (save->data == NULL)
{
@@ -1965,6 +1966,7 @@ static int savestates_save_m64p(const struct device* dev, char *filepath)
PUTDATA(curr, uint32_t, dev->sp.first_run);
PUTDATA(curr, uint32_t, dev->sp.last_cp0_count);
PUTDATA(curr, int32_t, dev->sp.next_rsp_run);
PUTDATA(curr, uint32_t, dev->sp.rsp_wait);
init_work(&save->work, savestates_save_m64p_work);
queue_work(&save->work);