mgba: savestate redux

BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/LibmGBA.cs

@@ -81,10 +81,25 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 		[DllImport(dll, CallingConvention = cc)]
 		public static extern bool BizPutSaveRam(IntPtr ctx, byte[] src, int size);
 
+		/// <summary>
+		/// start a savestate operation
+		/// </summary>
+		/// <param name="ctx"></param>
+		/// <param name="p">private parameter to be passed to BizFinishGetState</param>
+		/// <param name="size">size of buffer to be allocated for BizFinishGetState</param>
+		/// <returns>if false, operation failed and BizFinishGetState should not be called</returns>
 		[DllImport(dll, CallingConvention = cc)]
-		public static extern int BizGetStateMaxSize(IntPtr ctx);
+		public static extern bool BizStartGetState(IntPtr ctx, ref IntPtr p, ref int size);
+
+		/// <summary>
+		/// finish a savestate operation.  if StartGetState returned true, this must be called else memory leaks
+		/// </summary>
+		/// <param name="p">returned by BizStartGetState</param>
+		/// <param name="dest">buffer of length size</param>
+		/// <param name="size">returned by BizStartGetState</param>
 		[DllImport(dll, CallingConvention = cc)]
-		public static extern bool BizGetState(IntPtr ctx, byte[] dest, int size);
+		public static extern void BizFinishGetState(IntPtr p, byte[] dest, int size);
+
 		[DllImport(dll, CallingConvention = cc)]
 		public static extern bool BizPutState(IntPtr ctx, byte[] src, int size);
 

BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/MGBAHawk.cs

@@ -63,8 +63,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 				CoreComm.VsyncDen = 4389;
 				CoreComm.NominalWidth = 240;
 				CoreComm.NominalHeight = 160;
-
-				InitStates();
 			}
 			catch
 			{
@@ -367,14 +365,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 
 		#endregion
 
-		private void InitStates()
+		private byte[] _savebuff = new byte[0];
-		{
+		private byte[] _savebuff2 = new byte[13];
-			_savebuff = new byte[LibmGBA.BizGetStateMaxSize(_core)];
-			_savebuff2 = new byte[_savebuff.Length + 13];
-		}
-
-		private byte[] _savebuff;
-		private byte[] _savebuff2;
 
 		public bool BinarySaveStatesPreferred
 		{
@@ -396,8 +388,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 
 		public void SaveStateBinary(BinaryWriter writer)
 		{
-			if (!LibmGBA.BizGetState(_core, _savebuff, _savebuff.Length))
+			IntPtr p = IntPtr.Zero;
+			int size = 0;
+			if (!LibmGBA.BizStartGetState(_core, ref p, ref size))
 				throw new InvalidOperationException("Core failed to save!");
+			if (size != _savebuff.Length)
+			{
+				_savebuff = new byte[size];
+				_savebuff2 = new byte[size + 13];
+			}
+			LibmGBA.BizFinishGetState(p, _savebuff, size);
 			writer.Write(_savebuff.Length);
 			writer.Write(_savebuff, 0, _savebuff.Length);
 
@@ -412,7 +412,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
 			int length = reader.ReadInt32();
 			if (length != _savebuff.Length)
 			{
-				throw new InvalidOperationException("Unexpected state size!");
+				_savebuff = new byte[length];
+				_savebuff2 = new byte[length + 13];
 			}
 			reader.Read(_savebuff, 0, length);
 			if (!LibmGBA.BizPutState(_core, _savebuff, length))