From e058ba5d3b1ff106bd3747d3ad4a55a714a22d45 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Fri, 27 Aug 2021 18:20:40 +0200 Subject: [PATCH] sh4: always perform hard-reset of sh4 and its registers Fixes infinite loop after reboot --- core/emulator.cpp | 2 +- core/hw/sh4/sh4_mem.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/emulator.cpp b/core/emulator.cpp index 968e3dbf1..8705c8b65 100644 --- a/core/emulator.cpp +++ b/core/emulator.cpp @@ -339,7 +339,7 @@ void dc_reset(bool hard) if (hard) _vmem_unprotect_vram(0, VRAM_SIZE); devicesReset(hard); - sh4_cpu.Reset(hard); + sh4_cpu.Reset(true); mem_Reset(hard); } diff --git a/core/hw/sh4/sh4_mem.cpp b/core/hw/sh4/sh4_mem.cpp index 0750398fd..4d135c668 100644 --- a/core/hw/sh4/sh4_mem.cpp +++ b/core/hw/sh4/sh4_mem.cpp @@ -198,7 +198,7 @@ void mem_Reset(bool hard) //Reset registers sh4_area0_Reset(hard); - sh4_mmr_reset(hard); + sh4_mmr_reset(true); MMU_reset(); }