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

GBHawk - simplify mapper code

This commit is contained in:
adelikat 2020-04-23 19:31:01 -05:00
parent 601e489b15
commit a88154ca27
3 changed files with 147 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,4 @@
using System;
using System.IO;
using System.IO;
using BizHawk.Common;
namespace BizHawk.Emulation.Cores.Nintendo.GBHawk

29
BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Camera.cs
View File

@ -1,6 +1,5 @@
using BizHawk.Common;
using BizHawk.Emulation.Cores.Components.LR35902;
using System;
namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
@ -34,10 +33,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
return Core._rom[addr];
}
else
{
return Core._rom[(addr - 0x4000) + ROM_bank * 0x4000];
}
return Core._rom[(addr - 0x4000) + ROM_bank * 0x4000];
}
public override byte ReadMemoryHigh(ushort addr)
@ -48,22 +45,16 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
return 0;// regs[0];
}
else
{
return 0;
}
return 0;
}
else
if (/*RAM_enable && */(((addr - 0xA000) + RAM_bank * 0x2000) < Core.cart_RAM.Length))
{
if (/*RAM_enable && */(((addr - 0xA000) + RAM_bank * 0x2000) < Core.cart_RAM.Length))
{
return Core.cart_RAM[(addr - 0xA000) + RAM_bank * 0x2000];
}
else
{
return 0xFF;
}
return Core.cart_RAM[(addr - 0xA000) + RAM_bank * 0x2000];
}
return 0xFF;
}
public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
@ -137,7 +128,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
Core.cart_RAM[(addr - 0xA000) + RAM_bank * 0x2000] = value;
}
}
}
}
}

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

@ -1,5 +1,4 @@
using BizHawk.Emulation.Common;
using System;
/*
@ -44,111 +43,119 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
return 0xFF;
}
else
{
return mapper.ReadMemoryLow(addr);
}
return mapper.ReadMemoryLow(addr);
}
else if ((addr >= 0xE000) && (addr < 0xF000))
if (addr >= 0xE000 && (addr < 0xF000))
{
return RAM[addr - 0xE000];
}
else if ((addr >= 0xF000) && (addr < 0xFE00))
if (addr >= 0xF000 && addr < 0xFE00)
{
return RAM[(RAM_Bank * 0x1000) + (addr - 0xF000)];
}
else if ((addr >= 0xFE00) && (addr < 0xFEA0) && ppu.DMA_OAM_access)
if (addr >= 0xFE00 && addr < 0xFEA0 && ppu.DMA_OAM_access)
{
return OAM[addr - 0xFE00];
}
else if ((addr >= 0xFF00) && (addr < 0xFF80)) // The game GOAL! Requires Hardware Regs to be accessible
if (addr >= 0xFF00 && addr < 0xFF80) // The game GOAL! Requires Hardware Regs to be accessible
{
return Read_Registers(addr);
}
else if ((addr >= 0xFF80))
if ((addr >= 0xFF80))
{
// register FFFF?
return ZP_RAM[addr - 0xFF80];
}
return 0xFF;
}
if (addr < 0x8000)
if (addr < 0x8000)
{
if (addr >= 0x900)
{
return mapper.ReadMemoryLow(addr);
return mapper.ReadMemoryLow(addr);
}
else
if (addr < 0x100)
{
if (addr < 0x100)
// return Either BIOS ROM or Game ROM
if ((GB_bios_register & 0x1) == 0)
{
// return Either BIOS ROM or Game ROM
if ((GB_bios_register & 0x1) == 0)
{
return _bios[addr]; // Return BIOS
}
else
{
return mapper.ReadMemoryLow(addr);
}
}
else if (addr >= 0x200)
{
// return Either BIOS ROM or Game ROM
if (((GB_bios_register & 0x1) == 0) && is_GBC)
{
return _bios[addr]; // Return BIOS
}
else
{
return mapper.ReadMemoryLow(addr);
}
}
else
{
return mapper.ReadMemoryLow(addr);
return _bios[addr]; // Return BIOS
}
return mapper.ReadMemoryLow(addr);
}
if (addr >= 0x200)
{
// return Either BIOS ROM or Game ROM
if (((GB_bios_register & 0x1) == 0) && is_GBC)
{
return _bios[addr]; // Return BIOS
}
return mapper.ReadMemoryLow(addr);
}
return mapper.ReadMemoryLow(addr);
}
else if (addr < 0xA000)
if (addr < 0xA000)
{
if (ppu.VRAM_access_read) { return VRAM[(VRAM_Bank * 0x2000) + (addr - 0x8000)]; }
else { return 0xFF; }
if (ppu.VRAM_access_read)
{
return VRAM[VRAM_Bank * 0x2000 + (addr - 0x8000)];
}
return 0xFF;
}
else if (addr < 0xC000)
if (addr < 0xC000)
{
return mapper.ReadMemoryHigh(addr);
}
else if (addr < 0xFE00)
if (addr < 0xFE00)
{
addr = (ushort)(RAM_Bank * (addr & 0x1000) + (addr & 0xFFF));
return RAM[addr];
}
else if (addr < 0xFEA0)
if (addr < 0xFEA0)
{
if (ppu.OAM_access_read) { return OAM[addr - 0xFE00]; }
else { return 0xFF; }
if (ppu.OAM_access_read)
{
return OAM[addr - 0xFE00];
}
return 0xFF;
}
else if (addr < 0xFF00)
if (addr < 0xFF00)
{
// unmapped memory, returns 0xFF
return 0xFF;
}
else if (addr < 0xFF80)
{
return Read_Registers(addr);
}
else if (addr < 0xFFFF)
{
return ZP_RAM[addr - 0xFF80];
}
else
if (addr < 0xFF80)
{
return Read_Registers(addr);
}
if (addr < 0xFFFF)
{
return ZP_RAM[addr - 0xFF80];
}
return Read_Registers(addr);
}
public void WriteMemory(ushort addr, byte value)
@ -164,26 +171,27 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
if (ppu.DMA_start)
{
// some of gekkio's tests require this to be accessible during DMA
if ((addr >= 0xE000) && (addr < 0xF000))
if (addr >= 0xE000 && addr < 0xF000)
{
RAM[addr - 0xE000] = value;
}
else if ((addr >= 0xF000) && (addr < 0xFE00))
else if (addr >= 0xF000 && addr < 0xFE00)
{
RAM[(RAM_Bank * 0x1000) + (addr - 0xF000)] = value;
RAM[RAM_Bank * 0x1000 + (addr - 0xF000)] = value;
}
else if ((addr >= 0xFE00) && (addr < 0xFEA0) && ppu.DMA_OAM_access)
else if (addr >= 0xFE00 && addr < 0xFEA0 && ppu.DMA_OAM_access)
{
OAM[addr - 0xFE00] = value;
}
else if ((addr >= 0xFF00) && (addr < 0xFF80)) // The game GOAL! Requires Hardware Regs to be accessible
else if (addr >= 0xFF00 && addr < 0xFF80) // The game GOAL! Requires Hardware Regs to be accessible
{
Write_Registers(addr, value);
}
else if ((addr >= 0xFF80))
else if (addr >= 0xFF80)
{
ZP_RAM[addr - 0xFF80] = value;
}
return;
}
@ -205,7 +213,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
else if (addr >= 0xFE00)
{
if ((addr < 0xFEA0) && ppu.OAM_access_write)
if (addr < 0xFEA0 && ppu.OAM_access_write)
{
OAM[addr - 0xFE00] = value;
}
@ -244,7 +252,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
else if (addr >= 0x200)
{
if (((GB_bios_register & 0x1) == 0) && is_GBC)
if ((GB_bios_register & 0x1) == 0 && is_GBC)
{
// No Writing to BIOS
}
@ -272,28 +280,31 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
return 0xFF;
}
else
{
return mapper.PeekMemoryLow(addr);
}
return mapper.PeekMemoryLow(addr);
}
else if ((addr >= 0xE000) && (addr < 0xF000))
if (addr >= 0xE000 && addr < 0xF000)
{
return RAM[addr - 0xE000];
}
else if ((addr >= 0xF000) && (addr < 0xFE00))
if (addr >= 0xF000 && addr < 0xFE00)
{
return RAM[(RAM_Bank * 0x1000) + (addr - 0xF000)];
}
else if ((addr >= 0xFE00) && (addr < 0xFEA0) && ppu.DMA_OAM_access)
if (addr >= 0xFE00 && addr < 0xFEA0 && ppu.DMA_OAM_access)
{
return OAM[addr - 0xFE00];
}
else if ((addr >= 0xFF00) && (addr < 0xFF80)) // The game GOAL! Requires Hardware Regs to be accessible
if (addr >= 0xFF00 && addr < 0xFF80) // The game GOAL! Requires Hardware Regs to be accessible
{
return Read_Registers(addr);
}
else if ((addr >= 0xFF80))
if (addr >= 0xFF80)
{
return ZP_RAM[addr - 0xFF80];
}
@ -307,75 +318,80 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
return mapper.PeekMemoryLow(addr);
}
else
if (addr < 0x100)
{
if (addr < 0x100)
// return Either BIOS ROM or Game ROM
if ((GB_bios_register & 0x1) == 0)
{
// return Either BIOS ROM or Game ROM
if ((GB_bios_register & 0x1) == 0)
{
return _bios[addr]; // Return BIOS
}
else
{
return mapper.PeekMemoryLow(addr);
}
}
else if (addr >= 0x200)
{
// return Either BIOS ROM or Game ROM
if (((GB_bios_register & 0x1) == 0) && is_GBC)
{
return _bios[addr]; // Return BIOS
}
else
{
return mapper.PeekMemoryLow(addr);
}
}
else
{
return mapper.PeekMemoryLow(addr);
return _bios[addr]; // Return BIOS
}
return mapper.PeekMemoryLow(addr);
}
if (addr >= 0x200)
{
// return Either BIOS ROM or Game ROM
if (((GB_bios_register & 0x1) == 0) && is_GBC)
{
return _bios[addr]; // Return BIOS
}
return mapper.PeekMemoryLow(addr);
}
return mapper.PeekMemoryLow(addr);
}
else if (addr < 0xA000)
if (addr < 0xA000)
{
if (ppu.VRAM_access_read) { return VRAM[(VRAM_Bank * 0x2000) + (addr - 0x8000)]; }
else { return 0xFF; }
if (ppu.VRAM_access_read)
{
return VRAM[(VRAM_Bank * 0x2000) + (addr - 0x8000)];
}
return 0xFF;
}
else if (addr < 0xC000)
if (addr < 0xC000)
{
return mapper.PeekMemoryHigh(addr);
}
else if (addr < 0xFE00)
if (addr < 0xFE00)
{
addr = (ushort)(RAM_Bank * (addr & 0x1000) + (addr & 0xFFF));
return RAM[addr];
}
else if (addr < 0xFEA0)
if (addr < 0xFEA0)
{
if (ppu.OAM_access_read) { return OAM[addr - 0xFE00]; }
else { return 0xFF; }
if (ppu.OAM_access_read)
{
return OAM[addr - 0xFE00];
}
return 0xFF;
}
else if (addr < 0xFF00)
if (addr < 0xFF00)
{
// unmapped memory, returns 0xFF
return 0xFF;
}
else if (addr < 0xFF80)
{
return Read_Registers(addr);
}
else if (addr < 0xFFFF)
{
return ZP_RAM[addr - 0xFF80];
}
else
if (addr < 0xFF80)
{
return Read_Registers(addr);
}
if (addr < 0xFFFF)
{
return ZP_RAM[addr - 0xFF80];
}
return Read_Registers(addr);
}
}
}