v111.4

Serialization improvements.

bsnes/emulator/emulator.hpp

@@ -29,7 +29,7 @@ using namespace nall;
 
 namespace Emulator {
   static const string Name    = "bsnes";
-  static const string Version = "111.3";
+  static const string Version = "111.4";
   static const string Author  = "byuu";
   static const string License = "GPLv3";
   static const string Website = "https://byuu.org";

bsnes/sfc/coprocessor/armdsp/armdsp.cpp

@@ -7,14 +7,13 @@ namespace SuperFamicom {
 ArmDSP armdsp;
 
 auto ArmDSP::synchronizeCPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(clock >= 0) co_switch(cpu.thread);
+  if(clock >= 0) scheduler.resume(cpu.thread);
 }
 
 auto ArmDSP::Enter() -> void {
   armdsp.boot();
   while(true) {
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     armdsp.main();
   }
 }

bsnes/sfc/coprocessor/epsonrtc/epsonrtc.cpp

@@ -8,13 +8,12 @@ namespace SuperFamicom {
 EpsonRTC epsonrtc;
 
 auto EpsonRTC::synchronizeCPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(clock >= 0) co_switch(cpu.thread);
+  if(clock >= 0) scheduler.resume(cpu.thread);
 }
 
 auto EpsonRTC::Enter() -> void {
   while(true) {
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     epsonrtc.main();
   }
 }

bsnes/sfc/coprocessor/event/event.cpp

@@ -6,13 +6,12 @@ namespace SuperFamicom {
 Event event;
 
 auto Event::synchronizeCPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(clock >= 0) co_switch(cpu.thread);
+  if(clock >= 0) scheduler.resume(cpu.thread);
 }
 
 auto Event::Enter() -> void {
   while(true) {
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     event.main();
   }
 }

bsnes/sfc/coprocessor/hitachidsp/hitachidsp.cpp

@@ -9,13 +9,12 @@ namespace SuperFamicom {
 HitachiDSP hitachidsp;
 
 auto HitachiDSP::synchronizeCPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(clock >= 0) co_switch(cpu.thread);
+  if(clock >= 0) scheduler.resume(cpu.thread);
 }
 
 auto HitachiDSP::Enter() -> void {
   while(true) {
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     hitachidsp.main();
   }
 }

bsnes/sfc/coprocessor/icd/icd.cpp

@@ -48,13 +48,15 @@ namespace SameBoy {
 }
 
 auto ICD::synchronizeCPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(clock >= 0) co_switch(cpu.thread);
+  if(clock >= 0) {
+    scheduler.desynchronize();
+    co_switch(cpu.thread);
+  }
 }
 
 auto ICD::Enter() -> void {
   while(true) {
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     icd.main();
   }
 }

bsnes/sfc/coprocessor/msu1/msu1.cpp

@@ -7,14 +7,13 @@ MSU1 msu1;
 #include "serialization.cpp"
 
 auto MSU1::synchronizeCPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(clock >= 0) co_switch(cpu.thread);
+  if(clock >= 0) scheduler.resume(cpu.thread);
 }
 
 
 auto MSU1::Enter() -> void {
   while(true) {
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     msu1.main();
   }
 }

bsnes/sfc/coprocessor/necdsp/necdsp.cpp

@@ -7,13 +7,12 @@ namespace SuperFamicom {
 NECDSP necdsp;
 
 auto NECDSP::synchronizeCPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(clock >= 0) co_switch(cpu.thread);
+  if(clock >= 0) scheduler.resume(cpu.thread);
 }
 
 auto NECDSP::Enter() -> void {
   while(true) {
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     necdsp.main();
   }
 }

bsnes/sfc/coprocessor/sa1/sa1.cpp

@@ -12,13 +12,15 @@ namespace SuperFamicom {
 SA1 sa1;
 
 auto SA1::synchronizeCPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(clock >= 0) co_switch(cpu.thread);
+  if(clock >= 0) {
+    scheduler.desynchronize();
+    co_switch(cpu.thread);
+  }
 }
 
 auto SA1::Enter() -> void {
   while(true) {
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     sa1.main();
   }
 }

bsnes/sfc/coprocessor/sa1/sa1.hpp

@@ -1,7 +1,7 @@
 //Super Accelerator (SA-1)
 
 struct SA1 : Processor::WDC65816, Thread {
-  inline auto synchronizing() const -> bool override { return scheduler.synchronizingAll(); }
+  inline auto synchronizing() const -> bool override { return scheduler.synchronizing(); }
 
   //sa1.cpp
   auto synchronizeCPU() -> void;

bsnes/sfc/coprocessor/sharprtc/sharprtc.cpp

@@ -8,13 +8,12 @@ namespace SuperFamicom {
 SharpRTC sharprtc;
 
 auto SharpRTC::synchronizeCPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(clock >= 0) co_switch(cpu.thread);
+  if(clock >= 0) scheduler.resume(cpu.thread);
 }
 
 auto SharpRTC::Enter() -> void {
   while(true) {
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     sharprtc.main();
   }
 }

bsnes/sfc/coprocessor/spc7110/spc7110.cpp

@@ -17,13 +17,12 @@ SPC7110::~SPC7110() {
 }
 
 auto SPC7110::synchronizeCPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(clock >= 0) co_switch(cpu.thread);
+  if(clock >= 0) scheduler.resume(cpu.thread);
 }
 
 auto SPC7110::Enter() -> void {
   while(true) {
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     spc7110.main();
   }
 }

bsnes/sfc/coprocessor/superfx/superfx.cpp

@@ -12,13 +12,12 @@ namespace SuperFamicom {
 SuperFX superfx;
 
 auto SuperFX::synchronizeCPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(clock >= 0) co_switch(cpu.thread);
+  if(clock >= 0) scheduler.resume(cpu.thread);
 }
 
 auto SuperFX::Enter() -> void {
   while(true) {
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     superfx.main();
   }
 }

bsnes/sfc/coprocessor/superfx/superfx.hpp

@@ -2,7 +2,7 @@ struct SuperFX : Processor::GSU, Thread {
   ReadableMemory rom;
   WritableMemory ram;
 
-  inline auto synchronizing() const -> bool { return scheduler.synchronizingAll(); }
+  inline auto synchronizing() const -> bool { return scheduler.synchronizing(); }
 
   //superfx.cpp
   auto synchronizeCPU() -> void;

bsnes/sfc/cpu/cpu.cpp

@@ -11,26 +11,22 @@ CPU cpu;
 #include "serialization.cpp"
 
 auto CPU::synchronizeSMP() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(smp.clock < 0) co_switch(smp.thread);
+  if(smp.clock < 0) scheduler.resume(smp.thread);
 }
 
 auto CPU::synchronizePPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(ppu.clock < 0) co_switch(ppu.thread);
+  if(ppu.clock < 0) scheduler.resume(ppu.thread);
 }
 
 auto CPU::synchronizeCoprocessors() -> void {
-  if(scheduler.synchronizingAll()) return;
   for(auto coprocessor : coprocessors) {
-    if(coprocessor->clock < 0) co_switch(coprocessor->thread);
+    if(coprocessor->clock < 0) scheduler.resume(coprocessor->thread);
   }
 }
 
 auto CPU::Enter() -> void {
   while(true) {
-    scheduler.synchronizeCPU();
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     cpu.main();
   }
 }

bsnes/sfc/cpu/cpu.hpp

@@ -2,7 +2,7 @@ struct CPU : Processor::WDC65816, Thread, PPUcounter {
   inline auto interruptPending() const -> bool override { return status.interruptPending; }
   inline auto pio() const -> uint8 { return io.pio; }
   inline auto refresh() const -> bool { return status.dramRefresh == 1; }
-  inline auto synchronizing() const -> bool override { return scheduler.mode == Scheduler::Mode::SynchronizeCPU; }
+  inline auto synchronizing() const -> bool override { return scheduler.synchronizing(); }
 
   //cpu.cpp
   auto synchronizeSMP() -> void;

bsnes/sfc/ppu-fast/ppu.cpp

@@ -69,13 +69,12 @@ PPU::~PPU() {
 }
 
 auto PPU::synchronizeCPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(ppubase.clock >= 0) co_switch(cpu.thread);
+  if(ppubase.clock >= 0) scheduler.resume(cpu.thread);
 }
 
 auto PPU::Enter() -> void {
   while(true) {
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     ppu.main();
   }
 }

bsnes/sfc/ppu/ppu.cpp

@@ -39,8 +39,7 @@ PPU::~PPU() {
 }
 
 auto PPU::synchronizeCPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(clock >= 0) co_switch(cpu.thread);
+  if(clock >= 0) scheduler.resume(cpu.thread);
 }
 
 auto PPU::step() -> void {
@@ -60,7 +59,7 @@ auto PPU::step(uint clocks) -> void {
 
 auto PPU::Enter() -> void {
   while(true) {
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     ppu.main();
   }
 }

bsnes/sfc/sfc.hpp

@@ -28,11 +28,12 @@ namespace SuperFamicom {
   extern Cheat cheat;
 
   struct Scheduler {
-    enum class Mode : uint { Run, SynchronizeCPU, SynchronizeAll } mode;
-    enum class Event : uint { Frame, Synchronize } event;
+    enum class Mode : uint { Run, Synchronize } mode;
+    enum class Event : uint { Frame, Synchronized, Desynchronized } event;
 
     cothread_t host = nullptr;
     cothread_t active = nullptr;
+    bool desynchronized = false;
 
     auto enter() -> void {
       host = co_active();
@@ -45,20 +46,28 @@ namespace SuperFamicom {
       co_switch(host);
     }
 
-    inline auto synchronizingCPU() const -> bool {
-      return mode == Mode::SynchronizeCPU;
+    auto resume(cothread_t thread) -> void {
+      if(mode == Mode::Synchronize) desynchronized = true;
+      co_switch(thread);
     }
 
-    inline auto synchronizingAll() const -> bool {
-      return mode == Mode::SynchronizeAll;
+    inline auto synchronizing() const -> bool {
+      return mode == Mode::Synchronize;
     }
 
-    inline auto synchronizeCPU() -> void {
-      if(mode == Mode::SynchronizeCPU) leave(Event::Synchronize);
+    inline auto synchronize() -> void {
+      if(mode == Mode::Synchronize) {
+        if(desynchronized) {
+          desynchronized = false;
+          leave(Event::Desynchronized);
+        } else {
+          leave(Event::Synchronized);
+        }
+      }
     }
 
-    inline auto synchronizeAll() -> void {
-      if(mode == Mode::SynchronizeAll) leave(Event::Synchronize);
+    inline auto desynchronize() -> void {
+      desynchronized = true;
     }
   };
   extern Scheduler scheduler;

bsnes/sfc/slot/bsmemory/bsmemory.cpp

@@ -13,13 +13,12 @@ BSMemory::BSMemory() {
 }
 
 auto BSMemory::synchronizeCPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(clock >= 0) co_switch(cpu.thread);
+  if(clock >= 0) scheduler.resume(cpu.thread);
 }
 
 auto BSMemory::Enter() -> void {
   while(true) {
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     bsmemory.main();
   }
 }

bsnes/sfc/smp/smp.cpp

@@ -9,8 +9,10 @@ SMP smp;
 #include "serialization.cpp"
 
 auto SMP::synchronizeCPU() -> void {
-  if(scheduler.synchronizingAll()) return;
-  if(clock >= 0) co_switch(cpu.thread);
+  if(clock >= 0) {
+    scheduler.desynchronize();
+    co_switch(cpu.thread);
+  }
 }
 
 auto SMP::synchronizeDSP() -> void {
@@ -19,7 +21,7 @@ auto SMP::synchronizeDSP() -> void {
 
 auto SMP::Enter() -> void {
   while(true) {
-    scheduler.synchronizeAll();
+    scheduler.synchronize();
     smp.main();
   }
 }

bsnes/sfc/smp/smp.hpp

@@ -1,7 +1,7 @@
 //Sony CXP1100Q-1
 
 struct SMP : Processor::SPC700, Thread {
-  inline auto synchronizing() const -> bool override { return scheduler.synchronizingAll(); }
+  inline auto synchronizing() const -> bool override { return scheduler.synchronizing(); }
 
   //io.cpp
   auto portRead(uint2 port) const -> uint8;

bsnes/sfc/system/system.cpp

@@ -15,44 +15,47 @@ auto System::run() -> void {
 }
 
 auto System::runToSave() -> void {
-  //run the CPU thread normally, exiting once we reach the next synchronization point.
-  //the CPU thread may run in the pathological case for up to 10 frames for a long 8-channel x 64KB DMA transfer.
-  //in practice, this will typically be at most one DMA transfer.
-  scheduler.mode = Scheduler::Mode::SynchronizeCPU;
-  runToSynchronize();
+  while(true) {
+    //SMP thread is synchronized twice to ensure the CPU and SMP are closely aligned:
+    //this is extremely critical for Tales of Phantasia and Star Ocean.
+    scheduler.mode = Scheduler::Mode::Synchronize;
+    scheduler.active = smp.thread;
+    if(!runToSynchronize()) continue;
 
-  //now synchronize every other thread to their synchronization points.
-  //stop after each thread is very slightly ahead of the CPU thread.
-  scheduler.mode = Scheduler::Mode::SynchronizeAll;
-  runToThread(smp);
-  runToThread(ppu);
-  for(auto coprocessor : cpu.coprocessors) runToThread(*coprocessor);
+    scheduler.mode = Scheduler::Mode::Synchronize;
+    scheduler.active = cpu.thread;
+    if(!runToSynchronize()) continue;
+
+    scheduler.mode = Scheduler::Mode::Synchronize;
+    scheduler.active = smp.thread;
+    if(!runToSynchronize()) continue;
+
+    scheduler.mode = Scheduler::Mode::Synchronize;
+    scheduler.active = ppu.thread;
+    if(!runToSynchronize()) continue;
+
+    for(auto coprocessor : cpu.coprocessors) {
+      scheduler.mode = Scheduler::Mode::Synchronize;
+      scheduler.active = coprocessor->thread;
+      if(!runToSynchronize()) continue;
+    }
+
+    break;
+  }
 
-  //at this point, the CPU thread is the furthest behind in time.
-  //all threads are now at their synchronization points and can be serialized safely.
   scheduler.mode = Scheduler::Mode::Run;
   scheduler.active = cpu.thread;
 }
 
-auto System::runToSynchronize() -> void {
+auto System::runToSynchronize() -> bool {
   while(true) {
     scheduler.enter();
     if(scheduler.event == Scheduler::Event::Frame) frameEvent();
-    if(scheduler.event == Scheduler::Event::Synchronize) break;
+    if(scheduler.event == Scheduler::Event::Synchronized) return true;
+    if(scheduler.event == Scheduler::Event::Desynchronized) return false;
   }
 }
 
-auto System::runToThread(Thread& aux) -> void {
-  //first, ensure that the CPU is ahead of the thread we want to synchronize to.
-  //because if it isn't, and the other thread is ahead, it will run even more ahead to synchronize itself.
-  scheduler.active = cpu.thread;
-  while(aux.clock >= 0) runToSynchronize();
-
-  //now that it is, run the other thread until it's just barely surpassed the CPU thread.
-  scheduler.active = aux.thread;
-  do runToSynchronize(); while(aux.clock < 0);
-}
-
 auto System::frameEvent() -> void {
   ppu.refresh();
 

bsnes/sfc/system/system.hpp

@@ -10,8 +10,7 @@ struct System {
 
   auto run() -> void;
   auto runToSave() -> void;
-  auto runToSynchronize() -> void;
-  auto runToThread(Thread&) -> void;
+  auto runToSynchronize() -> bool;
   auto frameEvent() -> void;
 
   auto load(Emulator::Interface*) -> bool;

libco/amd64.c

@@ -4,6 +4,7 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <string.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -167,6 +168,20 @@ void co_switch(cothread_t handle) {
   co_swap(co_active_handle = handle, co_previous_handle);
 }
 
+unsigned int co_size(unsigned int size) {
+  size += 512;
+  size &= ~15;
+  return size;
+}
+
+void co_save(cothread_t handle, void* memory, unsigned int size) {
+  memcpy(memory, handle, size);
+}
+
+void co_load(cothread_t handle, const void* memory, unsigned int size) {
+  memcpy(handle, memory, size);
+}
+
 #ifdef __cplusplus
 }
 #endif

libco/libco.h

@@ -18,6 +18,9 @@ cothread_t co_derive(void*, unsigned int, void (*)(void));
 cothread_t co_create(unsigned int, void (*)(void));
 void co_delete(cothread_t);
 void co_switch(cothread_t);
+unsigned int co_size(unsigned int);
+void co_save(cothread_t, void*, unsigned int);
+void co_load(cothread_t, const void*, unsigned int);
 
 #ifdef __cplusplus
 }