From 339c0936882294c38d567c1ea4592eada09cd35d Mon Sep 17 00:00:00 2001 From: Logan McNaughton <848146+loganmc10@users.noreply.github.com> Date: Tue, 16 Aug 2022 17:02:07 -0600 Subject: [PATCH] update core --- mupen64plus-core/src/device/r4300/dcache.c | 3 ++- mupen64plus-core/src/device/r4300/icache.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mupen64plus-core/src/device/r4300/dcache.c b/mupen64plus-core/src/device/r4300/dcache.c index 6ec5adf..942e294 100644 --- a/mupen64plus-core/src/device/r4300/dcache.c +++ b/mupen64plus-core/src/device/r4300/dcache.c @@ -22,6 +22,7 @@ #include #include "device/r4300/r4300_core.h" +#include "device/rdram/rdram.h" #include "device/memory/memory.h" void poweron_dcache(struct datacache *lines) @@ -33,7 +34,7 @@ void poweron_dcache(struct datacache *lines) void dcache_writeback(struct r4300_core* r4300, struct datacache *line) { - // cp0_dcb_interlock(r4300, 24); + cp0_dcb_interlock(r4300, rdram_calculate_cycles(16)); line->dirty = 0; uint32_t cache_address = line->tag | line->index; invalidate_r4300_cached_code(r4300, R4300_KSEG0 + cache_address, 16); diff --git a/mupen64plus-core/src/device/r4300/icache.c b/mupen64plus-core/src/device/r4300/icache.c index 0e8e005..0232b30 100644 --- a/mupen64plus-core/src/device/r4300/icache.c +++ b/mupen64plus-core/src/device/r4300/icache.c @@ -22,6 +22,7 @@ #include #include "device/r4300/r4300_core.h" +#include "device/rdram/rdram.h" #include "device/r4300/cached_interp.h" #include "device/memory/memory.h" #include "device/rcp/rsp/rsp_core.h" @@ -35,7 +36,7 @@ void poweron_icache(struct instcache *lines) void icache_writeback(struct r4300_core* r4300, struct instcache *line) { - // cp0_icb_interlock(r4300, 48); + cp0_icb_interlock(r4300, rdram_calculate_cycles(32)); uint32_t cache_address = line->tag | line->index; invalidate_r4300_cached_code(r4300, R4300_KSEG0 + cache_address, 32); invalidate_r4300_cached_code(r4300, R4300_KSEG1 + cache_address, 32);