6502/EightBitNet
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBitNet.git synced 2024-12-23 02:29:59 +00:00
Code Issues Projects Releases Wiki Activity

Further refactoring of the hex loader class to be a little easier to read.

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon 2019-06-29 11:50:27 +01:00
parent 7b5af28f5d
commit 21472154e0
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
EightBit/Bus.cs
View File

@ -5,8 +5,6 @@
namespace EightBit
{
using System;
using System.Collections.Generic;
using System.IO;
public abstract class Bus : IMapper
{
@ -140,7 +138,7 @@ namespace EightBit
var content = chunk.Item2;
var mapped = this.Mapping(address);
var offset = address - mapped.Begin;
mapped.Memory.Load(content.ToArray(), offset);
mapped.Memory.Load(content, offset);
}
}
}

42
EightBit/IntelHexFile.cs
View File

@ -34,7 +34,7 @@ namespace EightBit
}
}
public IEnumerable<Tuple<ushort, List<byte>>> Parse()
public IEnumerable<Tuple<ushort, byte[]>> Parse()
{
var eof = false;
while (!this.reader.EndOfStream && !eof)
@ -49,7 +49,7 @@ namespace EightBit
}
}
private Tuple<ushort, List<byte>> Parse(string line)
private Tuple<ushort, byte[]> Parse(string line)
{
var colon = line.Substring(0, 1);
if (colon != ":")
@ -69,24 +69,7 @@ namespace EightBit
switch (recordType)
{
case 0x00:
{
var data = new List<byte>(count);
var requiredLength = 9 + 2 + (count * 2);
if (line.Length != requiredLength)
{
throw new InvalidOperationException("Invalid hex file: line is not the required length");
}
for (var i = 0; i < count; ++i)
{
var position = 9 + (i * 2);
var datumString = line.Substring(position, 2);
var datum = Convert.ToByte(datumString, 16);
data.Add(datum);
}
return new Tuple<ushort, List<byte>>(address, data);
}
return ParseDataRecord(line, address, count);
case 0x01:
return null;
@ -95,5 +78,24 @@ namespace EightBit
throw new InvalidOperationException("Unhandled hex file record.");
}
}
private static Tuple<ushort, byte[]> ParseDataRecord(string line, ushort address, byte count)
{
var data = new byte[count];
var requiredLength = 9 + 2 + (count * 2);
if (line.Length != requiredLength)
{
throw new InvalidOperationException("Invalid hex file: line is not the required length");
}
for (var i = 0; i < count; ++i)
{
var position = 9 + (i * 2);
var datumString = line.Substring(position, 2);
data[i] = Convert.ToByte(datumString, 16);
}
return new Tuple<ushort, byte[]>(address, data);
}
}
}