6502
/
6502bench
mirror of https://github.com/fadden/6502bench.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix crash in OMF converter tool 

The OMF converter calls some of the project update routines at a
point where the data file hasn't been fully formed, making it a bit
fragile.
This commit is contained in:
Andy McFadden 2022-04-06 14:20:11 -07:00
parent 0ad30521ec
commit d9fe0b5471
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
SourceGen/DisasmProject.cs
View File

@ -253,7 +253,7 @@ namespace SourceGen {
/// <summary>
/// Constructs a new project.
/// Constructs a blank project. Further initialization required.
/// </summary>
public DisasmProject() { }
@ -364,8 +364,13 @@ namespace SourceGen {
/// <summary>
/// Pulls items of interest out of the system definition object and applies them
/// to the project. Call this after LoadDataFile() for a new project.
/// to the project. Call this after LoadDataFile() for a new project. This will
/// create a full-file address map entry with the system-specified load address.
/// </summary>
/// <remarks>
/// The OMF converter calls here before the data file has finished generating, so
/// it's possible for mFileData to be null here.
/// </remarks>
/// <param name="sysDef">Target system definition.</param>
public void ApplySystemDef(SystemDef sysDef) {
CpuDef.CpuType cpuType = CpuDef.GetCpuTypeFromName(sysDef.Cpu);
@ -389,7 +394,8 @@ namespace SourceGen {
// Configure the load address.
AddrMap.Clear();
if (SystemDefaults.GetFirstWordIsLoadAddr(sysDef) && mFileData.Length > 2) {
if (SystemDefaults.GetFirstWordIsLoadAddr(sysDef) && FileDataLength > 2 &&
mFileData != null) {
// First two bytes are the load address, with the actual file data starting
// at +000002. The first two bytes are non-addressable, so we leave them
// out of the map.
@ -397,7 +403,7 @@ namespace SourceGen {
//AddressMap.AddResult addRes =
// AddrMap.AddEntry(0, 2, loadAddr < 2 ? 0 : loadAddr - 2);
//Debug.Assert(addRes == AddressMap.AddResult.Okay);
AddressMap.AddResult addRes = AddrMap.AddEntry(2, mFileData.Length - 2, loadAddr);
AddressMap.AddResult addRes = AddrMap.AddEntry(2, FileDataLength - 2, loadAddr);
Debug.Assert(addRes == AddressMap.AddResult.Okay);
OperandFormats[0] = FormatDescriptor.Create(2, FormatDescriptor.Type.NumericLE,
@ -408,7 +414,7 @@ namespace SourceGen {
} else {
int loadAddr = SystemDefaults.GetLoadAddress(sysDef);
AddressMap.AddResult addRes =
AddrMap.AddEntry(0, mFileData.Length, loadAddr);
AddrMap.AddEntry(0, FileDataLength, loadAddr);
Debug.Assert(addRes == AddressMap.AddResult.Okay);
}
@ -2572,6 +2578,11 @@ namespace SourceGen {
/// <param name="affectedOffsets">Range set to update.</param>
/// <param name="offset">Offset of first byte.</param>
private void AddAffectedLine(RangeSet affectedOffsets, int offset) {
if (mAnattribs == null) {
// This is a weird edge case that happens with the OMF Converter tool, because
// we're stuffing things into a partially-formed project.
return;
}
int len = 1;
if (offset >= 0) { // header comment doesn't have an Anattrib entry
len = mAnattribs[offset].Length;

3
SourceGen/Tools/Omf/Loader.cs
View File

@ -336,7 +336,8 @@ namespace SourceGen.Tools.Omf {
SystemDefSet sds = SystemDefSet.ReadFile(sysDefsPath);
SystemDef sd = sds.FindEntryByName(IIGS_SYSTEM_DEF);
if (sd != null) {
proj.ApplySystemDef(sd);
proj.ApplySystemDef(sd); // apply system definitions
proj.AddrMap.Clear(); // remove default address map entry
} else {
Debug.WriteLine("Unable to find Apple IIgs system definition");
}