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

GBHawk: work on edge case VRAm access, still needs work

This commit is contained in:
alyosha-tas 2020-05-02 09:26:31 -04:00
parent 06f6e71c75
commit 3674b9ed21
3 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs
View File

@ -571,7 +571,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{ {
OAM_access_read = false; OAM_access_read = false;
OAM_access_write = true; OAM_access_write = true;
VRAM_access_read = false;
} }
else else
{ {
@ -587,6 +586,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
STAT |= 0x03; STAT |= 0x03;
OAM_INT = false; OAM_INT = false;
OAM_access_write = false; OAM_access_write = false;
VRAM_access_read = false;
VRAM_access_write = false; VRAM_access_write = false;
// x-scroll is expected to be latched one cycle later // x-scroll is expected to be latched one cycle later
@ -958,6 +958,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
temp_fetch = y_tile * 32 + (x_tile + tile_inc) % 32; temp_fetch = y_tile * 32 + (x_tile + tile_inc) % 32;
tile_byte = Core.VRAM[0x1800 + (LCDC.Bit(3) ? 1 : 0) * 0x400 + temp_fetch]; tile_byte = Core.VRAM[0x1800 + (LCDC.Bit(3) ? 1 : 0) * 0x400 + temp_fetch];
tile_data[2] = Core.VRAM[0x3800 + (LCDC.Bit(3) ? 1 : 0) * 0x400 + temp_fetch]; tile_data[2] = Core.VRAM[0x3800 + (LCDC.Bit(3) ? 1 : 0) * 0x400 + temp_fetch];
bus_return = tile_data[2];
VRAM_sel = tile_data[2].Bit(3) ? 1 : 0; VRAM_sel = tile_data[2].Bit(3) ? 1 : 0;
BG_V_flip = tile_data[2].Bit(6) & Core.GBC_compat; BG_V_flip = tile_data[2].Bit(6) & Core.GBC_compat;
@ -983,6 +984,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if (LCDC.Bit(4)) if (LCDC.Bit(4))
{ {
tile_data[0] = Core.VRAM[(VRAM_sel * 0x2000) + tile_byte * 16 + y_scroll_offset * 2]; tile_data[0] = Core.VRAM[(VRAM_sel * 0x2000) + tile_byte * 16 + y_scroll_offset * 2];
bus_return = tile_data[0];
} }
else else
{ {
@ -992,6 +994,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
tile_byte -= 256; tile_byte -= 256;
} }
tile_data[0] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2]; tile_data[0] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2];
bus_return = tile_data[0];
} }
read_case = 2; read_case = 2;
@ -1020,6 +1023,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
tile_byte += 256; tile_byte += 256;
} }
tile_data[1] = Core.VRAM[(VRAM_sel * 0x2000) + tile_byte * 16 + y_scroll_offset * 2 + 1]; tile_data[1] = Core.VRAM[(VRAM_sel * 0x2000) + tile_byte * 16 + y_scroll_offset * 2 + 1];
bus_return = tile_data[1];
} }
else else
{ {
@ -1029,6 +1033,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
tile_byte -= 256; tile_byte -= 256;
} }
tile_data[1] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2 + 1]; tile_data[1] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2 + 1];
bus_return = tile_data[1];
} }
if (pre_render) if (pre_render)
@ -1063,6 +1068,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
tile_data[2] = Core.VRAM[0x3800 + (LCDC.Bit(6) ? 1 : 0) * 0x400 + temp_fetch]; tile_data[2] = Core.VRAM[0x3800 + (LCDC.Bit(6) ? 1 : 0) * 0x400 + temp_fetch];
VRAM_sel = tile_data[2].Bit(3) ? 1 : 0; VRAM_sel = tile_data[2].Bit(3) ? 1 : 0;
BG_V_flip = tile_data[2].Bit(6) & Core.GBC_compat; BG_V_flip = tile_data[2].Bit(6) & Core.GBC_compat;
bus_return = tile_data[2];
window_tile_inc++; window_tile_inc++;
read_case = 5; read_case = 5;
@ -1083,6 +1089,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if (LCDC.Bit(4)) if (LCDC.Bit(4))
{ {
tile_data[0] = Core.VRAM[(VRAM_sel * 0x2000) + tile_byte * 16 + y_scroll_offset * 2]; tile_data[0] = Core.VRAM[(VRAM_sel * 0x2000) + tile_byte * 16 + y_scroll_offset * 2];
bus_return = tile_data[0];
} }
else else
{ {
@ -1092,6 +1099,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
tile_byte -= 256; tile_byte -= 256;
} }
tile_data[0] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2]; tile_data[0] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2];
bus_return = tile_data[0];
} }
read_case = 6; read_case = 6;
@ -1117,6 +1125,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
tile_byte += 256; tile_byte += 256;
} }
tile_data[1] = Core.VRAM[(VRAM_sel * 0x2000) + tile_byte * 16 + y_scroll_offset * 2 + 1]; tile_data[1] = Core.VRAM[(VRAM_sel * 0x2000) + tile_byte * 16 + y_scroll_offset * 2 + 1];
bus_return = tile_data[1];
} }
else else
{ {
@ -1126,6 +1135,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
tile_byte -= 256; tile_byte -= 256;
} }
tile_data[1] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2 + 1]; tile_data[1] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2 + 1];
bus_return = tile_data[1];
} }
if (window_pre_render) if (window_pre_render)

5
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/MemoryMap.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using System;
/* /*
@ -125,6 +126,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
return VRAM[VRAM_Bank * 0x2000 + (addr - 0x8000)]; return VRAM[VRAM_Bank * 0x2000 + (addr - 0x8000)];
} }
if (ppu.pixel_counter == 160)
{
return ppu.bus_return;
}
return 0xFF; return 0xFF;
} }

4
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/PPU.cs
View File

@ -14,6 +14,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
public bool HDMA_active; public bool HDMA_active;
public bool clear_screen; public bool clear_screen;
// TODO: need a test ROM for the details here
public byte bus_return;
// register variables // register variables
public byte LCDC; public byte LCDC;
public byte STAT; public byte STAT;
@ -175,6 +178,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
ser.Sync(nameof(OBJ_palette), ref OBJ_palette, false); ser.Sync(nameof(OBJ_palette), ref OBJ_palette, false);
ser.Sync(nameof(HDMA_active), ref HDMA_active); ser.Sync(nameof(HDMA_active), ref HDMA_active);
ser.Sync(nameof(clear_screen), ref clear_screen); ser.Sync(nameof(clear_screen), ref clear_screen);
ser.Sync(nameof(bus_return), ref bus_return);
ser.Sync(nameof(LCDC), ref LCDC); ser.Sync(nameof(LCDC), ref LCDC);
ser.Sync(nameof(STAT), ref STAT); ser.Sync(nameof(STAT), ref STAT);