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

GBHawk: prep for future audio work

This commit is contained in:
alyosha-tas 2020-12-14 19:30:22 -05:00
parent 3df6dfb350
commit 08f1b69197
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public byte AUD_CTRL_vol_R;
public int sequencer_len, sequencer_vol, sequencer_swp;
public bool timer_bit_old;
public int sequencer_reset_cd;
public byte sample;
@ -741,9 +740,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
// frame sequencer ticks at a rate of 512 hz (or every time a 13 bit counter rolls over)
// the sequencer is actually the timer DIV register
// so if it's constantly written to, these values won't update
bool check = Core.double_speed ? Core.timer.divider_reg.Bit(13) : Core.timer.divider_reg.Bit(12);
if (!check && timer_bit_old && AUD_CTRL_power)
if (Core.DIV_falling_edge && AUD_CTRL_power)
{
sequencer_vol++; sequencer_vol &= 0x7;
sequencer_len++; sequencer_len &= 0x7;
@ -760,7 +758,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if (SQ2_len_en && SQ2_len_cntr > 0)
{
SQ2_len_cntr--;
if (SQ2_len_cntr == 0) { SQ2_enable = false; calculate_bias_gain_2(); }
if (SQ2_len_cntr == 0) { SQ2_enable = false; calculate_bias_gain_2(); Console.WriteLine("ch2: " + Core.cpu.TotalExecutedCycles + " " + SQ2_enable); }
}
if (WAVE_len_en && WAVE_len_cntr > 0)
{
@ -897,7 +895,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
timer_bit_old = Core.double_speed ? Core.timer.divider_reg.Bit(13) : Core.timer.divider_reg.Bit(12);
Core.DIV_falling_edge = false;
if (sequencer_reset_cd > 0)
{
@ -1160,7 +1158,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
ser.Sync(nameof(sequencer_len), ref sequencer_len);
ser.Sync(nameof(sequencer_vol), ref sequencer_vol);
ser.Sync(nameof(sequencer_swp), ref sequencer_swp);
ser.Sync(nameof(timer_bit_old), ref timer_bit_old);
ser.Sync(nameof(sequencer_reset_cd), ref sequencer_reset_cd);
ser.Sync(nameof(WAVE_decay_counter), ref WAVE_decay_counter);
ser.Sync(nameof(WAVE_decay_done), ref WAVE_decay_done);
@ -1189,6 +1186,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public byte Read_NR52()
{
Console.WriteLine("read: " + Core.cpu.TotalExecutedCycles);
return (byte)(
((AUD_CTRL_power ? 1 : 0) << 7) |
(SQ1_enable ? 1 : 0) |

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

@ -20,6 +20,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public bool vblank_rise;
public bool controller_was_checked;
public bool delays_to_process;
public bool DIV_falling_edge, DIV_edge_old;
public int controller_delay_cd;
public int cpu_state_hold;
public int clear_counter;
@ -110,9 +111,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
if (ppu.DMA_start && !cpu.halted && !cpu.stopped) { ppu.DMA_tick(); }
serialport.serial_transfer_tick();
// check state before changes from cpu writes
DIV_edge_old = (timer.divider_reg & 0x2000) == 0x2000;
timer.tick();
cpu.ExecuteOne();
timer.divider_reg++;
DIV_falling_edge |= DIV_edge_old & ((timer.divider_reg & 0x2000) == 0);
if (delays_to_process) { process_delays(); }
REG_FF0F_OLD = REG_FF0F;
@ -120,10 +128,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if (ppu.DMA_start && !cpu.halted && !cpu.stopped) { ppu.DMA_tick(); }
serialport.serial_transfer_tick();
timer.tick();
// check state before changes from cpu writes
DIV_edge_old = double_speed ? ((timer.divider_reg & 0x2000) == 0x2000) : ((timer.divider_reg & 0x1000) == 0x1000);
timer.tick();
cpu.ExecuteOne();
timer.divider_reg++;
DIV_falling_edge |= DIV_edge_old & (double_speed ? ((timer.divider_reg & 0x2000) == 0) : ((timer.divider_reg & 0x1000) == 0));
if (delays_to_process) { process_delays(); }
CycleCount++;
@ -184,9 +198,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
if (ppu.DMA_start && !cpu.halted && !cpu.stopped) { ppu.DMA_tick(); }
serialport.serial_transfer_tick();
// check state before changes from cpu writes
DIV_edge_old = (timer.divider_reg & 0x2000) == 0x2000;
timer.tick();
cpu.ExecuteOne();
timer.divider_reg++;
DIV_falling_edge |= DIV_edge_old & ((timer.divider_reg & 0x2000) == 0);
if (delays_to_process) { process_delays(); }
REG_FF0F_OLD = REG_FF0F;
@ -194,10 +215,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if (ppu.DMA_start && !cpu.halted && !cpu.stopped) { ppu.DMA_tick(); }
serialport.serial_transfer_tick();
// check state before changes from cpu writes
DIV_edge_old = double_speed ? ((timer.divider_reg & 0x2000) == 0x2000) : ((timer.divider_reg & 0x1000) == 0x1000);
timer.tick();
cpu.ExecuteOne();
timer.divider_reg++;
DIV_falling_edge |= DIV_edge_old & (double_speed ? ((timer.divider_reg & 0x2000) == 0) : ((timer.divider_reg & 0x1000) == 0));
if (delays_to_process) { process_delays(); }
if (in_vblank && !in_vblank_old)

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

@ -30,6 +30,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
ser.Sync(nameof(GB_bios_register), ref GB_bios_register);
ser.Sync(nameof(input_register), ref input_register);
ser.Sync(nameof(delays_to_process), ref delays_to_process);
ser.Sync(nameof(DIV_falling_edge), ref DIV_falling_edge);
ser.Sync(nameof(DIV_edge_old), ref DIV_edge_old);
ser.Sync(nameof(controller_delay_cd), ref controller_delay_cd);
ser.Sync(nameof(cpu_state_hold), ref cpu_state_hold);
ser.Sync(nameof(clear_counter), ref clear_counter);