diff --git a/EightBit/PortEventArgs.cs b/EightBit/PortEventArgs.cs index 85e0e43..75026c0 100644 --- a/EightBit/PortEventArgs.cs +++ b/EightBit/PortEventArgs.cs @@ -6,11 +6,8 @@ namespace EightBit { private byte port; - public PortEventArgs(byte value) - { - port = value; - } + public PortEventArgs(byte value) => port = value; - public byte Port { get { return port; } } + public byte Port => port; } } diff --git a/EightBit/Processor.cs b/EightBit/Processor.cs index 048fd48..363a1bb 100644 --- a/EightBit/Processor.cs +++ b/EightBit/Processor.cs @@ -4,9 +4,9 @@ public abstract class Processor : ClockedChip { - private Bus bus; + private readonly Bus bus; private byte opcode; - private ushort pc; + private ushort pc = 0; private PinLevel resetLine; private PinLevel intLine; @@ -14,7 +14,6 @@ protected Processor(Bus memory) { bus = memory; - pc = 0; } public event EventHandler RaisingRESET; @@ -29,7 +28,7 @@ public ushort PC { get => pc; set => pc = value; } protected byte OpCode { get => opcode; set => opcode = value; } - public Bus Bus { get => bus; set => bus = value; } + public Bus Bus { get => bus; } public ref PinLevel RESET() => ref resetLine; public ref PinLevel INT() => ref intLine; diff --git a/EightBit/Rom.cs b/EightBit/Rom.cs index 5ee1a47..4148344 100644 --- a/EightBit/Rom.cs +++ b/EightBit/Rom.cs @@ -11,9 +11,9 @@ public Rom() : this(0) { } - public override int Size { get { return bytes.Length; } } + public override int Size => bytes.Length; - protected ref byte[] Bytes() { return ref bytes; } + protected ref byte[] Bytes() => ref bytes; static public int Load(FileStream file, ref byte[] output, int writeOffset = 0, int readOffset = 0, int limit = -1, int maximumSize = -1) {