From 0ee073b71b8377c2ccd4acd50d64cd627e9cc77b Mon Sep 17 00:00:00 2001
From: goyuken <goyuken@4bbf4f03-6f44-549e-7e59-35d4b0962838>
Date: Sat, 31 May 2014 05:57:18 +0000
Subject: [PATCH] bizswan: savestates

---
 .../Consoles/WonderSwan/BizSwan.cs            |  12 +++
 .../Consoles/WonderSwan/WonderSwan.cs         |  63 ++++++++++-
 output/dll/bizswan.dll                        | Bin 81408 -> 91136 bytes
 wonderswan/bizswan/bizswan.vcxproj            |   2 +
 wonderswan/bizswan/bizswan.vcxproj.filters    |   6 ++
 wonderswan/eeprom.cpp                         |  14 ++-
 wonderswan/eeprom.h                           |   1 +
 wonderswan/gfx.cpp                            |  69 +++++++++++-
 wonderswan/gfx.h                              |  12 +--
 wonderswan/interrupt.cpp                      |  10 ++
 wonderswan/interrupt.h                        |   1 +
 wonderswan/memory.cpp                         |  33 +++++-
 wonderswan/memory.h                           |   3 +-
 wonderswan/mingw/Makefile                     |   1 +
 wonderswan/newstate.cpp                       |  69 ++++++++++++
 wonderswan/newstate.h                         | 102 ++++++++++++++++++
 wonderswan/rtc.cpp                            |  10 ++
 wonderswan/rtc.h                              |   1 +
 wonderswan/sound.cpp                          |  31 ++++++
 wonderswan/sound.h                            |   1 +
 wonderswan/system.cpp                         |  45 ++++++++
 wonderswan/system.h                           |   9 +-
 wonderswan/v30mz.cpp                          |  21 ++++
 wonderswan/v30mz.h                            |   1 +
 wonderswan/wswan.h                            |   2 -
 25 files changed, 495 insertions(+), 24 deletions(-)
 create mode 100644 wonderswan/newstate.cpp
 create mode 100644 wonderswan/newstate.h

diff --git a/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs b/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs
index 1b568e68f8..dd857c9f06 100644
--- a/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs
+++ b/BizHawk.Emulation.Cores/Consoles/WonderSwan/BizSwan.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Runtime.InteropServices;
+using BizHawk.Common;
 
 namespace BizHawk.Emulation.Cores.WonderSwan
 {
@@ -105,6 +106,17 @@ namespace BizHawk.Emulation.Cores.WonderSwan
 		[DllImport(dd, CallingConvention = cc)]
 		public static extern bool bizswan_getmemoryarea(IntPtr core, int index, out IntPtr name, out int size, out IntPtr data);
 
+		[DllImport(dd, CallingConvention = cc)]
+		public static extern int bizswan_binstatesize(IntPtr core);
+		[DllImport(dd, CallingConvention = cc)]
+		public static extern bool bizswan_binstatesave(IntPtr core, byte[] data, int length);
+		[DllImport(dd, CallingConvention = cc)]
+		public static extern bool bizswan_binstateload(IntPtr core, byte[] data, int length);
+
+		[DllImport(dd, CallingConvention = cc)]
+		public static extern void bizswan_txtstatesave(IntPtr core, [In]ref TextStateFPtrs ff);
+		[DllImport(dd, CallingConvention = cc)]
+		public static extern void bizswan_txtstateload(IntPtr core, [In]ref TextStateFPtrs ff);
 
 		/// <summary>
 		/// return a CPU register
diff --git a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs
index 6e96a33899..213e9c655d 100644
--- a/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs
+++ b/BizHawk.Emulation.Cores/Consoles/WonderSwan/WonderSwan.cs
@@ -56,6 +56,8 @@ namespace BizHawk.Emulation.Cores.WonderSwan
 			try
 			{
 				var ss = _SyncSettings.GetNativeSettings();
+				if (deterministicEmulation)
+					ss.userealtime = false;
 
 				bool rotate = false;
 
@@ -70,6 +72,9 @@ namespace BizHawk.Emulation.Cores.WonderSwan
 				InitVideo(rotate);
 				PutSettings(_Settings);
 				SetMemoryDomains();
+
+				savebuff = new byte[BizSwan.bizswan_binstatesize(Core)];
+				savebuff2 = new byte[savebuff.Length + 13];
 			}
 			catch
 			{
@@ -157,25 +162,81 @@ namespace BizHawk.Emulation.Cores.WonderSwan
 
 		#region Savestates
 
+		JsonSerializer ser = new JsonSerializer() { Formatting = Formatting.Indented };
+
+		class TextStateData
+		{
+			public int Frame;
+			public int LagCount;
+			public bool IsLagFrame;
+		}
+		
 		public void SaveStateText(TextWriter writer)
 		{
+			var s = new TextState<TextStateData>();
+			s.Prepare();
+			var ff = s.GetFunctionPointers();
+			BizSwan.bizswan_txtstatesave(Core, ref ff);
+			s.ExtraData.IsLagFrame = IsLagFrame;
+			s.ExtraData.LagCount = LagCount;
+			s.ExtraData.Frame = Frame;
+
+			ser.Serialize(writer, s);
+			// write extra copy of stuff we don't use
+			writer.WriteLine();
+			writer.WriteLine("Frame {0}", Frame);
 		}
 
 		public void LoadStateText(TextReader reader)
 		{
+			var s = (TextState<TextStateData>)ser.Deserialize(reader, typeof(TextState<TextStateData>));
+			s.Prepare();
+			var ff = s.GetFunctionPointers();
+			BizSwan.bizswan_txtstateload(Core, ref ff);
+			IsLagFrame = s.ExtraData.IsLagFrame;
+			LagCount = s.ExtraData.LagCount;
+			Frame = s.ExtraData.Frame;
 		}
 
+		byte[] savebuff;
+		byte[] savebuff2;
+
 		public void SaveStateBinary(BinaryWriter writer)
 		{
+			if (!BizSwan.bizswan_binstatesave(Core, savebuff, savebuff.Length))
+				throw new InvalidOperationException("bizswan_binstatesave() returned false!");
+			writer.Write(savebuff.Length);
+			writer.Write(savebuff);
+
+			// other variables
+			writer.Write(IsLagFrame);
+			writer.Write(LagCount);
+			writer.Write(Frame);
 		}
 
 		public void LoadStateBinary(BinaryReader reader)
 		{
+			int length = reader.ReadInt32();
+			if (length != savebuff.Length)
+				throw new InvalidOperationException("Save buffer size mismatch!");
+			reader.Read(savebuff, 0, length);
+			if (!BizSwan.bizswan_binstateload(Core, savebuff, savebuff.Length))
+				throw new InvalidOperationException("bizswan_binstateload() returned false!");
+
+			// other variables
+			IsLagFrame = reader.ReadBoolean();
+			LagCount = reader.ReadInt32();
+			Frame = reader.ReadInt32();
 		}
 
 		public byte[] SaveStateBinary()
 		{
-			return new byte[0];
+			var ms = new MemoryStream(savebuff2, true);
+			var bw = new BinaryWriter(ms);
+			SaveStateBinary(bw);
+			bw.Flush();
+			ms.Close();
+			return savebuff2;
 		}
 
 		public bool BinarySaveStatesPreferred
diff --git a/output/dll/bizswan.dll b/output/dll/bizswan.dll
index a067a401b956321ef8dbf2047829c1f2efb1d3d9..9ad84e4e81c9f5903a4ef9635837eec411db2289 100644
GIT binary patch
delta 25761
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
F{~we~9t{8h

delta 16351
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
At^fc4

diff --git a/wonderswan/bizswan/bizswan.vcxproj b/wonderswan/bizswan/bizswan.vcxproj
index 792093a0e5..54c95bae18 100644
--- a/wonderswan/bizswan/bizswan.vcxproj
+++ b/wonderswan/bizswan/bizswan.vcxproj
@@ -75,6 +75,7 @@
     <ClCompile Include="..\gfx.cpp" />
     <ClCompile Include="..\interrupt.cpp" />
     <ClCompile Include="..\memory.cpp" />
+    <ClCompile Include="..\newstate.cpp" />
     <ClCompile Include="..\rtc.cpp" />
     <ClCompile Include="..\sound.cpp" />
     <ClCompile Include="..\system.cpp" />
@@ -90,6 +91,7 @@
     <ClInclude Include="..\memory.h" />
     <ClInclude Include="..\msvc\inttypes.h" />
     <ClInclude Include="..\msvc\stdint.h" />
+    <ClInclude Include="..\newstate.h" />
     <ClInclude Include="..\rtc.h" />
     <ClInclude Include="..\sound.h" />
     <ClInclude Include="..\system.h" />
diff --git a/wonderswan/bizswan/bizswan.vcxproj.filters b/wonderswan/bizswan/bizswan.vcxproj.filters
index a021bd15b7..424754cf11 100644
--- a/wonderswan/bizswan/bizswan.vcxproj.filters
+++ b/wonderswan/bizswan/bizswan.vcxproj.filters
@@ -57,6 +57,9 @@
     <ClCompile Include="..\system.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\newstate.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\eeprom.h">
@@ -101,6 +104,9 @@
     <ClInclude Include="..\system.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\newstate.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\start.inc">
diff --git a/wonderswan/eeprom.cpp b/wonderswan/eeprom.cpp
index 03925c47ab..6ebb7773c5 100644
--- a/wonderswan/eeprom.cpp
+++ b/wonderswan/eeprom.cpp
@@ -114,9 +114,6 @@ namespace MDFN_IEN_WSWAN
 		255,255,255,255
 	};
 
-	//static uint8 iEEPROM_Command, EEPROM_Command;
-	//static uint16 iEEPROM_Address, EEPROM_Address;
-
 	uint8 EEPROM::Read(uint32 A)
 	{
 		switch(A)
@@ -203,4 +200,15 @@ namespace MDFN_IEN_WSWAN
 		iEEPROM[0x375] = Blood;
 	}
 
+	SYNCFUNC(EEPROM)
+	{
+		NSS(iEEPROM_Command);
+		NSS(EEPROM_Command);
+		NSS(iEEPROM_Address);
+		NSS(EEPROM_Address);
+
+		NSS(eeprom_size);
+		NSS(iEEPROM);
+		NSS(wsEEPROM);
+	}
 }
diff --git a/wonderswan/eeprom.h b/wonderswan/eeprom.h
index 2538e39990..c96aa6889b 100644
--- a/wonderswan/eeprom.h
+++ b/wonderswan/eeprom.h
@@ -27,6 +27,7 @@ public:
 
 public:
 	System *sys;
+	template<bool isReader>void SyncState(NewState *ns);
 };
 
 
diff --git a/wonderswan/gfx.cpp b/wonderswan/gfx.cpp
index 0b8fc5cc0a..ac51c557d9 100644
--- a/wonderswan/gfx.cpp
+++ b/wonderswan/gfx.cpp
@@ -19,8 +19,6 @@
 */
 
 #include "system.h"
-//#include <mednafen/video.h>
-//#include <trio/trio.h>
 #include <cstring>
 
 namespace MDFN_IEN_WSWAN
@@ -602,4 +600,71 @@ namespace MDFN_IEN_WSWAN
 		std::memset(wsCols, 0, sizeof(wsCols));
 	}
 
+	SYNCFUNC(GFX)
+	{
+		
+		// TCACHE stuff.  we invalidate the cache instead of saving it
+		if (isReader)
+		{
+			std::memset(wsTCacheUpdate, 0, sizeof(wsTCacheUpdate));
+			std::memset(wsTCacheUpdate2, 0, sizeof(wsTCacheUpdate2));
+		}
+		/*
+		NSS(tiles);
+		NSS(wsTCache);			
+		NSS(wsTCache2);			
+		NSS(wsTCacheFlipped);
+		NSS(wsTCacheFlipped2);
+		NSS(wsTCacheUpdate);		
+		NSS(wsTCacheUpdate2);		  
+		NSS(wsTileRow);
+		*/
+
+		NSS(wsVMode);
+
+		NSS(wsMonoPal);
+		NSS(wsColors);
+		NSS(wsCols);
+
+		NSS(ColorMapG);
+		NSS(ColorMap);
+		NSS(LayerEnabled);
+
+		NSS(wsLine);
+
+		NSS(SpriteTable);
+		NSS(SpriteCountCache);
+		NSS(DispControl);
+		NSS(BGColor);
+		NSS(LineCompare);
+		NSS(SPRBase);
+		NSS(SpriteStart);
+		NSS(SpriteCount);
+		NSS(FGBGLoc);
+		NSS(FGx0);
+		NSS(FGy0);
+		NSS(FGx1);
+		NSS(FGy1);
+		NSS(SPRx0);
+		NSS(SPRy0);
+		NSS(SPRx1);
+		NSS(SPRy1);
+
+		NSS(BGXScroll);
+		NSS(BGYScroll);
+		NSS(FGXScroll);
+		NSS(FGYScroll);
+		NSS(LCDControl);
+		NSS(LCDIcons);
+
+		NSS(BTimerControl);
+		NSS(HBTimerPeriod);
+		NSS(VBTimerPeriod);
+
+		NSS(HBCounter);
+		NSS(VBCounter);
+		NSS(VideoMode);
+
+		NSS(wsc); // mono / color
+	}
 }
diff --git a/wonderswan/gfx.h b/wonderswan/gfx.h
index 9e020fd88a..0fbef1e471 100644
--- a/wonderswan/gfx.h
+++ b/wonderswan/gfx.h
@@ -40,8 +40,9 @@ private:
 	uint8	wsTCacheUpdate[512];		
 	uint8	wsTCacheUpdate2[512];		  
 	uint8	wsTileRow[8];
-	int		wsVMode; // doesn't belong here?
 	// TCACHE/====================================
+	int		wsVMode;
+
 	uint32 wsMonoPal[16][4];
 	uint32 wsColors[8];
 	uint32 wsCols[16][16];
@@ -78,16 +79,9 @@ private:
 
 public:
 	System *sys;
+	template<bool isReader>void SyncState(NewState *ns);
 };
 
-
-
-// ?
-//extern uint32		dx_r,dx_g,dx_b,dx_sr,dx_sg,dx_sb;
-//extern uint32		dx_bits,dx_pitch,cmov,dx_linewidth_blit,dx_buffer_line;
-
-
-
 }
 
 #endif
diff --git a/wonderswan/interrupt.cpp b/wonderswan/interrupt.cpp
index bff9d854fc..d88dd53871 100644
--- a/wonderswan/interrupt.cpp
+++ b/wonderswan/interrupt.cpp
@@ -74,4 +74,14 @@ namespace MDFN_IEN_WSWAN
 		Recalc();
 	}
 
+	SYNCFUNC(Interrupt)
+	{
+		NSS(IStatus);
+		NSS(IEnable);
+		NSS(IVectorBase);
+
+		NSS(IOn_Cache);
+		NSS(IOn_Which);
+		NSS(IVector_Cache);
+	}
 }
diff --git a/wonderswan/interrupt.h b/wonderswan/interrupt.h
index 6c41e18205..429fa93df2 100644
--- a/wonderswan/interrupt.h
+++ b/wonderswan/interrupt.h
@@ -41,6 +41,7 @@ private:
 	void Recalc();
 public:
 	System *sys;
+	template<bool isReader>void SyncState(NewState *ns);
 };
 
 }
diff --git a/wonderswan/memory.cpp b/wonderswan/memory.cpp
index 30feaabf6d..133792891c 100644
--- a/wonderswan/memory.cpp
+++ b/wonderswan/memory.cpp
@@ -27,9 +27,6 @@
 
 namespace MDFN_IEN_WSWAN
 {
-
-	//extern uint16 WSButtonStatus;
-
 	void Memory::Write20(uint32 A, uint8 V)
 	{
 		uint32 offset, bank;
@@ -336,4 +333,34 @@ namespace MDFN_IEN_WSWAN
 		CommData = 0;
 	}
 
+	SYNCFUNC(Memory)
+	{
+		NSS(wsRAM);
+		//NSS(rom_size);
+		//PSS(wsCartROM, rom_size);
+		NSS(sram_size);
+		PSS(wsSRAM, sram_size);
+
+		NSS(WSButtonStatus);
+		NSS(Lagged);
+
+		NSS(ButtonWhich);
+		NSS(ButtonReadLatch);
+
+		NSS(DMASource);
+		NSS(DMADest);
+		NSS(DMALength);
+		NSS(DMAControl);
+
+		NSS(SoundDMASource);
+		NSS(SoundDMALength);
+		NSS(SoundDMAControl);
+
+		NSS(BankSelector);
+
+		NSS(CommControl);
+		NSS(CommData);
+
+		NSS(language);
+	}
 }
diff --git a/wonderswan/memory.h b/wonderswan/memory.h
index e9d938a316..3ccfcd5c2a 100644
--- a/wonderswan/memory.h
+++ b/wonderswan/memory.h
@@ -53,6 +53,7 @@ private:
 
 public:
 	System *sys;
+	template<bool isReader>void SyncState(NewState *ns);
 private:
 	void CheckDMA();
 
@@ -66,8 +67,6 @@ enum
  MEMORY_GSREG_BNK3SLCT,
 };
 
-
-
 }
 
 #endif
diff --git a/wonderswan/mingw/Makefile b/wonderswan/mingw/Makefile
index d72ea3d600..90788da80a 100644
--- a/wonderswan/mingw/Makefile
+++ b/wonderswan/mingw/Makefile
@@ -16,6 +16,7 @@ SRCS = \
 	../system.cpp \
 	../tcache.cpp \
 	../v30mz.cpp \
+	../newstate.cpp \
 	../Blip/Blip_Buffer.cpp
 
 OBJS = $(SRCS:.cpp=.o)
diff --git a/wonderswan/newstate.cpp b/wonderswan/newstate.cpp
new file mode 100644
index 0000000000..95727b3cf8
--- /dev/null
+++ b/wonderswan/newstate.cpp
@@ -0,0 +1,69 @@
+#include "newstate.h"
+#include <cstring>
+#include <algorithm>
+
+namespace MDFN_IEN_WSWAN {
+
+NewStateDummy::NewStateDummy()
+	:length(0)
+{
+}
+void NewStateDummy::Save(const void *ptr, size_t size, const char *name)
+{
+	length += size;
+}
+void NewStateDummy::Load(void *ptr, size_t size, const char *name)
+{
+}
+
+NewStateExternalBuffer::NewStateExternalBuffer(char *buffer, long maxlength)
+	:buffer(buffer), length(0), maxlength(maxlength)
+{
+}
+
+void NewStateExternalBuffer::Save(const void *ptr, size_t size, const char *name)
+{
+	if (maxlength - length >= (long)size)
+	{
+		std::memcpy(buffer + length, ptr, size);
+	}
+	length += size;
+}
+
+void NewStateExternalBuffer::Load(void *ptr, size_t size, const char *name)
+{
+	char *dst = static_cast<char *>(ptr);
+	if (maxlength - length >= (long)size)
+	{
+		std::memcpy(dst, buffer + length, size);
+	}
+	length += size;
+}
+
+NewStateExternalFunctions::NewStateExternalFunctions(const FPtrs *ff)
+	:Save_(ff->Save_),
+	Load_(ff->Load_),
+	EnterSection_(ff->EnterSection_),
+	ExitSection_(ff->ExitSection_)
+{
+}
+
+void NewStateExternalFunctions::Save(const void *ptr, size_t size, const char *name)
+{
+	Save_(ptr, size, name);
+}
+void NewStateExternalFunctions::Load(void *ptr, size_t size, const char *name)
+{
+	Load_(ptr, size, name);
+}
+void NewStateExternalFunctions::EnterSection(const char *name)
+{
+	EnterSection_(name);
+}
+void NewStateExternalFunctions::ExitSection(const char *name)
+{
+	ExitSection_(name);
+}
+
+
+}
diff --git a/wonderswan/newstate.h b/wonderswan/newstate.h
new file mode 100644
index 0000000000..f7c95f7982
--- /dev/null
+++ b/wonderswan/newstate.h
@@ -0,0 +1,102 @@
+#ifndef NEWSTATE_H
+#define NEWSTATE_H
+
+#include <cstring>
+#include <cstddef>
+
+namespace MDFN_IEN_WSWAN {
+
+class NewState
+{
+public:
+	virtual void Save(const void *ptr, size_t size, const char *name) = 0;
+	virtual void Load(void *ptr, size_t size, const char *name) = 0;
+	virtual void EnterSection(const char *name) { }
+	virtual void ExitSection(const char *name) { }
+};
+
+class NewStateDummy : public NewState
+{
+private:
+	long length;
+public:
+	NewStateDummy();
+	long GetLength() { return length; }
+	void Rewind() { length = 0; }
+	virtual void Save(const void *ptr, size_t size, const char *name);
+	virtual void Load(void *ptr, size_t size, const char *name);
+};
+
+class NewStateExternalBuffer : public NewState
+{
+private:
+	char *const buffer;
+	long length;
+	const long maxlength;
+public:
+	NewStateExternalBuffer(char *buffer, long maxlength);
+	long GetLength() { return length; }
+	void Rewind() { length = 0; }
+	bool Overflow() { return length > maxlength; }
+	virtual void Save(const void *ptr, size_t size, const char *name);
+	virtual void Load(void *ptr, size_t size, const char *name);
+};
+
+struct FPtrs
+{
+	void (*Save_)(const void *ptr, size_t size, const char *name);
+	void (*Load_)(void *ptr, size_t size, const char *name);
+	void (*EnterSection_)(const char *name);
+	void (*ExitSection_)(const char *name);
+};
+
+class NewStateExternalFunctions : public NewState
+{
+private:
+	void (*Save_)(const void *ptr, size_t size, const char *name);
+	void (*Load_)(void *ptr, size_t size, const char *name);
+	void (*EnterSection_)(const char *name);
+	void (*ExitSection_)(const char *name);
+public:
+	NewStateExternalFunctions(const FPtrs *ff);
+	virtual void Save(const void *ptr, size_t size, const char *name);
+	virtual void Load(void *ptr, size_t size, const char *name);
+	virtual void EnterSection(const char *name);
+	virtual void ExitSection(const char *name);
+};
+
+// defines and explicitly instantiates 
+#define SYNCFUNC(x)\
+	template void x::SyncState<false>(NewState *ns);\
+	template void x::SyncState<true>(NewState *ns);\
+	template<bool isReader>void x::SyncState(NewState *ns)
+
+// N = normal variable
+// P = pointer to fixed size data
+// S = "sub object"
+// T = "ptr to sub object"
+// R = pointer, store its offset from some other pointer
+// E = general purpose cased value "enum"
+
+
+// first line is default value in converted enum; last line is default value in argument x
+#define EBS(x,d) do { int _ttmp = (d); if (isReader) ns->Load(&_ttmp, sizeof(_ttmp), #x); if (0)
+#define EVS(x,v,n) else if (!isReader && (x) == (v)) _ttmp = (n); else if (isReader && _ttmp == (n)) (x) = (v)
+#define EES(x,d) else if (isReader) (x) = (d); if (!isReader) ns->Save(&_ttmp, sizeof(_ttmp), #x); } while (0)
+
+#define RSS(x,b) do { if (isReader)\
+{ ptrdiff_t _ttmp; ns->Load(&_ttmp, sizeof(_ttmp), #x); (x) = (_ttmp == (ptrdiff_t)0xdeadbeef ? 0 : (b) + _ttmp); }\
+	else\
+{ ptrdiff_t _ttmp = (x) == 0 ? 0xdeadbeef : (x) - (b); ns->Save(&_ttmp, sizeof(_ttmp), #x); } } while (0)
+
+#define PSS(x,s) do { if (isReader) ns->Load((x), (s), #x); else ns->Save((x), (s), #x); } while (0)
+
+#define NSS(x) do { if (isReader) ns->Load(&(x), sizeof(x), #x); else ns->Save(&(x), sizeof(x), #x); } while (0)
+
+#define SSS(x) do { ns->EnterSection(#x); (x).SyncState<isReader>(ns); ns->ExitSection(#x); } while (0)
+
+#define TSS(x) do { ns->EnterSection(#x); (x)->SyncState<isReader>(ns); ns->ExitSection(#x); } while (0)
+
+}
+
+#endif
diff --git a/wonderswan/rtc.cpp b/wonderswan/rtc.cpp
index 4423bce87a..f3fd8c7755 100644
--- a/wonderswan/rtc.cpp
+++ b/wonderswan/rtc.cpp
@@ -112,4 +112,14 @@ namespace MDFN_IEN_WSWAN
 		}
 	}
 
+	SYNCFUNC(RTC)
+	{
+		NSS(CurrentTime);
+		NSS(userealtime);
+
+		NSS(ClockCycleCounter);
+		NSS(wsCA15);
+		NSS(Command);
+		NSS(Data);
+	}
 }
diff --git a/wonderswan/rtc.h b/wonderswan/rtc.h
index cdead60466..331e003a2d 100644
--- a/wonderswan/rtc.h
+++ b/wonderswan/rtc.h
@@ -22,6 +22,7 @@ private:
 	uint8 Command, Data;
 public:
 	System *sys;
+	template<bool isReader>void SyncState(NewState *ns);
 
 };
 
diff --git a/wonderswan/sound.cpp b/wonderswan/sound.cpp
index a94a63ee11..baf0e77ecd 100644
--- a/wonderswan/sound.cpp
+++ b/wonderswan/sound.cpp
@@ -379,4 +379,35 @@ namespace MDFN_IEN_WSWAN
 			sbuf[y]->clear();
 	}
 
+	SYNCFUNC(Sound)
+	{
+		// don't need to save any of the blip stuff
+
+		NSS(period[4]);
+		NSS(volume[4]);
+		NSS(voice_volume);
+
+		NSS(sweep_step);
+		NSS(sweep_value);
+		NSS(noise_control);
+		NSS(control);
+		NSS(output_control);
+
+		NSS(sweep_8192_divider);
+		NSS(sweep_counter);
+		NSS(SampleRAMPos);
+
+		NSS(sample_cache);
+
+		NSS(last_v_val);
+
+		NSS(HyperVoice);
+		NSS(last_hv_val);
+
+		NSS(period_counter);
+		NSS(last_val);
+		NSS(sample_pos);
+		NSS(nreg);
+		NSS(last_ts);
+	}
 }
diff --git a/wonderswan/sound.h b/wonderswan/sound.h
index 47fc9ae3e3..c4fcf7619b 100644
--- a/wonderswan/sound.h
+++ b/wonderswan/sound.h
@@ -61,6 +61,7 @@ private:
 
 public:
 	System *sys;
+	template<bool isReader>void SyncState(NewState *ns);
 
 };
 
diff --git a/wonderswan/system.cpp b/wonderswan/system.cpp
index 3cfb0e63bb..0d56e3406a 100644
--- a/wonderswan/system.cpp
+++ b/wonderswan/system.cpp
@@ -237,6 +237,7 @@ namespace MDFN_IEN_WSWAN
 	{
 		return eeprom.ieeprom_size + eeprom.eeprom_size + memory.sram_size;
 	}
+
 	bool System::SaveRamLoad(const uint8 *data, int size)
 	{
 		if (size != SaveRamSize())
@@ -294,6 +295,18 @@ namespace MDFN_IEN_WSWAN
 		return ret;
 	}
 
+	SYNCFUNC(System)
+	{
+		SSS(gfx);
+		SSS(memory);
+		SSS(eeprom);
+		SSS(rtc);
+		SSS(sound);
+		SSS(cpu);
+		SSS(interrupt);
+	
+		NSS(rotate);
+	}
 
 	EXPORT System *bizswan_new()
 	{
@@ -352,4 +365,36 @@ namespace MDFN_IEN_WSWAN
 		return s->GetMemoryArea(index, *name, *size, *data);
 	}
 
+	EXPORT int bizswan_binstatesize(System *s)
+	{
+		NewStateDummy dummy;
+		s->SyncState<false>(&dummy);
+		return dummy.GetLength();
+	}
+
+	EXPORT int bizswan_binstatesave(System *s, char *data, int length)
+	{
+		NewStateExternalBuffer saver(data, length);
+		s->SyncState<false>(&saver);
+		return !saver.Overflow() && saver.GetLength() == length;
+	}
+	
+	EXPORT int bizswan_binstateload(System *s, const char *data, int length)
+	{
+		NewStateExternalBuffer loader(const_cast<char *>(data), length);
+		s->SyncState<true>(&loader);
+		return !loader.Overflow() && loader.GetLength() == length;
+	}
+
+	EXPORT void bizswan_txtstatesave(System *s, FPtrs *ff)
+	{
+		NewStateExternalFunctions saver(ff);
+		s->SyncState<false>(&saver);
+	}
+
+	EXPORT void bizswan_txtstateload(System *s, FPtrs *ff)
+	{
+		NewStateExternalFunctions loader(ff);
+		s->SyncState<true>(&loader);
+	}
 }
diff --git a/wonderswan/system.h b/wonderswan/system.h
index bbccb45c7f..1893a20239 100644
--- a/wonderswan/system.h
+++ b/wonderswan/system.h
@@ -7,8 +7,11 @@ class System;
 struct SyncSettings;
 struct Settings;
 }
-
+
 #include "wswan.h"
+
+#include "newstate.h"
+
 #include "gfx.h"
 #include "memory.h"
 #include "eeprom.h"
@@ -18,7 +21,7 @@ struct Settings;
 #include "interrupt.h"
 
 #include <cstddef>
-
+
 namespace MDFN_IEN_WSWAN
 {
 class System
@@ -52,6 +55,8 @@ public:
 	Interrupt interrupt;
 	
 	bool rotate; // rotate screen and controls left 90
+
+	template<bool isReader>void SyncState(NewState *ns);
 };
 
 struct SyncSettings
diff --git a/wonderswan/v30mz.cpp b/wonderswan/v30mz.cpp
index 70e1f71e24..18e6f16398 100644
--- a/wonderswan/v30mz.cpp
+++ b/wonderswan/v30mz.cpp
@@ -1027,4 +1027,25 @@ namespace MDFN_IEN_WSWAN
 
 	}
 
+	SYNCFUNC(V30MZ)
+	{
+		NSS(old_CS);
+		NSS(old_IP);
+		NSS(timestamp);
+		NSS(ICount);
+
+		NSS(I);
+		NSS(InHLT);
+
+		NSS(prefix_base);
+		NSS(seg_prefix);
+
+		NSS(parity_table);
+
+		NSS(EA);
+		NSS(EO);
+		NSS(E16);
+
+		NSS(Mod_RM);
+	}
 }
diff --git a/wonderswan/v30mz.h b/wonderswan/v30mz.h
index 622257cc70..7ef1a5dbbc 100644
--- a/wonderswan/v30mz.h
+++ b/wonderswan/v30mz.h
@@ -141,6 +141,7 @@ private:
 
 public:
 	System *sys;
+	template<bool isReader>void SyncState(NewState *ns);
 };
 
 
diff --git a/wonderswan/wswan.h b/wonderswan/wswan.h
index 9e99ce8397..9e67fada37 100644
--- a/wonderswan/wswan.h
+++ b/wonderswan/wswan.h
@@ -3,8 +3,6 @@
 
 #include <mednafen/types.h>
 
-#include "interrupt.h"
-
 namespace MDFN_IEN_WSWAN
 {