mirror of
https://github.com/mupen64plus-ae/mupen64plus-core.git
synced 2024-11-30 09:00:43 +00:00
Merge pull request #615 from fzurita/store_stop_after_jal_in_save
Fixes for last save state update
This commit is contained in:
Richard Goedeken
GitHub
commit
8336328ce1
@ -195,7 +195,6 @@ 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 stop_after_jal_data[4];
|
||||
uint64_t flashram_status;
|
||||
|
||||
uint32_t* cp0_regs = r4300_cp0_regs(&dev->r4300.cp0);
|
||||
@ -285,14 +284,14 @@ static int savestates_load_m64p(struct device* dev, char *filepath)
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
else if (version >= 0x00010200 && version < 0x00010500) // saves entire eventqueue, 4-byte using_tlb flags and extra state
|
||||
else // version >= 0x00010200 saves entire eventqueue, 4-byte using_tlb flags and extra state
|
||||
{
|
||||
if (gzread(f, savestateData, savestateSize) != (int)savestateSize ||
|
||||
gzread(f, queue, sizeof(queue)) != sizeof(queue) ||
|
||||
gzread(f, using_tlb_data, sizeof(using_tlb_data)) != sizeof(using_tlb_data) ||
|
||||
gzread(f, data_0001_0200, sizeof(data_0001_0200)) != sizeof(data_0001_0200))
|
||||
{
|
||||
main_message(M64MSG_STATUS, OSD_BOTTOM_LEFT, "Could not read Mupen64Plus savestate 1.2 to 1.4 data from %s", filepath);
|
||||
main_message(M64MSG_STATUS, OSD_BOTTOM_LEFT, "Could not read Mupen64Plus savestate 1.2+ data from %s", filepath);
|
||||
free(savestateData);
|
||||
gzclose(f);
|
||||
SDL_UnlockMutex(savestates_lock);
|
||||
@ -300,30 +299,6 @@ static int savestates_load_m64p(struct device* dev, char *filepath)
|
||||
}
|
||||
}
|
||||
|
||||
else if (version == 0x00010500) // saves entire eventqueue, 4-byte using_tlb flags and extra state and stop_after_jal_state
|
||||
{
|
||||
if (gzread(f, savestateData, savestateSize) != (int)savestateSize ||
|
||||
gzread(f, queue, sizeof(queue)) != sizeof(queue) ||
|
||||
gzread(f, using_tlb_data, sizeof(using_tlb_data)) != sizeof(using_tlb_data) ||
|
||||
gzread(f, data_0001_0200, sizeof(data_0001_0200)) != sizeof(data_0001_0200) ||
|
||||
gzread(f, stop_after_jal_data, sizeof(stop_after_jal_data)) != sizeof(stop_after_jal_data))
|
||||
{
|
||||
main_message(M64MSG_STATUS, OSD_BOTTOM_LEFT, "Could not read Mupen64Plus savestate 1.5 data from %s", filepath);
|
||||
free(savestateData);
|
||||
gzclose(f);
|
||||
SDL_UnlockMutex(savestates_lock);
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
main_message(M64MSG_STATUS, OSD_BOTTOM_LEFT, "Could not read Mupen64Plus savestate %#010x data from %s", version, filepath);
|
||||
free(savestateData);
|
||||
gzclose(f);
|
||||
SDL_UnlockMutex(savestates_lock);
|
||||
return 0;
|
||||
}
|
||||
|
||||
gzclose(f);
|
||||
SDL_UnlockMutex(savestates_lock);
|
||||
|
||||
@ -395,7 +370,7 @@ static int savestates_load_m64p(struct device* dev, char *filepath)
|
||||
dev->vi.regs[VI_V_BURST_REG] = GETDATA(curr, uint32_t);
|
||||
dev->vi.regs[VI_X_SCALE_REG] = GETDATA(curr, uint32_t);
|
||||
dev->vi.regs[VI_Y_SCALE_REG] = GETDATA(curr, uint32_t);
|
||||
dev->vi.delay = GETDATA(curr, unsigned int);
|
||||
dev->vi.delay = GETDATA(curr, uint32_t);
|
||||
gfx.viStatusChanged();
|
||||
gfx.viWidthChanged();
|
||||
|
||||
@ -414,9 +389,9 @@ static int savestates_load_m64p(struct device* dev, char *filepath)
|
||||
dev->ai.regs[AI_STATUS_REG] = GETDATA(curr, uint32_t);
|
||||
dev->ai.regs[AI_DACRATE_REG] = GETDATA(curr, uint32_t);
|
||||
dev->ai.regs[AI_BITRATE_REG] = GETDATA(curr, uint32_t);
|
||||
dev->ai.fifo[1].duration = GETDATA(curr, unsigned int);
|
||||
dev->ai.fifo[1].duration = GETDATA(curr, uint32_t);
|
||||
dev->ai.fifo[1].length = GETDATA(curr, uint32_t);
|
||||
dev->ai.fifo[0].duration = GETDATA(curr, unsigned int);
|
||||
dev->ai.fifo[0].duration = GETDATA(curr, uint32_t);
|
||||
dev->ai.fifo[0].length = GETDATA(curr, uint32_t);
|
||||
/* best effort initialization of fifo addresses...
|
||||
* You might get a small sound "pop" because address might be wrong.
|
||||
@ -446,18 +421,18 @@ static int savestates_load_m64p(struct device* dev, char *filepath)
|
||||
COPYARRAY(dev->sp.mem, curr, uint32_t, SP_MEM_SIZE/4);
|
||||
COPYARRAY(dev->pif.ram, curr, uint8_t, PIF_RAM_SIZE);
|
||||
|
||||
dev->cart.use_flashram = GETDATA(curr, int);
|
||||
dev->cart.flashram.mode = GETDATA(curr, int);
|
||||
flashram_status = GETDATA(curr, unsigned long long);
|
||||
dev->cart.use_flashram = GETDATA(curr, int32_t);
|
||||
dev->cart.flashram.mode = GETDATA(curr, int32_t);
|
||||
flashram_status = GETDATA(curr, uint64_t);
|
||||
dev->cart.flashram.status[0] = (uint32_t)(flashram_status >> 32);
|
||||
dev->cart.flashram.status[1] = (uint32_t)(flashram_status);
|
||||
dev->cart.flashram.erase_offset = GETDATA(curr, unsigned int);
|
||||
dev->cart.flashram.write_pointer = GETDATA(curr, unsigned int);
|
||||
dev->cart.flashram.erase_offset = GETDATA(curr, uint32_t);
|
||||
dev->cart.flashram.write_pointer = GETDATA(curr, uint32_t);
|
||||
|
||||
COPYARRAY(dev->r4300.cp0.tlb.LUT_r, curr, uint32_t, 0x100000);
|
||||
COPYARRAY(dev->r4300.cp0.tlb.LUT_w, curr, uint32_t, 0x100000);
|
||||
|
||||
*r4300_llbit(&dev->r4300) = GETDATA(curr, unsigned int);
|
||||
*r4300_llbit(&dev->r4300) = GETDATA(curr, uint32_t);
|
||||
COPYARRAY(r4300_regs(&dev->r4300), curr, int64_t, 32);
|
||||
COPYARRAY(cp0_regs, curr, uint32_t, CP0_REGS_COUNT);
|
||||
*r4300_mult_lo(&dev->r4300) = GETDATA(curr, int64_t);
|
||||
@ -472,36 +447,36 @@ static int savestates_load_m64p(struct device* dev, char *filepath)
|
||||
|
||||
for (i = 0; i < 32; i++)
|
||||
{
|
||||
dev->r4300.cp0.tlb.entries[i].mask = GETDATA(curr, short);
|
||||
dev->r4300.cp0.tlb.entries[i].mask = GETDATA(curr, int16_t);
|
||||
curr += 2;
|
||||
dev->r4300.cp0.tlb.entries[i].vpn2 = GETDATA(curr, unsigned int);
|
||||
dev->r4300.cp0.tlb.entries[i].vpn2 = GETDATA(curr, uint32_t);
|
||||
dev->r4300.cp0.tlb.entries[i].g = GETDATA(curr, char);
|
||||
dev->r4300.cp0.tlb.entries[i].asid = GETDATA(curr, unsigned char);
|
||||
curr += 2;
|
||||
dev->r4300.cp0.tlb.entries[i].pfn_even = GETDATA(curr, unsigned int);
|
||||
dev->r4300.cp0.tlb.entries[i].pfn_even = GETDATA(curr, uint32_t);
|
||||
dev->r4300.cp0.tlb.entries[i].c_even = GETDATA(curr, char);
|
||||
dev->r4300.cp0.tlb.entries[i].d_even = GETDATA(curr, char);
|
||||
dev->r4300.cp0.tlb.entries[i].v_even = GETDATA(curr, char);
|
||||
curr++;
|
||||
dev->r4300.cp0.tlb.entries[i].pfn_odd = GETDATA(curr, unsigned int);
|
||||
dev->r4300.cp0.tlb.entries[i].pfn_odd = GETDATA(curr, uint32_t);
|
||||
dev->r4300.cp0.tlb.entries[i].c_odd = GETDATA(curr, char);
|
||||
dev->r4300.cp0.tlb.entries[i].d_odd = GETDATA(curr, char);
|
||||
dev->r4300.cp0.tlb.entries[i].v_odd = GETDATA(curr, char);
|
||||
dev->r4300.cp0.tlb.entries[i].r = GETDATA(curr, char);
|
||||
|
||||
dev->r4300.cp0.tlb.entries[i].start_even = GETDATA(curr, unsigned int);
|
||||
dev->r4300.cp0.tlb.entries[i].end_even = GETDATA(curr, unsigned int);
|
||||
dev->r4300.cp0.tlb.entries[i].phys_even = GETDATA(curr, unsigned int);
|
||||
dev->r4300.cp0.tlb.entries[i].start_odd = GETDATA(curr, unsigned int);
|
||||
dev->r4300.cp0.tlb.entries[i].end_odd = GETDATA(curr, unsigned int);
|
||||
dev->r4300.cp0.tlb.entries[i].phys_odd = GETDATA(curr, unsigned int);
|
||||
dev->r4300.cp0.tlb.entries[i].start_even = GETDATA(curr, uint32_t);
|
||||
dev->r4300.cp0.tlb.entries[i].end_even = GETDATA(curr, uint32_t);
|
||||
dev->r4300.cp0.tlb.entries[i].phys_even = GETDATA(curr, uint32_t);
|
||||
dev->r4300.cp0.tlb.entries[i].start_odd = GETDATA(curr, uint32_t);
|
||||
dev->r4300.cp0.tlb.entries[i].end_odd = GETDATA(curr, uint32_t);
|
||||
dev->r4300.cp0.tlb.entries[i].phys_odd = GETDATA(curr, uint32_t);
|
||||
}
|
||||
|
||||
savestates_load_set_pc(&dev->r4300, GETDATA(curr, uint32_t));
|
||||
|
||||
*r4300_cp0_next_interrupt(&dev->r4300.cp0) = GETDATA(curr, unsigned int);
|
||||
dev->vi.next_vi = GETDATA(curr, unsigned int);
|
||||
dev->vi.field = GETDATA(curr, unsigned int);
|
||||
*r4300_cp0_next_interrupt(&dev->r4300.cp0) = GETDATA(curr, uint32_t);
|
||||
dev->vi.next_vi = GETDATA(curr, uint32_t);
|
||||
dev->vi.field = GETDATA(curr, uint32_t);
|
||||
|
||||
// assert(savestateData+savestateSize == curr)
|
||||
|
||||
@ -509,10 +484,13 @@ static int savestates_load_m64p(struct device* dev, char *filepath)
|
||||
load_eventqueue_infos(&dev->r4300.cp0, queue);
|
||||
|
||||
#ifdef NEW_DYNAREC
|
||||
// Default this to 1, it will be updated by the correct save state version later
|
||||
stop_after_jal = 1;
|
||||
|
||||
if (version >= 0x00010100)
|
||||
{
|
||||
curr = using_tlb_data;
|
||||
using_tlb = GETDATA(curr, unsigned int);
|
||||
using_tlb = GETDATA(curr, uint32_t);
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -569,18 +547,18 @@ static int savestates_load_m64p(struct device* dev, char *filepath)
|
||||
unsigned int rom_bank, ram_bank, ram_enable, mbc1_mode, rtc_latch;
|
||||
time_t rtc_last_time;
|
||||
|
||||
unsigned int enabled = ALIGNED_GETDATA(curr, unsigned int);
|
||||
unsigned int bank = ALIGNED_GETDATA(curr, unsigned int);
|
||||
unsigned int access_mode = ALIGNED_GETDATA(curr, unsigned int);
|
||||
unsigned int access_mode_changed = ALIGNED_GETDATA(curr, unsigned int);
|
||||
unsigned int enabled = ALIGNED_GETDATA(curr, uint32_t);
|
||||
unsigned int bank = ALIGNED_GETDATA(curr, uint32_t);
|
||||
unsigned int access_mode = ALIGNED_GETDATA(curr, uint32_t);
|
||||
unsigned int access_mode_changed = ALIGNED_GETDATA(curr, uint32_t);
|
||||
COPYARRAY(gb_fingerprint, curr, uint8_t, GB_CART_FINGERPRINT_SIZE);
|
||||
if (gb_fingerprint[0] != 0) {
|
||||
rom_bank = ALIGNED_GETDATA(curr, unsigned int);
|
||||
ram_bank = ALIGNED_GETDATA(curr, unsigned int);
|
||||
ram_enable = ALIGNED_GETDATA(curr, unsigned int);
|
||||
mbc1_mode = ALIGNED_GETDATA(curr, unsigned int);
|
||||
rom_bank = ALIGNED_GETDATA(curr, uint32_t);
|
||||
ram_bank = ALIGNED_GETDATA(curr, uint32_t);
|
||||
ram_enable = ALIGNED_GETDATA(curr, uint32_t);
|
||||
mbc1_mode = ALIGNED_GETDATA(curr, uint32_t);
|
||||
COPYARRAY(rtc_regs, curr, uint8_t, MBC3_RTC_REGS_COUNT);
|
||||
rtc_latch = ALIGNED_GETDATA(curr, unsigned int);
|
||||
rtc_latch = ALIGNED_GETDATA(curr, uint32_t);
|
||||
COPYARRAY(rtc_latched_regs, curr, uint8_t, MBC3_RTC_REGS_COUNT);
|
||||
rtc_last_time = (time_t)ALIGNED_GETDATA(curr, int64_t);
|
||||
COPYARRAY(cam_regs, curr, uint8_t, POCKET_CAM_REGS_COUNT);
|
||||
@ -643,7 +621,7 @@ static int savestates_load_m64p(struct device* dev, char *filepath)
|
||||
}
|
||||
|
||||
/* extra vi state */
|
||||
dev->vi.count_per_scanline = ALIGNED_GETDATA(curr, unsigned int);
|
||||
dev->vi.count_per_scanline = ALIGNED_GETDATA(curr, uint32_t);
|
||||
|
||||
/* extra si state */
|
||||
dev->si.dma_dir = GETDATA(curr, uint8_t);
|
||||
@ -710,17 +688,17 @@ static int savestates_load_m64p(struct device* dev, char *filepath)
|
||||
unsigned int rom_bank, ram_bank, ram_enable, mbc1_mode, rtc_latch;
|
||||
time_t rtc_last_time;
|
||||
|
||||
unsigned int enabled = GETDATA(curr, unsigned int);
|
||||
unsigned int bank = GETDATA(curr, unsigned int);
|
||||
unsigned int access_mode = GETDATA(curr, unsigned int);
|
||||
unsigned int access_mode_changed = GETDATA(curr, unsigned int);
|
||||
unsigned int enabled = GETDATA(curr, uint32_t);
|
||||
unsigned int bank = GETDATA(curr, uint32_t);
|
||||
unsigned int access_mode = GETDATA(curr, uint32_t);
|
||||
unsigned int access_mode_changed = GETDATA(curr, uint32_t);
|
||||
COPYARRAY(gb_fingerprint, curr, uint8_t, GB_CART_FINGERPRINT_SIZE);
|
||||
if (gb_fingerprint[0] != 0) {
|
||||
rom_bank = GETDATA(curr, unsigned int);
|
||||
ram_bank = GETDATA(curr, unsigned int);
|
||||
ram_enable = GETDATA(curr, unsigned int);
|
||||
mbc1_mode = GETDATA(curr, unsigned int);
|
||||
rtc_latch = GETDATA(curr, unsigned int);
|
||||
rom_bank = GETDATA(curr, uint32_t);
|
||||
ram_bank = GETDATA(curr, uint32_t);
|
||||
ram_enable = GETDATA(curr, uint32_t);
|
||||
mbc1_mode = GETDATA(curr, uint32_t);
|
||||
rtc_latch = GETDATA(curr, uint32_t);
|
||||
rtc_last_time = (time_t)GETDATA(curr, int64_t);
|
||||
COPYARRAY(rtc_regs, curr, uint8_t, MBC3_RTC_REGS_COUNT);
|
||||
COPYARRAY(rtc_latched_regs, curr, uint8_t, MBC3_RTC_REGS_COUNT);
|
||||
@ -790,7 +768,7 @@ static int savestates_load_m64p(struct device* dev, char *filepath)
|
||||
dev->dp.do_on_unfreeze = GETDATA(curr, uint8_t);
|
||||
|
||||
/* extra vi state */
|
||||
dev->vi.count_per_scanline = GETDATA(curr, unsigned int);
|
||||
dev->vi.count_per_scanline = GETDATA(curr, uint32_t);
|
||||
|
||||
/* extra RDRAM register state */
|
||||
for (i = 1; i < RDRAM_MAX_MODULES_COUNT; ++i) {
|
||||
@ -845,21 +823,22 @@ static int savestates_load_m64p(struct device* dev, char *filepath)
|
||||
dev->dd.bm_write = (unsigned char)GETDATA(curr, uint32_t);
|
||||
dev->dd.bm_reset_held = (unsigned char)GETDATA(curr, uint32_t);
|
||||
dev->dd.bm_block = (unsigned char)GETDATA(curr, uint32_t);
|
||||
dev->dd.bm_zone = GETDATA(curr, unsigned int);
|
||||
dev->dd.bm_track_offset = GETDATA(curr, unsigned int);
|
||||
dev->dd.bm_zone = GETDATA(curr, uint32_t);
|
||||
dev->dd.bm_track_offset = GETDATA(curr, uint32_t);
|
||||
}
|
||||
else {
|
||||
curr += (3+DD_ASIC_REGS_COUNT)*sizeof(uint32_t) + 0x100 + 0x40 + 2*sizeof(int64_t) + 2*sizeof(unsigned int);
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef NEW_DYNAREC
|
||||
if (version >= 0x00010500)
|
||||
{
|
||||
curr = stop_after_jal_data;
|
||||
stop_after_jal = GETDATA(curr, unsigned int);
|
||||
}
|
||||
#ifdef NEW_DYNAREC
|
||||
stop_after_jal = GETDATA(curr, uint32_t);
|
||||
#else
|
||||
curr += sizeof(uint32_t);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -924,13 +903,6 @@ static int savestates_load_m64p(struct device* dev, char *filepath)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef NEW_DYNAREC
|
||||
if (version < 0x00010500)
|
||||
{
|
||||
stop_after_jal = 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Zilmar-Spec plugin expect a call with control_id = -1 when RAM processing is done */
|
||||
if (input.controllerCommand) {
|
||||
input.controllerCommand(-1, NULL);
|
||||
@ -981,7 +953,7 @@ static int savestates_load_pj64(struct device* dev,
|
||||
}
|
||||
curr += 4;
|
||||
|
||||
SaveRDRAMSize = GETDATA(curr, unsigned int);
|
||||
SaveRDRAMSize = GETDATA(curr, uint32_t);
|
||||
|
||||
/* Read the rest of the savestate into memory. */
|
||||
savestateSize = SaveRDRAMSize + 0x2754;
|
||||
@ -1008,7 +980,7 @@ static int savestates_load_pj64(struct device* dev,
|
||||
}
|
||||
|
||||
// vi_timer
|
||||
vi_timer = GETDATA(curr, unsigned int);
|
||||
vi_timer = GETDATA(curr, uint32_t);
|
||||
|
||||
// Program Counter
|
||||
*r4300_cp0_last_addr(&dev->r4300.cp0) = GETDATA(curr, uint32_t);
|
||||
@ -1084,8 +1056,8 @@ static int savestates_load_pj64(struct device* dev,
|
||||
dev->dp.dpc_regs[DPC_BUFBUSY_REG] = GETDATA(curr, uint32_t);
|
||||
dev->dp.dpc_regs[DPC_PIPEBUSY_REG] = GETDATA(curr, uint32_t);
|
||||
dev->dp.dpc_regs[DPC_TMEM_REG] = GETDATA(curr, uint32_t);
|
||||
(void)GETDATA(curr, unsigned int); // Dummy read
|
||||
(void)GETDATA(curr, unsigned int); // Dummy read
|
||||
(void)GETDATA(curr, uint32_t); // Dummy read
|
||||
(void)GETDATA(curr, uint32_t); // Dummy read
|
||||
|
||||
// mi_register
|
||||
dev->mi.regs[MI_INIT_MODE_REG] = GETDATA(curr, uint32_t);
|
||||
@ -1178,11 +1150,11 @@ static int savestates_load_pj64(struct device* dev,
|
||||
{
|
||||
unsigned int MyPageMask, MyEntryHi, MyEntryLo0, MyEntryLo1;
|
||||
|
||||
(void)GETDATA(curr, unsigned int); // Dummy read - EntryDefined
|
||||
MyPageMask = GETDATA(curr, unsigned int);
|
||||
MyEntryHi = GETDATA(curr, unsigned int);
|
||||
MyEntryLo0 = GETDATA(curr, unsigned int);
|
||||
MyEntryLo1 = GETDATA(curr, unsigned int);
|
||||
(void)GETDATA(curr, uint32_t); // Dummy read - EntryDefined
|
||||
MyPageMask = GETDATA(curr, uint32_t);
|
||||
MyEntryHi = GETDATA(curr, uint32_t);
|
||||
MyEntryLo0 = GETDATA(curr, uint32_t);
|
||||
MyEntryLo1 = GETDATA(curr, uint32_t);
|
||||
|
||||
// This is copied from TLBWI instruction
|
||||
dev->r4300.cp0.tlb.entries[i].g = (MyEntryLo0 & MyEntryLo1 & 1);
|
||||
@ -1533,7 +1505,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 + 4;
|
||||
save->size = 16788288 + sizeof(queue) + 4 + 4096;
|
||||
save->data = curr = malloc(save->size);
|
||||
if (save->data == NULL)
|
||||
{
|
||||
@ -1647,7 +1619,7 @@ static int savestates_save_m64p(const struct device* dev, char *filepath)
|
||||
PUTDATA(curr, uint32_t, dev->vi.regs[VI_V_BURST_REG]);
|
||||
PUTDATA(curr, uint32_t, dev->vi.regs[VI_X_SCALE_REG]);
|
||||
PUTDATA(curr, uint32_t, dev->vi.regs[VI_Y_SCALE_REG]);
|
||||
PUTDATA(curr, unsigned int, dev->vi.delay);
|
||||
PUTDATA(curr, uint32_t, dev->vi.delay);
|
||||
|
||||
PUTDATA(curr, uint32_t, dev->ri.regs[RI_MODE_REG]);
|
||||
PUTDATA(curr, uint32_t, dev->ri.regs[RI_CONFIG_REG]);
|
||||
@ -1664,9 +1636,9 @@ static int savestates_save_m64p(const struct device* dev, char *filepath)
|
||||
PUTDATA(curr, uint32_t, dev->ai.regs[AI_STATUS_REG]);
|
||||
PUTDATA(curr, uint32_t, dev->ai.regs[AI_DACRATE_REG]);
|
||||
PUTDATA(curr, uint32_t, dev->ai.regs[AI_BITRATE_REG]);
|
||||
PUTDATA(curr, unsigned int, dev->ai.fifo[1].duration);
|
||||
PUTDATA(curr, uint32_t, dev->ai.fifo[1].duration);
|
||||
PUTDATA(curr, uint32_t , dev->ai.fifo[1].length);
|
||||
PUTDATA(curr, unsigned int, dev->ai.fifo[0].duration);
|
||||
PUTDATA(curr, uint32_t, dev->ai.fifo[0].duration);
|
||||
PUTDATA(curr, uint32_t , dev->ai.fifo[0].length);
|
||||
|
||||
PUTDATA(curr, uint32_t, dev->dp.dpc_regs[DPC_START_REG]);
|
||||
@ -1700,18 +1672,18 @@ static int savestates_save_m64p(const struct device* dev, char *filepath)
|
||||
PUTARRAY(dev->sp.mem, curr, uint32_t, SP_MEM_SIZE/4);
|
||||
PUTARRAY(dev->pif.ram, curr, uint8_t, PIF_RAM_SIZE);
|
||||
|
||||
PUTDATA(curr, int, dev->cart.use_flashram);
|
||||
PUTDATA(curr, int, dev->cart.flashram.mode);
|
||||
PUTDATA(curr, int32_t, dev->cart.use_flashram);
|
||||
PUTDATA(curr, int32_t, dev->cart.flashram.mode);
|
||||
flashram_status = ((uint64_t)dev->cart.flashram.status[0] << 32) | dev->cart.flashram.status[1];
|
||||
PUTDATA(curr, unsigned long long, flashram_status);
|
||||
PUTDATA(curr, unsigned int, dev->cart.flashram.erase_offset);
|
||||
PUTDATA(curr, unsigned int, dev->cart.flashram.write_pointer);
|
||||
PUTDATA(curr, uint64_t, flashram_status);
|
||||
PUTDATA(curr, uint32_t, dev->cart.flashram.erase_offset);
|
||||
PUTDATA(curr, uint32_t, dev->cart.flashram.write_pointer);
|
||||
|
||||
PUTARRAY(dev->r4300.cp0.tlb.LUT_r, curr, unsigned int, 0x100000);
|
||||
PUTARRAY(dev->r4300.cp0.tlb.LUT_w, curr, unsigned int, 0x100000);
|
||||
PUTARRAY(dev->r4300.cp0.tlb.LUT_r, curr, uint32_t, 0x100000);
|
||||
PUTARRAY(dev->r4300.cp0.tlb.LUT_w, curr, uint32_t, 0x100000);
|
||||
|
||||
/* OK to cast away const qualifier */
|
||||
PUTDATA(curr, unsigned int, *r4300_llbit((struct r4300_core*)&dev->r4300));
|
||||
PUTDATA(curr, uint32_t, *r4300_llbit((struct r4300_core*)&dev->r4300));
|
||||
PUTARRAY(r4300_regs((struct r4300_core*)&dev->r4300), curr, int64_t, 32);
|
||||
PUTARRAY(cp0_regs, curr, uint32_t, CP0_REGS_COUNT);
|
||||
PUTDATA(curr, int64_t, *r4300_mult_lo((struct r4300_core*)&dev->r4300));
|
||||
@ -1724,43 +1696,43 @@ static int savestates_save_m64p(const struct device* dev, char *filepath)
|
||||
PUTDATA(curr, uint32_t, *r4300_cp1_fcr31((struct cp1*)&dev->r4300.cp1));
|
||||
for (i = 0; i < 32; i++)
|
||||
{
|
||||
PUTDATA(curr, short, dev->r4300.cp0.tlb.entries[i].mask);
|
||||
PUTDATA(curr, short, 0);
|
||||
PUTDATA(curr, unsigned int, dev->r4300.cp0.tlb.entries[i].vpn2);
|
||||
PUTDATA(curr, int16_t, dev->r4300.cp0.tlb.entries[i].mask);
|
||||
PUTDATA(curr, int16_t, 0);
|
||||
PUTDATA(curr, uint32_t, dev->r4300.cp0.tlb.entries[i].vpn2);
|
||||
PUTDATA(curr, char, dev->r4300.cp0.tlb.entries[i].g);
|
||||
PUTDATA(curr, unsigned char, dev->r4300.cp0.tlb.entries[i].asid);
|
||||
PUTDATA(curr, short, 0);
|
||||
PUTDATA(curr, unsigned int, dev->r4300.cp0.tlb.entries[i].pfn_even);
|
||||
PUTDATA(curr, int16_t, 0);
|
||||
PUTDATA(curr, uint32_t, dev->r4300.cp0.tlb.entries[i].pfn_even);
|
||||
PUTDATA(curr, char, dev->r4300.cp0.tlb.entries[i].c_even);
|
||||
PUTDATA(curr, char, dev->r4300.cp0.tlb.entries[i].d_even);
|
||||
PUTDATA(curr, char, dev->r4300.cp0.tlb.entries[i].v_even);
|
||||
PUTDATA(curr, char, 0);
|
||||
PUTDATA(curr, unsigned int, dev->r4300.cp0.tlb.entries[i].pfn_odd);
|
||||
PUTDATA(curr, uint32_t, dev->r4300.cp0.tlb.entries[i].pfn_odd);
|
||||
PUTDATA(curr, char, dev->r4300.cp0.tlb.entries[i].c_odd);
|
||||
PUTDATA(curr, char, dev->r4300.cp0.tlb.entries[i].d_odd);
|
||||
PUTDATA(curr, char, dev->r4300.cp0.tlb.entries[i].v_odd);
|
||||
PUTDATA(curr, char, dev->r4300.cp0.tlb.entries[i].r);
|
||||
|
||||
PUTDATA(curr, unsigned int, dev->r4300.cp0.tlb.entries[i].start_even);
|
||||
PUTDATA(curr, unsigned int, dev->r4300.cp0.tlb.entries[i].end_even);
|
||||
PUTDATA(curr, unsigned int, dev->r4300.cp0.tlb.entries[i].phys_even);
|
||||
PUTDATA(curr, unsigned int, dev->r4300.cp0.tlb.entries[i].start_odd);
|
||||
PUTDATA(curr, unsigned int, dev->r4300.cp0.tlb.entries[i].end_odd);
|
||||
PUTDATA(curr, unsigned int, dev->r4300.cp0.tlb.entries[i].phys_odd);
|
||||
PUTDATA(curr, uint32_t, dev->r4300.cp0.tlb.entries[i].start_even);
|
||||
PUTDATA(curr, uint32_t, dev->r4300.cp0.tlb.entries[i].end_even);
|
||||
PUTDATA(curr, uint32_t, dev->r4300.cp0.tlb.entries[i].phys_even);
|
||||
PUTDATA(curr, uint32_t, dev->r4300.cp0.tlb.entries[i].start_odd);
|
||||
PUTDATA(curr, uint32_t, dev->r4300.cp0.tlb.entries[i].end_odd);
|
||||
PUTDATA(curr, uint32_t, dev->r4300.cp0.tlb.entries[i].phys_odd);
|
||||
}
|
||||
PUTDATA(curr, uint32_t, *r4300_pc((struct r4300_core*)&dev->r4300));
|
||||
|
||||
PUTDATA(curr, unsigned int, *r4300_cp0_next_interrupt((struct cp0*)&dev->r4300.cp0));
|
||||
PUTDATA(curr, unsigned int, dev->vi.next_vi);
|
||||
PUTDATA(curr, unsigned int, dev->vi.field);
|
||||
PUTDATA(curr, uint32_t, *r4300_cp0_next_interrupt((struct cp0*)&dev->r4300.cp0));
|
||||
PUTDATA(curr, uint32_t, dev->vi.next_vi);
|
||||
PUTDATA(curr, uint32_t, dev->vi.field);
|
||||
|
||||
to_little_endian_buffer(queue, 4, sizeof(queue)/4);
|
||||
PUTARRAY(queue, curr, char, sizeof(queue));
|
||||
|
||||
#ifdef NEW_DYNAREC
|
||||
PUTDATA(curr, unsigned int, using_tlb);
|
||||
PUTDATA(curr, uint32_t, using_tlb);
|
||||
#else
|
||||
PUTDATA(curr, unsigned int, 0);
|
||||
PUTDATA(curr, uint32_t, 0);
|
||||
#endif
|
||||
|
||||
PUTDATA(curr, uint32_t, dev->ai.last_read);
|
||||
@ -1785,10 +1757,10 @@ static int savestates_save_m64p(const struct device* dev, char *filepath)
|
||||
}
|
||||
|
||||
for (i = 0; i < GAME_CONTROLLERS_COUNT; ++i) {
|
||||
PUTDATA(curr, unsigned int, dev->transferpaks[i].enabled);
|
||||
PUTDATA(curr, unsigned int, dev->transferpaks[i].bank);
|
||||
PUTDATA(curr, unsigned int, dev->transferpaks[i].access_mode);
|
||||
PUTDATA(curr, unsigned int, dev->transferpaks[i].access_mode_changed);
|
||||
PUTDATA(curr, uint32_t, dev->transferpaks[i].enabled);
|
||||
PUTDATA(curr, uint32_t, dev->transferpaks[i].bank);
|
||||
PUTDATA(curr, uint32_t, dev->transferpaks[i].access_mode);
|
||||
PUTDATA(curr, uint32_t, dev->transferpaks[i].access_mode_changed);
|
||||
|
||||
if (dev->transferpaks[i].gb_cart == NULL) {
|
||||
uint8_t gb_fingerprint[GB_CART_FINGERPRINT_SIZE];
|
||||
@ -1799,11 +1771,11 @@ static int savestates_save_m64p(const struct device* dev, char *filepath)
|
||||
uint8_t* rom = dev->transferpaks[i].gb_cart->irom_storage->data(dev->transferpaks[i].gb_cart->rom_storage);
|
||||
PUTARRAY(rom + GB_CART_FINGERPRINT_OFFSET, curr, uint8_t, GB_CART_FINGERPRINT_SIZE);
|
||||
|
||||
PUTDATA(curr, unsigned int, dev->transferpaks[i].gb_cart->rom_bank);
|
||||
PUTDATA(curr, unsigned int, dev->transferpaks[i].gb_cart->ram_bank);
|
||||
PUTDATA(curr, unsigned int, dev->transferpaks[i].gb_cart->ram_enable);
|
||||
PUTDATA(curr, unsigned int, dev->transferpaks[i].gb_cart->mbc1_mode);
|
||||
PUTDATA(curr, unsigned int, dev->transferpaks[i].gb_cart->rtc.latch);
|
||||
PUTDATA(curr, uint32_t, dev->transferpaks[i].gb_cart->rom_bank);
|
||||
PUTDATA(curr, uint32_t, dev->transferpaks[i].gb_cart->ram_bank);
|
||||
PUTDATA(curr, uint32_t, dev->transferpaks[i].gb_cart->ram_enable);
|
||||
PUTDATA(curr, uint32_t, dev->transferpaks[i].gb_cart->mbc1_mode);
|
||||
PUTDATA(curr, uint32_t, dev->transferpaks[i].gb_cart->rtc.latch);
|
||||
PUTDATA(curr, int64_t, dev->transferpaks[i].gb_cart->rtc.last_time);
|
||||
|
||||
PUTARRAY(dev->transferpaks[i].gb_cart->rtc.regs, curr, uint8_t, MBC3_RTC_REGS_COUNT);
|
||||
@ -1823,7 +1795,7 @@ static int savestates_save_m64p(const struct device* dev, char *filepath)
|
||||
|
||||
PUTDATA(curr, uint8_t, dev->dp.do_on_unfreeze);
|
||||
|
||||
PUTDATA(curr, unsigned int, dev->vi.count_per_scanline);
|
||||
PUTDATA(curr, uint32_t, dev->vi.count_per_scanline);
|
||||
|
||||
for (i = 1; i < RDRAM_MAX_MODULES_COUNT; ++i) {
|
||||
PUTDATA(curr, uint32_t, dev->rdram.regs[i][RDRAM_CONFIG_REG]);
|
||||
@ -1844,7 +1816,7 @@ static int savestates_save_m64p(const struct device* dev, char *filepath)
|
||||
|
||||
if (disk_id == NULL) {
|
||||
PUTDATA(curr, uint32_t, 0);
|
||||
curr += (3+DD_ASIC_REGS_COUNT)*sizeof(uint32_t) + 0x100 + 0x40 + 2*sizeof(int64_t) + 2*sizeof(unsigned int);
|
||||
curr += (3+DD_ASIC_REGS_COUNT)*sizeof(uint32_t) + 0x100 + 0x40 + 2*sizeof(int64_t) + 2*sizeof(uint32_t);
|
||||
}
|
||||
else {
|
||||
PUTDATA(curr, uint32_t, *disk_id);
|
||||
@ -1877,14 +1849,14 @@ static int savestates_save_m64p(const struct device* dev, char *filepath)
|
||||
PUTDATA(curr, uint32_t, dev->dd.bm_write);
|
||||
PUTDATA(curr, uint32_t, dev->dd.bm_reset_held);
|
||||
PUTDATA(curr, uint32_t, dev->dd.bm_block);
|
||||
PUTDATA(curr, unsigned int, dev->dd.bm_zone);
|
||||
PUTDATA(curr, unsigned int, dev->dd.bm_track_offset);
|
||||
PUTDATA(curr, uint32_t, dev->dd.bm_zone);
|
||||
PUTDATA(curr, uint32_t, dev->dd.bm_track_offset);
|
||||
}
|
||||
|
||||
#ifdef NEW_DYNAREC
|
||||
PUTDATA(curr, unsigned int, stop_after_jal);
|
||||
PUTDATA(curr, uint32_t, stop_after_jal);
|
||||
#else
|
||||
PUTDATA(curr, unsigned int, 0);
|
||||
PUTDATA(curr, uint32_t, 0);
|
||||
#endif
|
||||
|
||||
init_work(&save->work, savestates_save_m64p_work);
|
||||
@ -1962,8 +1934,8 @@ static int savestates_save_pj64(const struct device* dev,
|
||||
PUTDATA(curr, uint32_t, dev->dp.dpc_regs[DPC_BUFBUSY_REG]);
|
||||
PUTDATA(curr, uint32_t, dev->dp.dpc_regs[DPC_PIPEBUSY_REG]);
|
||||
PUTDATA(curr, uint32_t, dev->dp.dpc_regs[DPC_TMEM_REG]);
|
||||
PUTDATA(curr, unsigned int, 0); // ?
|
||||
PUTDATA(curr, unsigned int, 0); // ?
|
||||
PUTDATA(curr, uint32_t, 0); // ?
|
||||
PUTDATA(curr, uint32_t, 0); // ?
|
||||
|
||||
PUTDATA(curr, uint32_t, dev->mi.regs[MI_INIT_MODE_REG]); //TODO Secial handling in pj64
|
||||
PUTDATA(curr, uint32_t, dev->mi.regs[MI_VERSION_REG]);
|
||||
@ -2034,11 +2006,11 @@ static int savestates_save_pj64(const struct device* dev,
|
||||
| (dev->r4300.cp0.tlb.entries[i].d_odd << 2) | (dev->r4300.cp0.tlb.entries[i].v_odd << 1)
|
||||
| dev->r4300.cp0.tlb.entries[i].g;
|
||||
|
||||
PUTDATA(curr, unsigned int, EntryDefined);
|
||||
PUTDATA(curr, unsigned int, MyPageMask);
|
||||
PUTDATA(curr, unsigned int, MyEntryHi);
|
||||
PUTDATA(curr, unsigned int, MyEntryLo0);
|
||||
PUTDATA(curr, unsigned int, MyEntryLo1);
|
||||
PUTDATA(curr, uint32_t, EntryDefined);
|
||||
PUTDATA(curr, uint32_t, MyPageMask);
|
||||
PUTDATA(curr, uint32_t, MyEntryHi);
|
||||
PUTDATA(curr, uint32_t, MyEntryLo0);
|
||||
PUTDATA(curr, uint32_t, MyEntryLo1);
|
||||
}
|
||||
|
||||
PUTARRAY(dev->pif.ram, curr, uint8_t, PIF_RAM_SIZE);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user