6502/6502bench
1
0
Fork 0
mirror of https://github.com/fadden/6502bench.git synced 2024-12-27 10:32:31 +00:00
Code Issues Projects Releases Wiki Activity

Fix address cross-reference code

Browse Source 
The code was wrong, but due to aggressive auto-label generation, it
rarely had an opportunity to express itself.  The problem appeared
when you formatted a 16-bit value as an address, but the address
was outside the file and not associated with a project/platform
symbol.  This fixes the glitch and adds some logging.
This commit is contained in:
Andy McFadden 2020-04-10 11:00:27 -07:00
parent 61db267111
commit a42584834b
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
SourceGen/DisasmProject.cs
View File

@ -1576,10 +1576,29 @@ namespace SourceGen {
} else if (dfd.FormatSubType == FormatDescriptor.SubType.Address) { } else if (dfd.FormatSubType == FormatDescriptor.SubType.Address) {
// not expecting this format on an instruction operand // not expecting this format on an instruction operand
Debug.Assert(attr.IsData || attr.IsInlineData); Debug.Assert(attr.IsData || attr.IsInlineData);
int operandOffset = RawData.GetWord(mFileData, offset,
// This generally doesn't happen for internal addresses, because
// we create an auto label for the target address, and a weak ref
// to the auto label, which means the xref is handled by the symbol
// code above. This case really only happens for external addresses,
// which either have a label (because we defined a symbol) and got
// handled earlier, or don't have a label and aren't useful for a
// cross-reference.
//
// There might be a case I'm missing, so I'm going to take a swing
// at it and spit out a debug message either way.
int operandAddr = RawData.GetWord(mFileData, offset,
dfd.Length, dfd.FormatType == FormatDescriptor.Type.NumericBE); dfd.Length, dfd.FormatType == FormatDescriptor.Type.NumericBE);
AddXref(operandOffset, int targetOffset = AddrMap.AddressToOffset(offset, operandAddr);
new XrefSet.Xref(offset, false, xrefType, accType, 0)); if (targetOffset < 0) {
Debug.WriteLine("No xref for addr $" + operandAddr.ToString("x4") +
" at +" + offset.ToString("x6"));
} else {
Debug.WriteLine("HEY: found unlabeled addr ref at +" +
offset.ToString("x6"));
AddXref(targetOffset,
new XrefSet.Xref(offset, false, xrefType, accType, 0));
}
} }
// Look for instruction offset references. We skip this if we've already // Look for instruction offset references. We skip this if we've already