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

GBHawk: Update frame definitions

This commit is contained in:
alyosha-tas 2019-09-18 10:28:54 -04:00
parent 32c2c4b78e
commit 2c575dd91a
10 changed files with 152 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs
View File

@ -25,6 +25,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public int HDMA_tick;
public byte HDMA_byte;
public int hbl_countdown;
// accessors for derived values
public byte BG_pal_ret
{
@ -885,6 +887,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if (pixel_counter == 160)
{
read_case = 8;
hbl_countdown = 2;
}
}
else if (pixel_counter < 0)
@ -1131,15 +1134,23 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
case 8: // done reading, we are now in phase 0
pre_render = true;
STAT &= 0xFC;
STAT |= 0x00;
// the other interrupts appear to be delayed by 1 CPU cycle, so do the same here
if (hbl_countdown > 0)
{
hbl_countdown--;
if (hbl_countdown == 0)
{
STAT &= 0xFC;
STAT |= 0x00;
if (STAT.Bit(3)) { HBL_INT = true; }
if (STAT.Bit(3)) { HBL_INT = true; }
OAM_access_read = true;
OAM_access_write = true;
VRAM_access_read = true;
VRAM_access_write = true;
OAM_access_read = true;
OAM_access_write = true;
VRAM_access_read = true;
VRAM_access_write = true;
}
}
break;
case 9:
@ -1560,6 +1571,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
ser.Sync(nameof(LYC_t), ref LYC_t);
ser.Sync(nameof(LYC_cd), ref LYC_cd);
ser.Sync(nameof(hbl_countdown), ref hbl_countdown);
base.SyncState(ser);
}

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

@ -24,7 +24,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
//Console.WriteLine("-----------------------FRAME-----------------------");
//Update the color palette if a setting changed
if(_settings.Palette == GBSettings.PaletteType.BW)
if (_settings.Palette == GBSettings.PaletteType.BW)
{
color_palette[0] = color_palette_BW[0];
color_palette[1] = color_palette_BW[1];
@ -57,9 +57,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
_islag = true;
GetControllerState(controller);
do_frame();
do_frame(controller);
if (_scanlineCallback != null)
{
@ -78,46 +76,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
return true;
}
public void do_frame()
public void do_frame(IController controller)
{
// gameboy frames can be variable lengths
// we want to end a frame when VBlank turns from false to true
int ticker = 0;
// check if new input changed the input register and triggered IRQ
byte contr_prev = input_register;
input_register &= 0xF0;
if ((input_register & 0x30) == 0x20)
{
input_register |= (byte)(controller_state & 0xF);
}
else if ((input_register & 0x30) == 0x10)
{
input_register |= (byte)((controller_state & 0xF0) >> 4);
}
else if ((input_register & 0x30) == 0x00)
{
// if both polls are set, then a bit is zero if either or both pins are zero
byte temp = (byte)((controller_state & 0xF) & ((controller_state & 0xF0) >> 4));
input_register |= temp;
}
else
{
input_register |= 0xF;
}
// check for interrupts
if (((contr_prev & 8) > 0) && ((input_register & 8) == 0) ||
((contr_prev & 4) > 0) && ((input_register & 4) == 0) ||
((contr_prev & 2) > 0) && ((input_register & 2) == 0) ||
((contr_prev & 1) > 0) && ((input_register & 1) == 0))
{
if (REG_FFFF.Bit(4)) { cpu.FlagI = true; }
REG_FF0F |= 0x10;
}
while (!vblank_rise)
for (int i = 0; i < 70224; i++)
{
// These things do not change speed in GBC double spped mode
audio.tick();
@ -129,7 +90,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
// These things all tick twice as fast in GBC double speed mode
ppu.DMA_tick();
timer.tick_1();
serialport.serial_transfer_tick();
serialport.serial_transfer_tick();
cpu.ExecuteOne(ref REG_FF0F, REG_FFFF);
timer.tick_2();
@ -157,17 +118,21 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if (in_vblank && !in_vblank_old)
{
vblank_rise = true;
// update the controller state on VBlank
GetControllerState(controller);
// check if controller state caused interrupt
do_controller_check();
// send the image on VBlank
SendVideoBuffer();
for (int j = 0; j < frame_buffer.Length; j++) { frame_buffer[j] = _vidbuffer[j]; }
}
ticker++;
if (ticker > 42134400) { throw new Exception("ERROR: Unable to Resolve Frame"); }
REG_FF0F_OLD = REG_FF0F;
in_vblank_old = in_vblank;
REG_FF0F_OLD = REG_FF0F;
}
vblank_rise = false;
}
public void do_single_step()
@ -286,7 +251,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public int Frame => _frame;
public string SystemId => "GB";
public string SystemId => "GB";
public bool DeterministicEmulation { get; set; }
@ -315,7 +280,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public int[] _vidbuffer;
public int[] frame_buffer;
public int[] GetVideoBuffer()
{
return frame_buffer;
}
public int[] SendVideoBuffer()
{
if (ppu.blank_frame)
{
@ -325,7 +297,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
ppu.blank_frame = false;
}
return _vidbuffer;
return _vidbuffer;
}
public int VirtualWidth => 160;

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

@ -101,6 +101,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
ser.Sync(nameof(Use_MT), ref Use_MT);
ser.Sync(nameof(addr_access), ref addr_access);
ser.Sync(nameof(frame_buffer), ref frame_buffer, false);
ser.Sync(nameof(_vidbuffer), ref _vidbuffer, false);
// probably a better way to do this
if (cart_RAM != null)
{

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

@ -290,6 +290,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
cpu.SetCallbacks(ReadMemory, PeekMemory, PeekMemory, WriteMemory);
_vidbuffer = new int[VirtualWidth * VirtualHeight];
frame_buffer = new int[VirtualWidth * VirtualHeight];
}
private void ExecFetch(ushort addr)

50
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IEmulator.cs
View File

@ -74,9 +74,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
GetControllerState(controller);
do_frame_fill = false;
do_frame();
if (do_frame_fill)
{
FillVideoBuffer();
}
_islag = L._islag;
_islag = L._islag & R._islag;
if (_islag)
{
@ -87,10 +93,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
}
public void do_frame()
{
L.do_controller_check();
R.do_controller_check();
{
// advance one full frame
for (int i = 0; i < 70224; i++)
{
@ -142,15 +145,34 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
// if we hit a frame boundary, update video
if (L.vblank_rise)
{
buff_L = L.GetVideoBuffer();
// update the controller state on VBlank
L.controller_state = L_controller;
// check if controller state caused interrupt
L.do_controller_check();
// send the image on VBlank
L.SendVideoBuffer();
for (int j = 0; j < L._vidbuffer.Length; j++) { L.frame_buffer[j] = L._vidbuffer[j]; }
L.vblank_rise = false;
FillVideoBuffer();
do_frame_fill = true;
}
if (R.vblank_rise)
{
buff_R = R.GetVideoBuffer();
// update the controller state on VBlank
R.controller_state = R_controller;
// check if controller state caused interrupt
R.do_controller_check();
// send the image on VBlank
R.SendVideoBuffer();
for (int j = 0; j < R._vidbuffer.Length; j++) { R.frame_buffer[j] = R._vidbuffer[j]; }
R.vblank_rise = false;
FillVideoBuffer();
do_frame_fill = true;
}
}
}
@ -158,8 +180,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
public void GetControllerState(IController controller)
{
InputCallbacks.Call();
L.controller_state = _controllerDeck.ReadPort1(controller);
R.controller_state = _controllerDeck.ReadPort2(controller);
L_controller = _controllerDeck.ReadPort1(controller);
R_controller = _controllerDeck.ReadPort2(controller);
}
public int Frame => _frame;
@ -188,8 +210,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
public int _frameHz = 60;
public int[] _vidbuffer = new int[160 * 2 * 144];
public int[] buff_L = new int[160 * 144];
public int[] buff_R = new int[160 * 144];
public int[] GetVideoBuffer()
{
@ -203,8 +223,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
{
for (int j = 0; j < 160; j++)
{
_vidbuffer[i * 320 + j] = buff_L[i * 160 + j];
_vidbuffer[i * 320 + j + 160] = buff_R[i * 160 + j];
_vidbuffer[i * 320 + j] = L.frame_buffer[i * 160 + j];
_vidbuffer[i * 320 + j + 160] = R.frame_buffer[i * 160 + j];
}
}
}

7
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.IStatable.cs
View File

@ -60,7 +60,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
ser.Sync(nameof(_cableconnected), ref _cableconnected);
ser.Sync(nameof(_cablediscosignal), ref _cablediscosignal);
ser.Sync(nameof(do_r_next), ref do_r_next);
ser.Sync(nameof(L_controller), ref L_controller);
ser.Sync(nameof(R_controller), ref R_controller);
_controllerDeck.SyncState(ser);
if (ser.IsReader)
{
FillVideoBuffer();
}
}
}
}

4
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink/GBHawkLink.cs
View File

@ -28,6 +28,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink
private bool do_r_next = false;
public byte L_controller, R_controller;
public bool do_frame_fill;
//[CoreConstructor("GB", "GBC")]
public GBHawkLink(CoreComm comm, GameInfo game_L, byte[] rom_L, GameInfo game_R, byte[] rom_R, /*string gameDbFn,*/ object settings, object syncSettings)
{

65
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IEmulator.cs
View File

@ -109,9 +109,14 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
GetControllerState(controller);
do_frame_fill = false;
do_frame();
if (do_frame_fill)
{
FillVideoBuffer();
}
_islag = L._islag;
_islag = L._islag & C._islag & R._islag;
if (_islag)
{
@ -123,10 +128,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
public void do_frame()
{
L.do_controller_check();
C.do_controller_check();
R.do_controller_check();
// advance one full frame
for (int i = 0; i < 70224; i++)
{
@ -253,21 +254,48 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
// if we hit a frame boundary, update video
if (L.vblank_rise)
{
buff_L = L.GetVideoBuffer();
// update the controller state on VBlank
L.controller_state = L_controller;
// check if controller state caused interrupt
L.do_controller_check();
// send the image on VBlank
L.SendVideoBuffer();
for (int j = 0; j < L._vidbuffer.Length; j++) { L.frame_buffer[j] = L._vidbuffer[j]; }
L.vblank_rise = false;
FillVideoBuffer();
do_frame_fill = true;
}
if (C.vblank_rise)
{
buff_C = C.GetVideoBuffer();
// update the controller state on VBlank
C.controller_state = C_controller;
// check if controller state caused interrupt
C.do_controller_check();
// send the image on VBlank
C.SendVideoBuffer();
for (int j = 0; j < C._vidbuffer.Length; j++) { C.frame_buffer[j] = C._vidbuffer[j]; }
C.vblank_rise = false;
FillVideoBuffer();
do_frame_fill = true;
}
if (R.vblank_rise)
{
buff_R = R.GetVideoBuffer();
// update the controller state on VBlank
R.controller_state = R_controller;
// check if controller state caused interrupt
R.do_controller_check();
// send the image on VBlank
R.SendVideoBuffer();
for (int j = 0; j < R._vidbuffer.Length; j++) { R.frame_buffer[j] = R._vidbuffer[j]; }
R.vblank_rise = false;
FillVideoBuffer();
do_frame_fill = true;
}
}
}
@ -275,9 +303,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
public void GetControllerState(IController controller)
{
InputCallbacks.Call();
L.controller_state = _controllerDeck.ReadPort1(controller);
C.controller_state = _controllerDeck.ReadPort2(controller);
R.controller_state = _controllerDeck.ReadPort3(controller);
L_controller = _controllerDeck.ReadPort1(controller);
C_controller = _controllerDeck.ReadPort2(controller);
R_controller = _controllerDeck.ReadPort3(controller);
}
public int Frame => _frame;
@ -307,9 +335,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
public int _frameHz = 60;
public int[] _vidbuffer = new int[160 * 2 * 144 * 2];
public int[] buff_L = new int[160 * 144];
public int[] buff_C = new int[160 * 144];
public int[] buff_R = new int[160 * 144];
public int[] GetVideoBuffer()
{
@ -323,9 +348,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
{
for (int j = 0; j < 160; j++)
{
_vidbuffer[i * 320 + j] = buff_L[i * 160 + j];
_vidbuffer[(i + 144) * 320 + j + 80] = buff_C[i * 160 + j];
_vidbuffer[i * 320 + j + 160] = buff_R[i * 160 + j];
_vidbuffer[i * 320 + j] = L.frame_buffer[i * 160 + j];
_vidbuffer[(i + 144) * 320 + j + 80] = C.frame_buffer[i * 160 + j];
_vidbuffer[i * 320 + j + 160] = R.frame_buffer[i * 160 + j];
}
}
}

8
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.IStatable.cs
View File

@ -65,7 +65,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
ser.Sync(nameof(_cableconnected_CR), ref _cableconnected_CR);
ser.Sync(nameof(_cableconnected_RL), ref _cableconnected_RL);
ser.Sync(nameof(do_2_next), ref do_2_next);
ser.Sync(nameof(L_controller), ref L_controller);
ser.Sync(nameof(C_controller), ref C_controller);
ser.Sync(nameof(R_controller), ref R_controller);
_controllerDeck.SyncState(ser);
if (ser.IsReader)
{
FillVideoBuffer();
}
}
}
}

4
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawkLink3x/GBHawkLink3x.cs
View File

@ -28,6 +28,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawkLink3x
private bool do_2_next = false;
public byte L_controller, C_controller, R_controller;
public bool do_frame_fill;
//[CoreConstructor("GB", "GBC")]
public GBHawkLink3x(CoreComm comm, GameInfo game_L, byte[] rom_L, GameInfo game_C, byte[] rom_C, GameInfo game_R, byte[] rom_R, /*string gameDbFn,*/ object settings, object syncSettings)
{