From 07510cfabd7f22280513ea529d29ee74b142bef9 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Mon, 30 Oct 2017 15:47:51 -0700 Subject: [PATCH] Update lazyusf2 with latest fixes. --- Frameworks/lazyusf/lazyusf/main/savestates.c | 4 ++-- Frameworks/lazyusf/lazyusf/ri/rdram.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Frameworks/lazyusf/lazyusf/main/savestates.c b/Frameworks/lazyusf/lazyusf/main/savestates.c index a15f114e2..fb96622ae 100644 --- a/Frameworks/lazyusf/lazyusf/main/savestates.c +++ b/Frameworks/lazyusf/lazyusf/main/savestates.c @@ -404,8 +404,8 @@ static int savestates_load_pj64(usf_state_t * state, unsigned char * ptr, unsign COPYARRAY(state->g_cp0_regs, curr, unsigned int, CP0_REGS_COUNT); set_fpr_pointers(state, state->g_cp0_regs[CP0_STATUS_REG]); - if ((state->g_cp0_regs[CP0_STATUS_REG] & 0x04000000) == 0) // TODO not sure how pj64 handles this - shuffle_fpr_data(state, 0x04000000, 0); + /*if ((state->g_cp0_regs[CP0_STATUS_REG] & 0x04000000) == 0) // pj64 always stores data depending on the current mode + shuffle_fpr_data(state, 0x04000000, 0);*/ // Initialze the interupts vi_timer += state->g_cp0_regs[CP0_COUNT_REG]; diff --git a/Frameworks/lazyusf/lazyusf/ri/rdram.c b/Frameworks/lazyusf/lazyusf/ri/rdram.c index efd6cb09b..0ea027b6f 100644 --- a/Frameworks/lazyusf/lazyusf/ri/rdram.c +++ b/Frameworks/lazyusf/lazyusf/ri/rdram.c @@ -94,8 +94,8 @@ int read_rdram_dram_tracked(void* opaque, uint32_t address, uint32_t* value) struct ri_controller* ri = &state->g_ri; uint32_t addr = rdram_dram_address(address); - if (!bit_array_test(state->barray_ram_written_first, addr / 4)) - bit_array_set(state->barray_ram_read, addr / 4); + if (!bit_array_test(state->barray_ram_written_first, addr)) + bit_array_set(state->barray_ram_read, addr); *value = ri->rdram.dram[addr]; @@ -108,8 +108,8 @@ int write_rdram_dram_tracked(void* opaque, uint32_t address, uint32_t value, uin struct ri_controller* ri = &state->g_ri; uint32_t addr = rdram_dram_address(address); - if (mask == 0xFFFFFFFFU && !bit_array_test(state->barray_ram_read, addr / 4)) - bit_array_set(state->barray_ram_written_first, addr / 4); + if (mask == 0xFFFFFFFFU && !bit_array_test(state->barray_ram_read, addr)) + bit_array_set(state->barray_ram_written_first, addr); masked_write(&ri->rdram.dram[addr], value, mask);