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

GBHawk: Onl save audio cycles in SubGBHawk where it's needed, fixes state integrity checker in TAStudio

This commit is contained in:
alyosha-tas 2021-01-13 09:11:40 -05:00
parent 72e8fa031e
commit 428e2fe006
3 changed files with 130 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Audio.cs
View File

@ -1162,7 +1162,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
ser.Sync(nameof(WAVE_decay_done), ref WAVE_decay_done); ser.Sync(nameof(WAVE_decay_done), ref WAVE_decay_done);
ser.Sync(nameof(sound_update_needed), ref sound_update_needed); ser.Sync(nameof(sound_update_needed), ref sound_update_needed);
ser.Sync(nameof(master_audio_clock), ref master_audio_clock);
ser.Sync(nameof(sample), ref sample); ser.Sync(nameof(sample), ref sample);
ser.Sync(nameof(latched_sample_L), ref latched_sample_L); ser.Sync(nameof(latched_sample_L), ref latched_sample_L);

256
src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs
View File

@ -230,7 +230,121 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
iptr3 = Marshal.AllocHGlobal(ppu.color_palette.Length * 8 * 8 + 1); iptr3 = Marshal.AllocHGlobal(ppu.color_palette.Length * 8 * 8 + 1);
_scanlineCallback = null; _scanlineCallback = null;
DeterministicEmulation = true;
}
public bool IsCGBMode() => is_GBC;
public IntPtr iptr0 = IntPtr.Zero;
public IntPtr iptr1 = IntPtr.Zero;
public IntPtr iptr2 = IntPtr.Zero;
public IntPtr iptr3 = IntPtr.Zero;
private GPUMemoryAreas _gpuMemory
{
get
{
Marshal.Copy(VRAM, 0, iptr0, VRAM.Length);
Marshal.Copy(OAM, 0, iptr1, OAM.Length);
if (is_GBC)
{
int[] cp2 = new int[32];
int[] cp = new int[32];
for (int i = 0; i < 32; i++)
{
cp2[i] = (int)ppu.OBJ_palette[i];
cp[i] = (int)ppu.BG_palette[i];
}
Marshal.Copy(cp2, 0, iptr2, ppu.OBJ_palette.Length);
Marshal.Copy(cp, 0, iptr3, ppu.BG_palette.Length);
}
else
{
int[] cp2 = new int[8];
for (int i = 0; i < 4; i++)
{
cp2[i] = (int)ppu.color_palette[(ppu.obj_pal_0 >> (i * 2)) & 3];
cp2[i + 4] = (int)ppu.color_palette[(ppu.obj_pal_1 >> (i * 2)) & 3];
}
Marshal.Copy(cp2, 0, iptr2, cp2.Length);
int[] cp = new int[4];
for (int i = 0; i < 4; i++)
{
cp[i] = (int)ppu.color_palette[(ppu.BGP >> (i * 2)) & 3];
}
Marshal.Copy(cp, 0, iptr3, cp.Length);
}
return new GPUMemoryAreas(iptr0, iptr1, iptr2, iptr3);
}
}
public GPUMemoryAreas GetGPU() => _gpuMemory;
public ScanlineCallback _scanlineCallback;
public int _scanlineCallbackLine = 0;
public void SetScanlineCallback(ScanlineCallback callback, int line)
{
_scanlineCallback = callback;
_scanlineCallbackLine = line;
if (line == -2)
{
GetGPU();
_scanlineCallback(ppu.LCDC);
}
}
#pragma warning disable CS0414
private PrinterCallback _printerCallback = null;
#pragma warning restore CS0414
public void SetPrinterCallback(PrinterCallback callback)
{
_printerCallback = null;
}
public DisplayType Region => DisplayType.NTSC;
private readonly GBHawkControllerDeck _controllerDeck;
public void HardReset()
{
GB_bios_register = 0; // bios enable
GBC_compat = is_GBC;
in_vblank = true; // we start off in vblank since the LCD is off
in_vblank_old = true;
double_speed = false;
VRAM_Bank = 0;
RAM_Bank = 1; // RAM bank always starts as 1 (even writing zero still sets 1)
RAM_Bank_ret = 0; // return value can still be zero even though the bank itself cannot be
delays_to_process = false;
controller_delay_cd = 0;
clear_counter = 0;
Register_Reset();
timer.Reset();
ppu.Reset();
audio.Reset();
serialport.Reset();
mapper.Reset();
cpu.Reset();
vid_buffer = new uint[VirtualWidth * VirtualHeight];
frame_buffer = new int[VirtualWidth * VirtualHeight];
uint startup_color = (!is_GBC && (_settings.Palette == GBSettings.PaletteType.Gr)) ? 0xFFA4C505 : 0xFFFFFFFF;
for (int i = 0; i < vid_buffer.Length; i++)
{
vid_buffer[i] = startup_color;
frame_buffer[i] = (int)vid_buffer[i];
}
for (int i = 0; i < ZP_RAM.Length; i++) for (int i = 0; i < ZP_RAM.Length; i++)
{ {
ZP_RAM[i] = 0; ZP_RAM[i] = 0;
@ -351,118 +465,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
} }
} }
public bool IsCGBMode() => is_GBC;
public IntPtr iptr0 = IntPtr.Zero;
public IntPtr iptr1 = IntPtr.Zero;
public IntPtr iptr2 = IntPtr.Zero;
public IntPtr iptr3 = IntPtr.Zero;
private GPUMemoryAreas _gpuMemory
{
get
{
Marshal.Copy(VRAM, 0, iptr0, VRAM.Length);
Marshal.Copy(OAM, 0, iptr1, OAM.Length);
if (is_GBC)
{
int[] cp2 = new int[32];
int[] cp = new int[32];
for (int i = 0; i < 32; i++)
{
cp2[i] = (int)ppu.OBJ_palette[i];
cp[i] = (int)ppu.BG_palette[i];
}
Marshal.Copy(cp2, 0, iptr2, ppu.OBJ_palette.Length);
Marshal.Copy(cp, 0, iptr3, ppu.BG_palette.Length);
}
else
{
int[] cp2 = new int[8];
for (int i = 0; i < 4; i++)
{
cp2[i] = (int)ppu.color_palette[(ppu.obj_pal_0 >> (i * 2)) & 3];
cp2[i + 4] = (int)ppu.color_palette[(ppu.obj_pal_1 >> (i * 2)) & 3];
}
Marshal.Copy(cp2, 0, iptr2, cp2.Length);
int[] cp = new int[4];
for (int i = 0; i < 4; i++)
{
cp[i] = (int)ppu.color_palette[(ppu.BGP >> (i * 2)) & 3];
}
Marshal.Copy(cp, 0, iptr3, cp.Length);
}
return new GPUMemoryAreas(iptr0, iptr1, iptr2, iptr3);
}
}
public GPUMemoryAreas GetGPU() => _gpuMemory;
public ScanlineCallback _scanlineCallback;
public int _scanlineCallbackLine = 0;
public void SetScanlineCallback(ScanlineCallback callback, int line)
{
_scanlineCallback = callback;
_scanlineCallbackLine = line;
if (line == -2)
{
GetGPU();
_scanlineCallback(ppu.LCDC);
}
}
#pragma warning disable CS0414
private PrinterCallback _printerCallback = null;
#pragma warning restore CS0414
public void SetPrinterCallback(PrinterCallback callback)
{
_printerCallback = null;
}
public DisplayType Region => DisplayType.NTSC;
private readonly GBHawkControllerDeck _controllerDeck;
public void HardReset()
{
GB_bios_register = 0; // bios enable
GBC_compat = is_GBC;
in_vblank = true; // we start off in vblank since the LCD is off
in_vblank_old = true;
double_speed = false;
VRAM_Bank = 0;
RAM_Bank = 1; // RAM bank always starts as 1 (even writing zero still sets 1)
RAM_Bank_ret = 0; // return value can still be zero even though the bank itself cannot be
delays_to_process = false;
controller_delay_cd = 0;
clear_counter = 0;
Register_Reset();
timer.Reset();
ppu.Reset();
audio.Reset();
serialport.Reset();
mapper.Reset();
cpu.Reset();
vid_buffer = new uint[VirtualWidth * VirtualHeight];
frame_buffer = new int[VirtualWidth * VirtualHeight];
uint startup_color = (!is_GBC && (_settings.Palette == GBSettings.PaletteType.Gr)) ? 0xFFA4C505 : 0xFFFFFFFF;
for (int i = 0; i < vid_buffer.Length; i++)
{
vid_buffer[i] = startup_color;
frame_buffer[i] = (int)vid_buffer[i];
}
}
// TODO: move callbacks to cpu to avoid having to make a non-inlinable // TODO: move callbacks to cpu to avoid having to make a non-inlinable
private void ExecFetch(ushort addr) private void ExecFetch(ushort addr)
{ {
@ -703,21 +705,21 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
return mppr; return mppr;
} }
public class GBHawkDisassembler : VerifiedDisassembler public class GBHawkDisassembler : VerifiedDisassembler
{ {
public override IEnumerable<string> AvailableCpus public override IEnumerable<string> AvailableCpus
{ {
get { yield return "LR35902"; } get { yield return "LR35902"; }
} }
public override string PCRegisterName => "PC"; public override string PCRegisterName => "PC";
public override string Disassemble(MemoryDomain m, uint addr, out int length) public override string Disassemble(MemoryDomain m, uint addr, out int length)
{ {
string ret = LR35902.Disassemble((ushort)addr, a => m.PeekByte(a), out var tmp); string ret = LR35902.Disassemble((ushort)addr, a => m.PeekByte(a), out var tmp);
length = tmp; length = tmp;
return ret; return ret;
} }
} }
} }
} }

1
src/BizHawk.Emulation.Cores/Consoles/Nintendo/SubGBHawk/SubGBHawk.IStatable.cs
View File

@ -36,6 +36,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.SubGBHawk
ser.Sync(nameof(input_frame_length), ref input_frame_length); ser.Sync(nameof(input_frame_length), ref input_frame_length);
ser.Sync(nameof(input_frame_length_int), ref input_frame_length_int); ser.Sync(nameof(input_frame_length_int), ref input_frame_length_int);
ser.Sync(nameof(CycleCount), ref CycleCount); ser.Sync(nameof(CycleCount), ref CycleCount);
ser.Sync(nameof(_GBCore.audio.master_audio_clock), ref _GBCore.audio.master_audio_clock);
} }
} }
} }