ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

C64: add bool[] overload to the serializer. sloppy, but neater.

This commit is contained in:
goyuken 2014-10-06 16:00:24 +00:00
parent 74d1c1a830
commit b0b5245d45
3 changed files with 64 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
BizHawk.Common/Serializer.cs
View File

@ -231,6 +231,47 @@ namespace BizHawk.Common
}
}
public void Sync(string name, ref bool[] val, bool useNull)
{
if (IsText)
{
SyncText(name, ref val, useNull);
}
else if (IsReader)
{
val = Util.ByteBufferToBoolBuffer(Util.ReadByteBuffer(_br, false));
if (val == null && !useNull)
{
val = new bool[0];
}
}
else
{
Util.WriteByteBuffer(_bw, Util.BoolBufferToByteBuffer(val));
}
}
public void SyncText(string name, ref bool[] val, bool useNull)
{
if (IsReader)
{
if (Present(name))
{
var bytes = Util.HexStringToBytes(Item(name));
val = Util.ByteBufferToBoolBuffer(bytes);
}
if (val != null && val.Length == 0 && useNull)
{
val = null;
}
}
else
{
var temp = val ?? new bool[0];
_tw.WriteLine("{0} {1}", name, Util.BoolBufferToByteBuffer(temp).BytesToHexString());
}
}
public void Sync(string name, ref short[] val, bool useNull)
{
if (IsText)

20
BizHawk.Common/Util.cs
View File

@ -98,6 +98,26 @@ namespace BizHawk.Common
}
}
public static bool[] ByteBufferToBoolBuffer(byte[] buf)
{
var ret = new bool[buf.Length];
for (int i = 0; i < buf.Length; i++)
{
ret[i] = buf[i] != 0;
}
return ret;
}
public static byte[] BoolBufferToByteBuffer(bool[] buf)
{
var ret = new byte[buf.Length];
for (int i = 0; i < buf.Length; i++)
{
ret[i] = (byte)(buf[i] ? 1 : 0);
}
return ret;
}
public static short[] ByteBufferToShortBuffer(byte[] buf)
{
int num = buf.Length / 2;

15
BizHawk.Emulation.Cores/Computers/Commodore64/SaveState.cs
View File

@ -72,18 +72,9 @@ namespace BizHawk.Emulation.Cores.Computers.Commodore64
break;
case "Boolean[]":
{
bool[] source = (bool[])currentValue;
refIntBuffer = new IntBuffer(source.Length);
for (int i = 0; i < source.Length; i++)
{
refIntBuffer[i] = source[i] ? -1 : 0;
}
ser.Sync(member.Name, ref refIntBuffer);
for (int i = 0; i < source.Length; i++)
{
source[i] = refIntBuffer[i] != 0;
}
currentValue = source;
bool[] tmp = (bool[])currentValue;
ser.Sync(member.Name, ref tmp, false);
currentValue = tmp;
}
break;
case "Byte":