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

N64 - break off ICoreService implementations into separate files

This commit is contained in:
adelikat 2014-11-30 15:38:39 +00:00
parent 865795049b
commit 5d512c4c5d
5 changed files with 172 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BizHawk.Emulation.Cores/BizHawk.Emulation.Cores.csproj
View File

@ -216,7 +216,18 @@
<Compile Include="Consoles\Nintendo\GBA\Meteor.cs" />
<Compile Include="Consoles\Nintendo\GBA\VBANext.cs" />
<Compile Include="Consoles\Nintendo\GBA\VBARegisterHelper.cs" />
<Compile Include="Consoles\Nintendo\N64\N64.IMemoryDomains.cs" />
<Compile Include="Consoles\Nintendo\N64\N64.IDebuggable.cs">
<DependentUpon>N64.cs</DependentUpon>
</Compile>
<Compile Include="Consoles\Nintendo\N64\N64.IMemoryDomains.cs">
<DependentUpon>N64.cs</DependentUpon>
</Compile>
<Compile Include="Consoles\Nintendo\N64\N64.ISaveRam.cs">
<DependentUpon>N64.cs</DependentUpon>
</Compile>
<Compile Include="Consoles\Nintendo\N64\N64.ISettable.cs">
<DependentUpon>N64.cs</DependentUpon>
</Compile>
<Compile Include="Consoles\Nintendo\N64\N64Input.cs" />
<Compile Include="Consoles\Nintendo\N64\N64Settings.cs" />
<Compile Include="Consoles\Nintendo\N64\N64SyncSettings.Controller.cs" />

62
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.IDebuggable.cs Normal file
View File

@ -0,0 +1,62 @@
using System;
using System.Collections.Generic;
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Nintendo.N64
{
public partial class N64 : IDebuggable
{
public IDictionary<string, int> GetCpuFlagsAndRegisters()
{
// note: the approach this code takes is highly bug-prone
var ret = new Dictionary<string, int>();
var data = new byte[32 * 8 + 4 + 4 + 8 + 8 + 4 + 4 + 32 * 4 + 32 * 8];
api.getRegisters(data);
for (int i = 0; i < 32; i++)
{
var reg = BitConverter.ToInt64(data, i * 8);
ret.Add("REG" + i + "_lo", (int)(reg));
ret.Add("REG" + i + "_hi", (int)(reg >> 32));
}
var PC = BitConverter.ToUInt32(data, 32 * 8);
ret.Add("PC", (int)PC);
ret.Add("LL", BitConverter.ToInt32(data, 32 * 8 + 4));
var Lo = BitConverter.ToInt64(data, 32 * 8 + 4 + 4);
ret.Add("LO_lo", (int)Lo);
ret.Add("LO_hi", (int)(Lo >> 32));
var Hi = BitConverter.ToInt64(data, 32 * 8 + 4 + 4 + 8);
ret.Add("HI_lo", (int)Hi);
ret.Add("HI_hi", (int)(Hi >> 32));
ret.Add("FCR0", BitConverter.ToInt32(data, 32 * 8 + 4 + 4 + 8 + 8));
ret.Add("FCR31", BitConverter.ToInt32(data, 32 * 8 + 4 + 4 + 8 + 8 + 4));
for (int i = 0; i < 32; i++)
{
var reg_cop0 = BitConverter.ToUInt32(data, 32 * 8 + 4 + 4 + 8 + 8 + 4 + 4 + i * 4);
ret.Add("CP0 REG" + i, (int)reg_cop0);
}
for (int i = 0; i < 32; i++)
{
var reg_cop1_fgr_64 = BitConverter.ToInt64(data, 32 * 8 + 4 + 4 + 8 + 8 + 4 + 4 + 32 * 4 + i * 8);
ret.Add("CP1 FGR REG" + i + "_lo", (int)reg_cop1_fgr_64);
ret.Add("CP1 FGR REG" + i + "_hi", (int)(reg_cop1_fgr_64 >> 32));
}
return ret;
}
[FeatureNotImplemented]
public void SetCpuRegister(string register, int value)
{
throw new NotImplementedException();
}
}
}

22
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.ISaveRam.cs Normal file
View File

@ -0,0 +1,22 @@
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Nintendo.N64
{
public partial class N64 : ISaveRam
{
public byte[] CloneSaveRam()
{
return api.SaveSaveram();
}
public void StoreSaveRam(byte[] data)
{
api.LoadSaveram(data);
}
public bool SaveRamModified
{
get { return true; }
}
}
}

76
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.ISettable.cs Normal file
View File

@ -0,0 +1,76 @@
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Nintendo.N64
{
public partial class N64 : ISettable<N64Settings, N64SyncSettings>
{
public N64Settings GetSettings()
{
return _settings.Clone();
}
public N64SyncSettings GetSyncSettings()
{
return _syncSettings.Clone();
}
public bool PutSettings(N64Settings o)
{
_settings = o;
return true;
}
public bool PutSyncSettings(N64SyncSettings o)
{
_syncSettings = o;
SetControllerButtons();
return true;
}
private void SetControllerButtons()
{
ControllerDefinition.BoolButtons.Clear();
ControllerDefinition.FloatControls.Clear();
ControllerDefinition.BoolButtons.AddRange(new[]
{
"Reset",
"Power"
});
for (int i = 0; i < 4; i++)
{
if (_syncSettings.Controllers[i].IsConnected)
{
ControllerDefinition.BoolButtons.AddRange(new[]
{
"P" + (i + 1) + " A Up",
"P" + (i + 1) + " A Down",
"P" + (i + 1) + " A Left",
"P" + (i + 1) + " A Right",
"P" + (i + 1) + " DPad U",
"P" + (i + 1) + " DPad D",
"P" + (i + 1) + " DPad L",
"P" + (i + 1) + " DPad R",
"P" + (i + 1) + " Start",
"P" + (i + 1) + " Z",
"P" + (i + 1) + " B",
"P" + (i + 1) + " A",
"P" + (i + 1) + " C Up",
"P" + (i + 1) + " C Down",
"P" + (i + 1) + " C Right",
"P" + (i + 1) + " C Left",
"P" + (i + 1) + " L",
"P" + (i + 1) + " R",
});
ControllerDefinition.FloatControls.AddRange(new[]
{
"P" + (i + 1) + " X Axis",
"P" + (i + 1) + " Y Axis",
});
}
}
}
}
}

140
BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
View File

@ -291,21 +291,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
public bool DeterministicEmulation { get { return false; } }
public byte[] CloneSaveRam()
{
return api.SaveSaveram();
}
public void StoreSaveRam(byte[] data)
{
api.LoadSaveram(data);
}
public bool SaveRamModified
{
get { return true; }
}
#region Savestates
// these next 5 functions are all exact copy paste from gambatte.
@ -404,58 +389,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
#region Debugging Hooks
public IDictionary<string, int> GetCpuFlagsAndRegisters()
{
//note: the approach this code takes is highly bug-prone
var ret = new Dictionary<string, int>();
var data = new byte[32 * 8 + 4 + 4 + 8 + 8 + 4 + 4 + 32 * 4 + 32 * 8];
api.getRegisters(data);
for (int i = 0; i < 32; i++)
{
var reg = BitConverter.ToInt64(data, i * 8);
ret.Add("REG" + i + "_lo", (int)(reg));
ret.Add("REG" + i + "_hi", (int)(reg >> 32));
}
var PC = BitConverter.ToUInt32(data, 32 * 8);
ret.Add("PC", (int)PC);
ret.Add("LL", BitConverter.ToInt32(data, 32 * 8 + 4));
var Lo = BitConverter.ToInt64(data, 32 * 8 + 4 + 4);
ret.Add("LO_lo", (int)Lo);
ret.Add("LO_hi", (int)(Lo >> 32));
var Hi = BitConverter.ToInt64(data, 32 * 8 + 4 + 4 + 8);
ret.Add("HI_lo", (int)Hi);
ret.Add("HI_hi", (int)(Hi >> 32));
ret.Add("FCR0", BitConverter.ToInt32(data, 32 * 8 + 4 + 4 + 8 + 8));
ret.Add("FCR31", BitConverter.ToInt32(data, 32 * 8 + 4 + 4 + 8 + 8 + 4));
for (int i = 0; i < 32; i++)
{
var reg_cop0 = BitConverter.ToUInt32(data, 32 * 8 + 4 + 4 + 8 + 8 + 4 + 4 + i * 4);
ret.Add("CP0 REG" + i, (int)reg_cop0);
}
for (int i = 0; i < 32; i++)
{
var reg_cop1_fgr_64 = BitConverter.ToInt64(data, 32 * 8 + 4 + 4 + 8 + 8 + 4 + 4 + 32 * 4 + i * 8);
ret.Add("CP1 FGR REG" + i + "_lo", (int)reg_cop1_fgr_64);
ret.Add("CP1 FGR REG" + i + "_hi", (int)(reg_cop1_fgr_64 >> 32));
}
return ret;
}
[FeatureNotImplemented]
public void SetCpuRegister(string register, int value)
{
throw new NotImplementedException();
}
private mupen64plusApi.MemoryCallback readcb;
private mupen64plusApi.MemoryCallback writecb;
@ -478,78 +411,5 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
}
#endregion
#region Settings
public N64Settings GetSettings()
{
return _settings.Clone();
}
public N64SyncSettings GetSyncSettings()
{
return _syncSettings.Clone();
}
public bool PutSettings(N64Settings o)
{
_settings = o;
return true;
}
public bool PutSyncSettings(N64SyncSettings o)
{
_syncSettings = o;
SetControllerButtons();
return true;
}
private void SetControllerButtons()
{
ControllerDefinition.BoolButtons.Clear();
ControllerDefinition.FloatControls.Clear();
ControllerDefinition.BoolButtons.AddRange(new[]
{
"Reset",
"Power"
});
for (int i = 0; i < 4; i++)
{
if (_syncSettings.Controllers[i].IsConnected)
{
ControllerDefinition.BoolButtons.AddRange(new []
{
"P" + (i + 1) + " A Up",
"P" + (i + 1) + " A Down",
"P" + (i + 1) + " A Left",
"P" + (i + 1) + " A Right",
"P" + (i + 1) + " DPad U",
"P" + (i + 1) + " DPad D",
"P" + (i + 1) + " DPad L",
"P" + (i + 1) + " DPad R",
"P" + (i + 1) + " Start",
"P" + (i + 1) + " Z",
"P" + (i + 1) + " B",
"P" + (i + 1) + " A",
"P" + (i + 1) + " C Up",
"P" + (i + 1) + " C Down",
"P" + (i + 1) + " C Right",
"P" + (i + 1) + " C Left",
"P" + (i + 1) + " L",
"P" + (i + 1) + " R",
});
ControllerDefinition.FloatControls.AddRange(new[]
{
"P" + (i + 1) + " X Axis",
"P" + (i + 1) + " Y Axis",
});
}
}
}
#endregion
}
}