6502/EightBitNet
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBitNet.git synced 2025-11-23 23:18:12 +00:00
Code Issues Projects Releases Wiki Activity

Update stylecop (plus add stylecop packages to the Intel 8080 set).

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon
2019-03-02 08:59:20 +00:00
parent 9a1d5cc762
commit 4799e097de
23 changed files with 173 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
Intel8080/Disassembler.cs
View File

@@ -4,6 +4,8 @@
namespace EightBit
{
using System;
public class Disassembler
{
public Disassembler(Bus bus) => this.Bus = bus;
@@ -124,46 +126,10 @@ namespace EightBit
throw new System.ArgumentOutOfRangeException(nameof(which));
}
private string Disassemble(Intel8080 cpu, ushort pc)
private static Tuple<string, int> Disassemble(int x, int y, int z, int p, int q)
{
var opCode = this.Bus.Peek(pc);
var decoded = cpu.GetDecodedOpCode(opCode);
var x = decoded.X;
var y = decoded.Y;
var z = decoded.Z;
var p = decoded.P;
var q = decoded.Q;
var immediate = this.Bus.Peek((ushort)(pc + 1));
var absolute = cpu.PeekWord((ushort)(pc + 1)).Word;
var displacement = (sbyte)immediate;
var relative = pc + displacement + 2;
var indexedImmediate = this.Bus.Peek((ushort)(pc + 1));
var dumpCount = 0;
var output = $"{opCode:x2}";
var specification = string.Empty;
output += Disassemble(ref specification, ref dumpCount, x, y, z, p, q);
for (var i = 0; i < dumpCount; ++i)
{
output += $"{this.Bus.Peek((ushort)(pc + i + 1)):x2}";
}
output += '\t';
output += string.Format(specification, (int)immediate, (int)absolute, relative, (int)displacement, indexedImmediate);
return output;
}
private static string Disassemble(ref string specification, ref int dumpCount, int x, int y, int z, int p, int q)
{
var output = string.Empty;
switch (x)
{
case 0:
@@ -190,7 +156,7 @@ namespace EightBit
switch (q)
{
case 0: // LD rp,nn
specification = "LXI " + RP(p) + ",{1:X4}H";
specification = $"LXI {RP(p)}" + ",{1:X4}H";
dumpCount += 2;
break;
case 1: // ADD HL,rp
@@ -415,7 +381,7 @@ namespace EightBit
break;
}
return output;
return new Tuple<string, int>(specification, dumpCount);
}
private static string RP(int rp)
@@ -476,5 +442,40 @@ namespace EightBit
throw new System.ArgumentOutOfRangeException(nameof(r));
}
private string Disassemble(Intel8080 cpu, ushort pc)
{
var opCode = this.Bus.Peek(pc);
var decoded = cpu.GetDecodedOpCode(opCode);
var x = decoded.X;
var y = decoded.Y;
var z = decoded.Z;
var p = decoded.P;
var q = decoded.Q;
var immediate = this.Bus.Peek((ushort)(pc + 1));
var absolute = cpu.PeekWord((ushort)(pc + 1)).Word;
var displacement = (sbyte)immediate;
var relative = pc + displacement + 2;
var indexedImmediate = this.Bus.Peek((ushort)(pc + 1));
var disassembled = Disassemble(x, y, z, p, q);
var specification = disassembled.Item1;
var dumpCount = disassembled.Item2;
var output = $"{opCode:x2}";
for (var i = 0; i < dumpCount; ++i)
{
output += $"{this.Bus.Peek((ushort)(pc + i + 1)):x2}";
}
output += '\t';
output += string.Format(specification, (int)immediate, (int)absolute, relative, (int)displacement, indexedImmediate);
return output;
}
}
}