md: fix sh2 thread restart behavior

ares-emulator · Oct 18, 2023 · 7b433f3 · 7b433f3
1 parent 1c61fc9
commit 7b433f3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/ares/md/m32x/io-external.cpp b/ares/md/m32x/io-external.cpp
@@ -158,8 +158,8 @@ auto M32X::writeExternalIO(n1 upper, n1 lower, n24 address, n16 data) -> void {
       io.adapterEnable = data.bit(0);
 
       if(data.bit(1) == 0) {
-        shm.power(true);
-        shs.power(true);
+        shm.restart();
+        shs.restart();
       }
 
       io.adapterReset = data.bit(1);

diff --git a/ares/md/m32x/m32x.hpp b/ares/md/m32x/m32x.hpp
@@ -39,6 +39,7 @@ struct M32X {
     auto main() -> void;
     auto step(u32 clocks) -> void override;
     auto power(bool reset) -> void;
+    auto restart() -> void;
 
     auto busReadByte(u32 address) -> u32 override;
     auto busReadWord(u32 address) -> u32 override;

diff --git a/ares/md/m32x/sh7604.cpp b/ares/md/m32x/sh7604.cpp
@@ -73,6 +73,14 @@ auto M32X::SH7604::power(bool reset) -> void {
   irq.vres.enable = 1;
 }
 
+auto M32X::SH7604::restart() -> void {
+  minCyclesBetweenSyncs = 20;
+  SH2::power(true);
+  irq = {};
+  irq.vres.enable = 1;
+  Thread::restart({&M32X::SH7604::main, this});
+}
+
 auto M32X::SH7604::busReadByte(u32 address) -> u32 {
   if(address & 1) {
     return m32x.readInternal(0, 1, address & ~1).byte(0);