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

GBHawK: HDMA and IRQ work

This commit is contained in:
alyosha-tas 2019-10-08 19:21:40 -04:00
parent 1c07d3d2ad
commit a8080d129d
3 changed files with 105 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BizHawk.Emulation.Cores/CPUs/LR35902/Interrupts.cs
View File

@ -13,13 +13,13 @@ namespace BizHawk.Emulation.Common.Components.LR35902
WR, SPl, SPh, PCh, WR, SPl, SPh, PCh,
IDLE, IDLE,
DEC16, SPl, SPh, DEC16, SPl, SPh,
INT_GET, W,// NOTE: here is where we check for a cancelled IRQ IDLE,
WR, SPl, SPh, PCl, WR, SPl, SPh, PCl,
IDLE, IDLE,
IDLE, IDLE,
IDLE, IDLE,
IDLE, IDLE,
IDLE, INT_GET, W,// NOTE: here is where we check for a cancelled IRQ
IDLE, IDLE,
IDLE, IDLE,
IDLE, IDLE,
@ -37,23 +37,23 @@ namespace BizHawk.Emulation.Common.Components.LR35902
IDLE, IDLE,
WR, SPl, SPh, PCh, WR, SPl, SPh, PCh,
IDLE, IDLE,
INT_GET, W,// NOTE: here is where we check for a cancelled IRQ
DEC16, SPl, SPh, DEC16, SPl, SPh,
IDLE,
WR, SPl, SPh, PCl, WR, SPl, SPh, PCl,
IDLE, IDLE,
IDLE, IDLE,
IDLE, IDLE,
IDLE, IDLE,
IDLE,
INT_GET, W,// NOTE: here is where we check for a cancelled IRQ
IDLE,
TR, PCl, W, TR, PCl, W,
IDLE,
ASGN, PCh, 0, ASGN, PCh, 0,
IDLE, IDLE,
IDLE, IDLE,
IDLE, IDLE,
IDLE, IDLE,
IDLE,
IDLE,
IDLE,
IDLE,
IRQ_CLEAR, IRQ_CLEAR,
OP }; OP };
} }

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

@ -274,12 +274,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{ {
// Do HDMA ticks // Do HDMA ticks
if (HDMA_active) if (HDMA_active)
{
if (HDMA_countdown == 0)
{ {
if (HDMA_length > 0) if (HDMA_length > 0)
{ {
if (!HDMA_mode) if (!HDMA_mode)
{
if (HDMA_countdown > 0)
{
HDMA_countdown--;
}
else
{ {
// immediately transfer bytes, 2 bytes per cycles // immediately transfer bytes, 2 bytes per cycles
if ((HDMA_tick % 2) == 0) if ((HDMA_tick % 2) == 0)
@ -296,6 +300,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
HDMA_tick++; HDMA_tick++;
} }
}
else else
{ {
// only transfer during mode 0, and only 16 bytes at a time // only transfer during mode 0, and only 16 bytes at a time
@ -315,6 +320,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{ {
Core.HDMA_transfer = true; Core.HDMA_transfer = true;
if (HDMA_countdown > 0)
{
HDMA_countdown--;
}
else
{
if ((HDMA_tick % 2) == 0) if ((HDMA_tick % 2) == 0)
{ {
HDMA_byte = Core.ReadMemory(cur_DMA_src); HDMA_byte = Core.ReadMemory(cur_DMA_src);
@ -339,6 +350,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
HDMA_tick++; HDMA_tick++;
} }
}
else else
{ {
Core.HDMA_transfer = false; Core.HDMA_transfer = false;
@ -351,12 +363,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
Core.HDMA_transfer = false; Core.HDMA_transfer = false;
} }
} }
else
{
HDMA_countdown--;
}
}
// the ppu only does anything if it is turned on via bit 7 of LCDC // the ppu only does anything if it is turned on via bit 7 of LCDC
if (LCDC.Bit(7)) if (LCDC.Bit(7))
@ -644,14 +650,12 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if (Core.REG_FFFF.Bit(1)) { Core.cpu.FlagI = true; } if (Core.REG_FFFF.Bit(1)) { Core.cpu.FlagI = true; }
Core.REG_FF0F |= 0x02; Core.REG_FF0F |= 0x02;
/* //if (Core.cpu.cur_instr[Core.cpu.instr_pntr] == 46)
if (Core.cpu.cur_instr[Core.cpu.instr_pntr] == 46) //{
{ //Console.Write(VBL_INT + " " + LYC_INT + " " + HBL_INT + " " + OAM_INT + " ");
Console.Write(VBL_INT + " " + LYC_INT + " " + HBL_INT + " " + OAM_INT + " ");
//Core.last_rise = Core.cpu.TotalExecutedCycles; //Core.last_rise = Core.cpu.TotalExecutedCycles;
Console.WriteLine(STAT + " " + cycle + " " + Core.cpu.TotalExecutedCycles); //Console.WriteLine(STAT + " " + cycle + " " + Core.cpu.TotalExecutedCycles);
} //}
*/
} }
stat_line_old = stat_line; stat_line_old = stat_line;
@ -1103,6 +1107,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if (hbl_countdown > 0) if (hbl_countdown > 0)
{ {
hbl_countdown--; hbl_countdown--;
if (hbl_countdown == 0) if (hbl_countdown == 0)
{ {
STAT &= 0xFC; STAT &= 0xFC;
@ -1482,8 +1487,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public override void SyncState(Serializer ser) public override void SyncState(Serializer ser)
{ {
ser.Sync("pal_transfer_byte", ref BG_transfer_byte); ser.Sync(nameof(BG_transfer_byte), ref BG_transfer_byte);
ser.Sync("spr_transfer_byte", ref OBJ_transfer_byte); ser.Sync(nameof(OBJ_transfer_byte), ref OBJ_transfer_byte);
ser.Sync(nameof(HDMA_src_hi), ref HDMA_src_hi); ser.Sync(nameof(HDMA_src_hi), ref HDMA_src_hi);
ser.Sync(nameof(HDMA_src_lo), ref HDMA_src_lo); ser.Sync(nameof(HDMA_src_lo), ref HDMA_src_lo);
ser.Sync(nameof(HDMA_dest_hi), ref HDMA_dest_hi); ser.Sync(nameof(HDMA_dest_hi), ref HDMA_dest_hi);

49
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU_GB.cs
View File

@ -48,6 +48,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public int VRAM_sel; public int VRAM_sel;
public bool BG_V_flip; public bool BG_V_flip;
public bool HDMA_mode; public bool HDMA_mode;
public bool HDMA_run_once;
public ushort cur_DMA_src; public ushort cur_DMA_src;
public ushort cur_DMA_dest; public ushort cur_DMA_dest;
public int HDMA_length; public int HDMA_length;
@ -211,17 +212,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
HBL_HDMA_count = 0x10; HBL_HDMA_count = 0x10;
// TODO: DOES HDMA start if triggered in mode 0 immediately? (for now assume no) // TODO: DOES HDMA start if triggered in mode 0 immediately? (for now assume no)
if ((STAT & 3) == 0)
{
last_HBL = LY;
}
else
{
last_HBL = LY - 1; last_HBL = LY - 1;
}
HBL_test = true; HBL_test = true;
HBL_HDMA_go = false; HBL_HDMA_go = false;
if (!LCDC.Bit(7))
{
HDMA_run_once = true;
}
} }
else else
{ {
@ -277,12 +276,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{ {
// Do HDMA ticks // Do HDMA ticks
if (HDMA_active) if (HDMA_active)
{
if (HDMA_countdown == 0)
{ {
if (HDMA_length > 0) if (HDMA_length > 0)
{ {
if (!HDMA_mode) if (!HDMA_mode)
{
if (HDMA_countdown > 0)
{
HDMA_countdown--;
}
else
{ {
// immediately transfer bytes, 2 bytes per cycles // immediately transfer bytes, 2 bytes per cycles
if ((HDMA_tick % 2) == 0) if ((HDMA_tick % 2) == 0)
@ -299,19 +302,32 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
HDMA_tick++; HDMA_tick++;
} }
}
else else
{ {
// only transfer during mode 0, and only 16 bytes at a time // only transfer during mode 0, and only 16 bytes at a time
if (((STAT & 3) == 0) && (LY != last_HBL) && HBL_test && (LY_inc == 1)) if (((STAT & 3) == 0) && (LY != last_HBL) && HBL_test && (LY_inc == 1) && (cycle > 4))
{ {
HBL_HDMA_go = true; HBL_HDMA_go = true;
HBL_test = false; HBL_test = false;
} }
else if (HDMA_run_once)
{
HBL_HDMA_go = true;
HBL_test = false;
HDMA_run_once = false;
}
if (HBL_HDMA_go && (HBL_HDMA_count > 0)) if (HBL_HDMA_go && (HBL_HDMA_count > 0))
{ {
Core.HDMA_transfer = true; Core.HDMA_transfer = true;
if (HDMA_countdown > 0)
{
HDMA_countdown--;
}
else
{
if ((HDMA_tick % 2) == 0) if ((HDMA_tick % 2) == 0)
{ {
HDMA_byte = Core.ReadMemory(cur_DMA_src); HDMA_byte = Core.ReadMemory(cur_DMA_src);
@ -327,6 +343,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if ((HBL_HDMA_count == 0) && (HDMA_length != 0)) if ((HBL_HDMA_count == 0) && (HDMA_length != 0))
{ {
HBL_test = true; HBL_test = true;
last_HBL = LY; last_HBL = LY;
HBL_HDMA_count = 0x10; HBL_HDMA_count = 0x10;
@ -335,6 +352,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
HDMA_tick++; HDMA_tick++;
} }
}
else else
{ {
Core.HDMA_transfer = false; Core.HDMA_transfer = false;
@ -347,12 +365,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
Core.HDMA_transfer = false; Core.HDMA_transfer = false;
} }
} }
else
{
HDMA_countdown--;
}
}
// the ppu only does anything if it is turned on via bit 7 of LCDC // the ppu only does anything if it is turned on via bit 7 of LCDC
if (LCDC.Bit(7)) if (LCDC.Bit(7))
@ -1535,8 +1547,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public override void SyncState(Serializer ser) public override void SyncState(Serializer ser)
{ {
ser.Sync("pal_transfer_byte", ref BG_transfer_byte); ser.Sync(nameof(BG_transfer_byte), ref BG_transfer_byte);
ser.Sync("spr_transfer_byte", ref OBJ_transfer_byte); ser.Sync(nameof(OBJ_transfer_byte), ref OBJ_transfer_byte);
ser.Sync(nameof(HDMA_src_hi), ref HDMA_src_hi); ser.Sync(nameof(HDMA_src_hi), ref HDMA_src_hi);
ser.Sync(nameof(HDMA_src_lo), ref HDMA_src_lo); ser.Sync(nameof(HDMA_src_lo), ref HDMA_src_lo);
ser.Sync(nameof(HDMA_dest_hi), ref HDMA_dest_hi); ser.Sync(nameof(HDMA_dest_hi), ref HDMA_dest_hi);
@ -1547,6 +1559,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
ser.Sync(nameof(VRAM_sel), ref VRAM_sel); ser.Sync(nameof(VRAM_sel), ref VRAM_sel);
ser.Sync(nameof(BG_V_flip), ref BG_V_flip); ser.Sync(nameof(BG_V_flip), ref BG_V_flip);
ser.Sync(nameof(HDMA_mode), ref HDMA_mode); ser.Sync(nameof(HDMA_mode), ref HDMA_mode);
ser.Sync(nameof(HDMA_run_once), ref HDMA_run_once);
ser.Sync(nameof(cur_DMA_src), ref cur_DMA_src); ser.Sync(nameof(cur_DMA_src), ref cur_DMA_src);
ser.Sync(nameof(cur_DMA_dest), ref cur_DMA_dest); ser.Sync(nameof(cur_DMA_dest), ref cur_DMA_dest);
ser.Sync(nameof(HDMA_length), ref HDMA_length); ser.Sync(nameof(HDMA_length), ref HDMA_length);