6502/EightBitNet
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBitNet.git synced 2026-04-25 09:16:41 +00:00
Code Issues Projects Releases Wiki Activity

IDE suggestions

Browse Source
This commit is contained in:
Adrian Conlon
2024-05-19 09:07:20 +01:00
parent 6cbffa1051
commit e0235f396e
19 changed files with 151 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Z80/Disassembler.cs
+4 -13
View File
@@ -6,16 +6,14 @@ namespace EightBit
{
using System;
public class Disassembler
public class Disassembler(Bus bus)
{
private bool prefixCB = false;
private bool prefixDD = false;
private bool prefixED = false;
private bool prefixFD = false;
public Disassembler(Bus bus) => this.Bus = bus;
public Bus Bus { get; }
public Bus Bus { get; } = bus;
public static string AsFlag(byte value, StatusBits flag, string represents) => (value & (byte)flag) != 0 ? represents : "-";
@@ -31,10 +29,7 @@ namespace EightBit
public static string State(Z80 cpu)
{
if (cpu == null)
{
throw new ArgumentNullException(nameof(cpu));
}
ArgumentNullException.ThrowIfNull(cpu);
var pc = cpu.PC;
var sp = cpu.SP;
@@ -75,11 +70,7 @@ namespace EightBit
public string Disassemble(Z80 cpu)
{
if (cpu == null)
{
throw new ArgumentNullException(nameof(cpu));
}
ArgumentNullException.ThrowIfNull(cpu);
this.prefixCB = this.prefixDD = this.prefixED = this.prefixFD = false;
return this.Disassemble(cpu, cpu.PC.Word);
}
Z80/RefreshRegister.cs
+16 -14
View File
@@ -4,16 +4,10 @@
namespace EightBit
{
public struct RefreshRegister : System.IEquatable<RefreshRegister>
public struct RefreshRegister(byte value) : System.IEquatable<RefreshRegister>
{
private readonly byte high;
private byte variable;
public RefreshRegister(byte value)
{
this.high = (byte)(value & (byte)Bits.Bit7);
this.variable = (byte)(value & (byte)Mask.Seven);
}
private readonly byte high = (byte)(value & (byte)Bits.Bit7);
private byte variable = (byte)(value & (byte)Mask.Seven);
public static implicit operator byte(RefreshRegister input) => ToByte(input);
@@ -33,14 +27,22 @@ namespace EightBit
return value;
}
public static RefreshRegister FromByte(byte input) => new RefreshRegister(input);
public static RefreshRegister FromByte(byte input) => new(input);
public byte ToByte() => ToByte(this);
public readonly byte ToByte() => ToByte(this);
public override bool Equals(object obj) => obj is RefreshRegister ? this.Equals((RefreshRegister)obj) : false;
public override readonly bool Equals(object? obj)
{
if (obj is null)
{
return false;
}
public override int GetHashCode() => this.high + this.variable;
return this.Equals((RefreshRegister)obj);
}
public readonly bool Equals(RefreshRegister other) => other.high == this.high && other.variable == this.variable;
public override readonly int GetHashCode() => this.high + this.variable;
public bool Equals(RefreshRegister other) => other.high == this.high && other.variable == this.variable;
}
}
Z80/StatusBits.cs
+4
View File
@@ -24,12 +24,16 @@ namespace EightBit
// Undocumented X flag
XF = Bits.Bit3,
#pragma warning disable CA1069 // Enums values should not be duplicated
// Parity
PF = Bits.Bit2,
// Overflow
VF = Bits.Bit2,
#pragma warning restore CA1069 // Enums values should not be duplicated
// Negative?
NF = Bits.Bit1,
Z80/Z80.cs
+43 -59
View File
@@ -6,11 +6,11 @@ namespace EightBit
{
using System;
public class Z80 : IntelProcessor
public class Z80(Bus bus, InputOutput ports) : IntelProcessor(bus)
{
private readonly InputOutput ports;
private readonly InputOutput ports = ports;
private readonly Register16[] accumulatorFlags = { new Register16(), new Register16() };
private readonly Register16[] accumulatorFlags = [new Register16(), new Register16()];
private readonly Register16[,] registers =
{
{
@@ -21,9 +21,9 @@ namespace EightBit
},
};
private readonly Register16 intermediate = new Register16();
private readonly Register16 intermediate = new();
private RefreshRegister refresh = new RefreshRegister(0x7f);
private RefreshRegister refresh = new(0x7f);
private bool prefixCB = false;
private bool prefixDD = false;
@@ -44,68 +44,65 @@ namespace EightBit
private sbyte displacement = 0;
private bool displaced = false;
public Z80(Bus bus, InputOutput ports)
: base(bus) => this.ports = ports;
public event EventHandler<EventArgs>? ExecutingInstruction;
public event EventHandler<EventArgs> ExecutingInstruction;
public event EventHandler<EventArgs>? ExecutedInstruction;
public event EventHandler<EventArgs> ExecutedInstruction;
public event EventHandler<EventArgs>? RaisingNMI;
public event EventHandler<EventArgs> RaisingNMI;
public event EventHandler<EventArgs>? RaisedNMI;
public event EventHandler<EventArgs> RaisedNMI;
public event EventHandler<EventArgs>? LoweringNMI;
public event EventHandler<EventArgs> LoweringNMI;
public event EventHandler<EventArgs>? LoweredNMI;
public event EventHandler<EventArgs> LoweredNMI;
public event EventHandler<EventArgs>? RaisingM1;
public event EventHandler<EventArgs> RaisingM1;
public event EventHandler<EventArgs>? RaisedM1;
public event EventHandler<EventArgs> RaisedM1;
public event EventHandler<EventArgs>? LoweringM1;
public event EventHandler<EventArgs> LoweringM1;
public event EventHandler<EventArgs>? LoweredM1;
public event EventHandler<EventArgs> LoweredM1;
public event EventHandler<EventArgs>? RaisingRFSH;
public event EventHandler<EventArgs> RaisingRFSH;
public event EventHandler<EventArgs>? RaisedRFSH;
public event EventHandler<EventArgs> RaisedRFSH;
public event EventHandler<EventArgs>? LoweringRFSH;
public event EventHandler<EventArgs> LoweringRFSH;
public event EventHandler<EventArgs>? LoweredRFSH;
public event EventHandler<EventArgs> LoweredRFSH;
public event EventHandler<EventArgs>? RaisingMREQ;
public event EventHandler<EventArgs> RaisingMREQ;
public event EventHandler<EventArgs>? RaisedMREQ;
public event EventHandler<EventArgs> RaisedMREQ;
public event EventHandler<EventArgs>? LoweringMREQ;
public event EventHandler<EventArgs> LoweringMREQ;
public event EventHandler<EventArgs>? LoweredMREQ;
public event EventHandler<EventArgs> LoweredMREQ;
public event EventHandler<EventArgs>? RaisingIORQ;
public event EventHandler<EventArgs> RaisingIORQ;
public event EventHandler<EventArgs>? RaisedIORQ;
public event EventHandler<EventArgs> RaisedIORQ;
public event EventHandler<EventArgs>? LoweringIORQ;
public event EventHandler<EventArgs> LoweringIORQ;
public event EventHandler<EventArgs>? LoweredIORQ;
public event EventHandler<EventArgs> LoweredIORQ;
public event EventHandler<EventArgs>? RaisingRD;
public event EventHandler<EventArgs> RaisingRD;
public event EventHandler<EventArgs>? RaisedRD;
public event EventHandler<EventArgs> RaisedRD;
public event EventHandler<EventArgs>? LoweringRD;
public event EventHandler<EventArgs> LoweringRD;
public event EventHandler<EventArgs>? LoweredRD;
public event EventHandler<EventArgs> LoweredRD;
public event EventHandler<EventArgs>? RaisingWR;
public event EventHandler<EventArgs> RaisingWR;
public event EventHandler<EventArgs>? RaisedWR;
public event EventHandler<EventArgs> RaisedWR;
public event EventHandler<EventArgs>? LoweringWR;
public event EventHandler<EventArgs> LoweringWR;
public event EventHandler<EventArgs> LoweredWR;
public event EventHandler<EventArgs>? LoweredWR;
public byte IV { get; set; } = 0xff;
@@ -390,7 +387,7 @@ namespace EightBit
// received from the memory is ignored and an NOP instruction is forced internally to the
// CPU.The HALT acknowledge signal is active during this time indicating that the processor
// is in the HALT state.
var discarded = this.ReadInitialOpCode();
_ = this.ReadInitialOpCode();
this.Execute(0); // NOP
handled = true;
}
@@ -864,26 +861,13 @@ namespace EightBit
break;
case 6: // Set interrupt mode
switch (y)
this.IM = y switch
{
case 0:
case 1:
case 4:
case 5:
this.IM = 0;
break;
case 2:
case 6:
this.IM = 1;
break;
case 3:
case 7:
this.IM = 2;
break;
default:
throw new NotSupportedException("Invalid operation mode");
}
0 or 1 or 4 or 5 => 0,
2 or 6 => 1,
3 or 7 => 2,
_ => throw new NotSupportedException("Invalid operation mode"),
};
break;
case 7: // Assorted ops
switch (y)
@@ -1566,7 +1550,7 @@ namespace EightBit
this.IFF2 = this.IFF1;
this.IFF1 = false;
this.LowerM1();
var discarded = this.Bus.Data;
_ = this.Bus.Data;
this.RaiseM1();
this.Restart(0x66);
}