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

A7800Hawk another round of commits

This commit is contained in:
alyosha-tas 2017-05-27 20:40:13 -04:00 committed by GitHub
parent 7dd2008616
commit 807edebe6d
5 changed files with 67 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IEmulator.cs
View File

@ -8,6 +8,11 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
public ControllerDefinition ControllerDefinition { get; private set; }
//Maria related variables
public int cycle;
public int cpu_cycle;
public int scanline;
public void FrameAdvance(IController controller, bool render, bool rendersound)
{
_frame++;
@ -24,7 +29,23 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
_lagcount++;
}
maria.FrameAdvance();
scanline = 0;
// actually execute the frame
while (scanline < 263)
{
maria.Execute(cycle, scanline);
cycle++;
cpu_cycle++;
if (cycle == 454)
{
scanline++;
cycle = 0;
}
}
}

10
BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IMemoryDomains.cs
View File

@ -43,7 +43,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
1),
new MemoryDomainDelegate(
"Ram Block 0",
0xB,
0xB0,
MemoryDomain.Endian.Little,
addr => RAM[addr-0x840],
(addr, value) => RAM[addr-0x840] = value,
@ -51,7 +51,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
),
new MemoryDomainDelegate(
"Ram Block 1",
0xB,
0xB0,
MemoryDomain.Endian.Little,
addr => RAM[addr-0x940],
(addr, value) => RAM[addr-0x940] = value,
@ -73,12 +73,14 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
private byte PeekSystemBus(long addr)
{
return 0;
ushort addr2 = (ushort)(addr & 0xFFFF);
return ReadMemory(addr2);
}
private void PokeSystemBus(long addr, byte value)
{
ushort addr2 = (ushort)(addr & 0xFFFF);
WriteMemory(addr2, value);
}
}
}

14
BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.cs
View File

@ -50,6 +50,11 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
ser.Register<ISoundProvider>(tia);
ServiceProvider = ser;
maria = new Maria
{
ReadMemory = ReadMemory
};
CoreComm = comm;
byte[] highscoreBios = comm.CoreFileProvider.GetFirmware("A78", "Bios_HSC", false, "Some functions may not work without the high score BIOS.");
byte[] palBios = comm.CoreFileProvider.GetFirmware("A78", "Bios_PAL", false, "The game will not run if the correct region BIOS is not available.");
@ -128,9 +133,16 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
tia.Reset();
cpu.Reset();
cpu.SetCallbacks(ReadMemory, ReadMemory, ReadMemory, WriteMemory);
maria.Reset();
m6532 = new M6532();
}
TIA_regs = new byte[0x20];
Maria_regs = new byte[0x20];
RAM = new byte[0x1000];
regs_6532 = new byte[0x80];
}
/*
* MariaTables.cs

16
BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/Maria.cs
View File

@ -25,17 +25,25 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
public int VsyncNumerator => _frameHz;
public int VsyncDenominator => 1;
//Maria related variables
public int cycle;
// the Maria chip can directly access memory
public Func<ushort, byte> ReadMemory;
public void FrameAdvance()
// there are 4 maria cycles in a CPU cycle (fast access, both NTSC and PAL)
// if the 6532 or TIA are accessed (PC goes to one of those addresses) the next access will be slower by 1/2 a CPU cycle
// i.e. it will take 6 Maria cycles instead of 4
public bool slow_access = false;
// each frame contains 263 scanlines
// each scanline consists of 113.5 CPU cycles (fast access) which equates to 454 Maria cycles
// In total there are 29850.5 CPU cycles (fast access) in a frame
public void Execute(int cycle, int scanline)
{
}
public void Reset()
{
cycle = 0;
}
}

22
BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/MemoryMap.cs
View File

@ -8,10 +8,8 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
{
public partial class A7800Hawk
{
public byte ReadMemory(int addr)
public byte ReadMemory(ushort addr)
{
addr &= 0xFFFF;
if (addr < 0x0400) {
if ((addr & 0xFF) < 0x20)
{
@ -27,7 +25,14 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
}
else if ((addr & 0xFF) < 0x40)
{
return Maria_regs[(addr & 0x3F) - 0x20];
if ((A7800_control_register & 0x2) > 0)
{
return Maria_regs[(addr & 0x3F) - 0x20];
}
else
{
return 0xFF;
}
}
else if (addr < 0x100)
{
@ -75,10 +80,8 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
}
}
public void WriteMemory(int addr, byte value)
public void WriteMemory(ushort addr, byte value)
{
addr &= 0xFFFF;
if (addr < 0x0400)
{
if ((addr & 0xFF) < 0x20)
@ -95,7 +98,10 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
}
else if ((addr & 0xFF) < 0x40)
{
Maria_regs[(addr & 0x3F) - 0x20] = value;
if ((A7800_control_register & 0x2) > 0)
{
Maria_regs[(addr & 0x3F) - 0x20] = value;
}
}
else if (addr < 0x100)
{