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

A7800Hawk: Update Controllers 

Now supports 2 button controller
Also fixes a few other small bugs
This commit is contained in:
alyosha-tas 2017-07-16 11:56:02 -04:00 committed by GitHub
parent a27b4aefc1
commit 7914532ff0
9 changed files with 71 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,6 +13,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
//Maria related variables
public int cycle;
public int cpu_cycle;
public int m6532_cycle;
public bool cpu_is_haltable;
public bool cpu_is_halted;
public bool cpu_halt_pending;
@ -23,6 +24,8 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
public byte p2_state;
public byte p1_fire;
public byte p2_fire;
public byte p1_fire_2x;
public byte p2_fire_2x;
public byte con_state;
// there are 4 maria cycles in a CPU cycle (fast access, both NTSC and PAL)
@ -75,6 +78,14 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
tia.Execute(0);
}
// tick the m6532 timer, which is still active although not recommended to use
m6532_cycle++;
if (m6532_cycle== 4)
{
m6532.Timer.Tick();
m6532_cycle = 0;
}
if (cpu_cycle <= (2 + (slow_access ? 1 : 0)))
{
cpu_is_haltable = true;
@ -149,6 +160,8 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
p2_state = _controllerDeck.ReadPort2(controller);
p1_fire = _controllerDeck.ReadFire1(controller);
p2_fire = _controllerDeck.ReadFire2(controller);
p1_fire_2x = _controllerDeck.ReadFire1_2x(controller);
p2_fire_2x = _controllerDeck.ReadFire2_2x(controller);
}
public void GetConsoleState(IController controller)

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

@ -23,10 +23,10 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
1),
new MemoryDomainDelegate(
"TIA Registers",
TIA_regs.Length,
0x20,
MemoryDomain.Endian.Little,
addr => TIA_regs[addr],
(addr, value) => TIA_regs[addr] = value,
addr => tia.ReadMemory((ushort)addr,true),
(addr, value) => tia.WriteMemory((ushort)addr, value, true),
1),
new MemoryDomainDelegate(
"Maria Registers",

2
BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IStatable.cs
View File

@ -62,7 +62,6 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
ser.Sync("A7800_control_register", ref A7800_control_register);
ser.Sync("_isPAL", ref _isPAL);
ser.Sync("TIA_regs", ref TIA_regs, false);
ser.Sync("Maria_regs", ref Maria_regs, false);
ser.Sync("RAM", ref RAM, false);
ser.Sync("RAM_6532", ref RAM_6532, false);
@ -70,6 +69,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
ser.Sync("cycle", ref cycle);
ser.Sync("cpu_cycle", ref cpu_cycle);
ser.Sync("m6532_cycle", ref m6532_cycle);
ser.Sync("cpu_is_haltable", ref cpu_is_haltable);
ser.Sync("cpu_is_halted", ref cpu_is_halted);
ser.Sync("cpu_halt_pending", ref cpu_halt_pending);

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

@ -6,7 +6,7 @@ using BizHawk.Emulation.Cores.Components.M6502;
namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
{
[Core(
[CoreAttributes(
"A7800Hawk",
"",
isPorted: false,
@ -22,7 +22,6 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
public byte A7800_control_register;
// memory domains
public byte[] TIA_regs = new byte[0x20];
public byte[] Maria_regs = new byte[0x20];
public byte[] RAM = new byte[0x1000];
public byte[] RAM_6532 = new byte[0x80];
@ -131,6 +130,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
maria._frameHz = 50;
maria._screen_width = 320;
maria._screen_height = 313;
maria._vblanklines = 20;
maria._palette = PALPalette;
}
else
@ -138,6 +138,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
maria._frameHz = 60;
maria._screen_width = 320;
maria._screen_height = 263;
maria._vblanklines = 20;
maria._palette = NTSCPalette;
}
@ -171,7 +172,6 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
maria.Reset();
m6532.Reset();
TIA_regs = new byte[0x20];
Maria_regs = new byte[0x20];
RAM = new byte[0x1000];

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

@ -70,6 +70,16 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
return Port2.ReadFire(c);
}
public byte ReadFire1_2x(IController c)
{
return Port1.ReadFire2x(c);
}
public byte ReadFire2_2x(IController c)
{
return Port2.ReadFire2x(c);
}
public ControllerDefinition Definition { get; }
public void SyncState(Serializer ser)

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

@ -17,6 +17,8 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
byte ReadFire(IController c);
byte ReadFire2x(IController c);
ControllerDefinition Definition { get; }
void SyncState(Serializer ser);
@ -42,6 +44,11 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
}
public byte ReadFire(IController c)
{
return 0x80;
}
public byte ReadFire2x(IController c)
{
return 0;
}
@ -101,6 +108,20 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
return result;
}
public byte ReadFire2x(IController c)
{
byte result = 0;
if (c.IsPressed(Definition.BoolButtons[4]))
{
result = 0x80;
}
if (c.IsPressed(Definition.BoolButtons[5]))
{
result |= 0x40;
}
return result;
}
public ControllerDefinition Definition { get; }
@ -111,7 +132,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
private static readonly string[] BaseDefinition =
{
"U", "D", "L", "R", "Fire"
"U", "D", "L", "R", "Fire", "Fire2"
};
private static byte[] HandControllerButtons =

15
BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/M6532.cs
View File

@ -1,4 +1,5 @@
using BizHawk.Common;
using System;
namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
{
@ -8,9 +9,10 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
public A7800Hawk Core { get; set; }
private byte _ddRa = 0x00;
private byte _ddRb = 0x00;
private byte _outputA = 0x00;
public byte _ddRa = 0x00;
public byte _ddRb = 0x00;
public byte _outputA = 0x00;
public byte _outputB = 0x00;
public TimerData Timer;
@ -55,6 +57,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
// Read Output reg B
byte temp = Core.con_state;
temp = (byte)(temp & ~_ddRb);
temp = (byte)(temp + (_outputB & _ddRb));
return temp;
}
@ -166,7 +169,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
else if (registerAddr == 0x02)
{
// Write Output reg B
// But is read only
_outputB = value;
}
else if (registerAddr == 0x03)
{
@ -187,7 +190,8 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
_ddRa = 0x00;
_ddRb = 0x00;
_outputA = 0x00;
}
_outputB = 0x00;
}
public void SyncState(Serializer ser)
{
@ -195,6 +199,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
ser.Sync("ddra", ref _ddRa);
ser.Sync("ddrb", ref _ddRb);
ser.Sync("OutputA", ref _outputA);
ser.Sync("OutputB", ref _outputB);
Timer.SyncState(ser);
ser.EndSection();
}

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

@ -31,6 +31,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
public int _frameHz = 60;
public int _screen_width = 320;
public int _screen_height = 263;
public int _vblanklines = 20;
public int[] _vidbuffer;
public int[] _palette;
@ -42,9 +43,9 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
}
public int VirtualWidth => 320;
public int VirtualHeight => _screen_height;
public int VirtualHeight => _screen_height - _vblanklines;
public int BufferWidth => 320;
public int BufferHeight => _screen_height;
public int BufferHeight => _screen_height - _vblanklines;
public int BackgroundColor => unchecked((int)0xff000000);
public int VsyncNumerator => _frameHz;
public int VsyncDenominator => 1;
@ -71,7 +72,6 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
public int header_read_time = 8; // default for 4 byte headers (10 for 5 bytes ones)
public int graphics_read_time = 3; // depends on content of graphics header
public int DMA_phase_next;
public int base_scanline;
public ushort display_zone_pointer;
public int display_zone_counter;
@ -120,14 +120,10 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
// Since long shut down loads up the next zone, this basically loads up the DLL for the first zone
sl_DMA_complete = false;
do_dma = false;
for (int i=0; i<454;i++)
{
if (i<28)
{
// DMA doesn't start until 7 CPU cycles into a scanline
}
else if (i==28 && Core.Maria_regs[0x1C].Bit(6) && !Core.Maria_regs[0x1C].Bit(5))
if(i==0 && Core.Maria_regs[0x1C].Bit(6) && !Core.Maria_regs[0x1C].Bit(5))
{
Core.cpu_halt_pending = true;
DMA_phase = DMA_START_UP;
@ -161,21 +157,17 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
scanline++;
cycle = 0;
do_dma = false;
Core.Maria_regs[8] = 0; // we have now left VBLank
base_scanline = 0;
sl_DMA_complete = false;
Core.cpu.RDY = true;
Core.Maria_regs[8] = 0; // we have now left VBLank
// Now proceed with the remaining scanlines
// the first one is a pre-render line, since we didn't actually put any data into the buffer yet
while (scanline < 263)
{
if (cycle < 28)
{
// DMA doesn't start until 7 CPU cycles into a scanline
}
else if (cycle == 28 && Core.Maria_regs[0x1C].Bit(6) && !Core.Maria_regs[0x1C].Bit(5))
if (cycle == 28 && Core.Maria_regs[0x1C].Bit(6) && !Core.Maria_regs[0x1C].Bit(5))
{
Core.cpu_halt_pending = true;
DMA_phase = DMA_START_UP;
@ -374,7 +366,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
}
// the address here is specified by CHAR_BASE maria registers
//ushort addr = (ushort)(GFX_Objects[header_counter].addr & 0xFF);
// ushort addr = (ushort)(GFX_Objects[header_counter].addr & 0xFF);
for (int i = 0; i < GFX_Objects[header_counter].width; i++)
{
addr_t = ReadMemory((ushort)(GFX_Objects[header_counter].addr + i));

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

@ -35,7 +35,6 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
else
{
return tia.ReadMemory((ushort)(addr & 0x1F), false);
//return TIA_regs[addr & 0x1F]; // TODO: what to return here?
}
}
else if ((addr & 0xFCE0) == 0x20)
@ -110,7 +109,6 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk
}
else
{
TIA_regs[addr & 0x1F] = value;
tia.WriteMemory((ushort)(addr & 0x1F), value, false);
}
}