empathicqubit/Mesen-SX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Debugger: Source view integration refactoring

Browse source
This commit is contained in:
Sour 2020-01-21 18:22:27 -05:00
parent 6d9fb65ffd
commit 7dd408f4bd
11 changed files with 162 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
UI/Debugger/Code/CpuDisassemblyManager.cs
View file

@ -6,14 +6,13 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static Mesen.GUI.Debugger.Integration.DbgImporter;
namespace Mesen.GUI.Debugger.Code
{
public class CpuDisassemblyManager : IDisassemblyManager
{
protected ICodeDataProvider _provider;
private DbgImporter _symbolProvider;
private ISymbolProvider _symbolProvider;
public ICodeDataProvider Provider { get { return this._provider; } }
@ -23,13 +22,13 @@ namespace Mesen.GUI.Debugger.Code
public virtual int ByteCodeSize { get { return 4; } }
public virtual bool AllowSourceView { get { return true; } }
public virtual void RefreshCode(DbgImporter symbolProvider, DbgImporter.FileInfo file)
public virtual void RefreshCode(ISymbolProvider symbolProvider, SourceFileInfo file)
{
_symbolProvider = symbolProvider;
if(file == null) {
this._provider = new CodeDataProvider(CpuType.Cpu);
} else {
this._provider = new DbgCodeDataProvider(CpuType.Cpu, symbolProvider, file);
this._provider = new SymbolCodeDataProvider(CpuType.Cpu, symbolProvider, file);
}
}
@ -60,7 +59,7 @@ namespace Mesen.GUI.Debugger.Code
word = word.Substring(0, arraySeparatorIndex);
}
if(_provider is DbgCodeDataProvider && _symbolProvider != null) {
if(_provider is SymbolCodeDataProvider && _symbolProvider != null) {
int rangeStart, rangeEnd;
GetSymbolByteRange(lineIndex, out rangeStart, out rangeEnd);
location.Symbol = _symbolProvider.GetSymbol(word, rangeStart, rangeEnd);

2
UI/Debugger/Code/GsuDisassemblyManager.cs
View file

@ -16,7 +16,7 @@ namespace Mesen.GUI.Debugger.Code
public override int ByteCodeSize { get { return 3; } }
public override bool AllowSourceView { get { return false; } }
public override void RefreshCode(DbgImporter symbolProvider, DbgImporter.FileInfo file)
public override void RefreshCode(ISymbolProvider symbolProvider, SourceFileInfo file)
{
this._provider = new CodeDataProvider(CpuType.Gsu);
}

5
UI/Debugger/Code/IDisassemblyManager.cs
View file

@ -6,7 +6,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static Mesen.GUI.Debugger.Integration.DbgImporter;
namespace Mesen.GUI.Debugger.Code
{
@ -20,7 +19,7 @@ namespace Mesen.GUI.Debugger.Code
int ByteCodeSize { get; }
bool AllowSourceView { get; }
void RefreshCode(DbgImporter symbolProvider, DbgImporter.FileInfo file);
void RefreshCode(ISymbolProvider symbolProvider, SourceFileInfo file);
Dictionary<string, string> GetTooltipData(string word, int lineIndex);
LocationInfo GetLocationInfo(string lastWord, int lineIndex);
@ -30,7 +29,7 @@ namespace Mesen.GUI.Debugger.Code
{
public int Address;
public CodeLabel Label;
public SymbolInfo Symbol;
public SourceSymbol Symbol;
public int? ArrayIndex = null;
}

2
UI/Debugger/Code/Sa1DisassemblyManager.cs
View file

@ -14,7 +14,7 @@ namespace Mesen.GUI.Debugger.Code
public override SnesMemoryType RelativeMemoryType { get { return SnesMemoryType.Sa1Memory; } }
public override bool AllowSourceView { get { return false; } }
public override void RefreshCode(DbgImporter symbolProvider, DbgImporter.FileInfo file)
public override void RefreshCode(ISymbolProvider symbolProvider, SourceFileInfo file)
{
this._provider = new CodeDataProvider(CpuType.Sa1);
}

2
UI/Debugger/Code/SpcDisassemblyManager.cs
View file

@ -16,7 +16,7 @@ namespace Mesen.GUI.Debugger.Code
public override int ByteCodeSize { get { return 3; } }
public override bool AllowSourceView { get { return false; } }
public override void RefreshCode(DbgImporter symbolProvider, DbgImporter.FileInfo file)
public override void RefreshCode(ISymbolProvider symbolProvider, SourceFileInfo file)
{
this._provider = new CodeDataProvider(CpuType.Spc);
}

14
UI/Debugger/Code/DbgCodeDataProvider.cs → UI/Debugger/Code/SymbolCodeDataProvider.cs
View file

@ -8,16 +8,16 @@ using System.Threading.Tasks;
namespace Mesen.GUI.Debugger.Code
{
public class DbgCodeDataProvider : ICodeDataProvider
public class SymbolCodeDataProvider : ICodeDataProvider
{
//private byte[] _prgRom;
private int _lineCount;
private DbgImporter.FileInfo _file;
private SourceFileInfo _file;
private CpuType _type;
private bool _isC;
private DbgImporter _symbolProvider;
private ISymbolProvider _symbolProvider;
public DbgCodeDataProvider(CpuType type, DbgImporter symbolProvider, DbgImporter.FileInfo file)
public SymbolCodeDataProvider(CpuType type, ISymbolProvider symbolProvider, SourceFileInfo file)
{
//_prgRom = DebugApi.GetMemoryState(SnesMemoryType.PrgRom);
_type = type;
@ -31,7 +31,7 @@ namespace Mesen.GUI.Debugger.Code
public CodeLineData GetCodeLineData(int lineIndex)
{
int prgAddress = _symbolProvider.GetPrgAddress(_file.ID, lineIndex);
int prgAddress = _symbolProvider.GetPrgAddress(_file, lineIndex);
CodeLineData data = new CodeLineData(_type) {
Address = GetLineAddress(lineIndex),
@ -75,7 +75,7 @@ namespace Mesen.GUI.Debugger.Code
public int GetLineAddress(int lineIndex)
{
AddressInfo absAddress = new AddressInfo() {
Address = _symbolProvider.GetPrgAddress(_file.ID, lineIndex),
Address = _symbolProvider.GetPrgAddress(_file, lineIndex),
Type = SnesMemoryType.PrgRom
};
return DebugApi.GetRelativeAddress(absAddress).Address;
@ -90,7 +90,7 @@ namespace Mesen.GUI.Debugger.Code
{
int absAddress = DebugApi.GetAbsoluteAddress(new AddressInfo() { Address = (int)cpuAddress, Type = SnesMemoryType.CpuMemory }).Address;
for(int i = 0; i < _lineCount; i++) {
if(_symbolProvider.GetPrgAddress(_file.ID, i) == absAddress) {
if(_symbolProvider.GetPrgAddress(_file, i) == absAddress) {
return i;
}
}

25
UI/Debugger/Controls/ctrlDisassemblyView.cs
View file

@ -13,7 +13,6 @@ using Mesen.GUI.Debugger.Code;
using Mesen.GUI.Debugger.Labels;
using Mesen.GUI.Debugger.Integration;
using Mesen.GUI.Debugger.Workspace;
using static Mesen.GUI.Debugger.Integration.DbgImporter;
using Mesen.GUI.Forms;
namespace Mesen.GUI.Debugger.Controls
@ -22,7 +21,7 @@ namespace Mesen.GUI.Debugger.Controls
{
private BaseStyleProvider _styleProvider;
private IDisassemblyManager _manager;
private DbgImporter _symbolProvider;
private ISymbolProvider _symbolProvider;
private bool _inSourceView = false;
public ctrlDisassemblyView()
@ -47,7 +46,7 @@ namespace Mesen.GUI.Debugger.Controls
BreakpointManager.BreakpointsChanged -= BreakpointManager_BreakpointsChanged;
}
private void DebugWorkspaceManager_SymbolProviderChanged(DbgImporter symbolProvider)
private void DebugWorkspaceManager_SymbolProviderChanged(ISymbolProvider symbolProvider)
{
_symbolProvider = symbolProvider;
@ -84,7 +83,7 @@ namespace Mesen.GUI.Debugger.Controls
ctrlCode.AddressSize = manager.AddressSize;
UpdateSourceFileDropdown();
_manager.RefreshCode(_inSourceView ? _symbolProvider : null, _inSourceView ? cboSourceFile.SelectedItem as DbgImporter.FileInfo : null);
_manager.RefreshCode(_inSourceView ? _symbolProvider : null, _inSourceView ? cboSourceFile.SelectedItem as SourceFileInfo : null);
}
private void UpdateSourceFileDropdown()
@ -100,7 +99,7 @@ namespace Mesen.GUI.Debugger.Controls
cboSourceFile.Items.Clear();
cboSourceFile.Sorted = false;
if(_symbolProvider != null) {
foreach(DbgImporter.FileInfo file in _symbolProvider.Files.Values) {
foreach(SourceFileInfo file in _symbolProvider.SourceFiles) {
if(file.Data != null && file.Data.Length > 0 && !file.Name.ToLower().EndsWith(".chr")) {
cboSourceFile.Items.Add(file);
}
@ -158,16 +157,16 @@ namespace Mesen.GUI.Debugger.Controls
ctrlCode.Invalidate();
}
public void ScrollToSymbol(SymbolInfo symbol)
public void ScrollToSymbol(SourceSymbol symbol)
{
if(!_inSourceView) {
ToggleView();
}
ReferenceInfo definition = _symbolProvider?.GetSymbolDefinition(symbol);
SourceCodeLocation definition = _symbolProvider?.GetSymbolDefinition(symbol);
if(definition != null) {
foreach(DbgImporter.FileInfo fileInfo in cboSourceFile.Items) {
if(fileInfo.Name == definition.FileName) {
foreach(SourceFileInfo fileInfo in cboSourceFile.Items) {
if(fileInfo == definition.File) {
cboSourceFile.SelectedItem = fileInfo;
ctrlCode.ScrollToLineIndex(definition.LineNumber);
return;
@ -181,10 +180,10 @@ namespace Mesen.GUI.Debugger.Controls
if(_inSourceView) {
AddressInfo absAddress = DebugApi.GetAbsoluteAddress(new AddressInfo() { Address = (int)address, Type = SnesMemoryType.CpuMemory });
if(absAddress.Address >= 0 && absAddress.Type == SnesMemoryType.PrgRom) {
LineInfo line = _symbolProvider?.GetSourceCodeLineInfo(absAddress.Address);
SourceCodeLocation line = _symbolProvider?.GetSourceCodeLineInfo(absAddress.Address);
if(line != null) {
foreach(DbgImporter.FileInfo fileInfo in cboSourceFile.Items) {
if(fileInfo.ID == line.FileID) {
foreach(SourceFileInfo fileInfo in cboSourceFile.Items) {
if(line.File == fileInfo) {
cboSourceFile.SelectedItem = fileInfo;
ctrlCode.ScrollToLineIndex(line.LineNumber);
return;
@ -209,7 +208,7 @@ namespace Mesen.GUI.Debugger.Controls
scrollOffset++;
} while(centerLineAddress < 0 && centerLineIndex > 0);
_manager.RefreshCode(_inSourceView ? _symbolProvider : null, _inSourceView ? cboSourceFile.SelectedItem as DbgImporter.FileInfo : null);
_manager.RefreshCode(_inSourceView ? _symbolProvider : null, _inSourceView ? cboSourceFile.SelectedItem as SourceFileInfo : null);
ctrlCode.DataProvider = _manager.Provider;
if(centerLineAddress >= 0) {

136
UI/Debugger/Integration/DbgImporter.cs
View file

@ -14,7 +14,7 @@ using Mesen.GUI.Forms;
namespace Mesen.GUI.Debugger.Integration
{
public class DbgImporter
public class DbgImporter : ISymbolProvider
{
private int _headerSize = 0;
@ -25,6 +25,9 @@ namespace Mesen.GUI.Debugger.Integration
private Dictionary<int, ScopeInfo> _scopes = new Dictionary<int, ScopeInfo>();
private Dictionary<int, SymbolInfo> _symbols = new Dictionary<int, SymbolInfo>();
private Dictionary<int, CSymbolInfo> _cSymbols = new Dictionary<int, CSymbolInfo>();
private List<SourceSymbol> _sourceSymbols = new List<SourceSymbol>();
private List<SourceFileInfo> _sourceFiles = new List<SourceFileInfo>();
private HashSet<int> _usedFileIds = new HashSet<int>();
private HashSet<string> _usedLabels = new HashSet<string>();
@ -51,18 +54,23 @@ namespace Mesen.GUI.Debugger.Integration
private static Regex _cFirstLineRegex = new Regex("(.*)", RegexOptions.Compiled);
private static Regex _cPreviousLinesRegex = new Regex("^\\s*//(.*)", RegexOptions.Compiled);
private Dictionary<int, LineInfo> _linesByPrgAddress = new Dictionary<int, LineInfo>();
private Dictionary<int, SourceCodeLocation> _linesByPrgAddress = new Dictionary<int, SourceCodeLocation>();
private Dictionary<int, LineInfo[]> _linesByFile = new Dictionary<int, LineInfo[]>();
private Dictionary<string, int> _prgAddressByLine = new Dictionary<string, int>();
private Dictionary<int, ScopeInfo> _scopesBySymbol = new Dictionary<int, ScopeInfo>();
public Dictionary<int, FileInfo> Files { get { return _files; } }
public DateTime SymbolFileStamp { get; private set; }
public string SymbolPath { get; private set; }
public DateTime DbgFileStamp { get; private set; }
public string DbgPath { get; private set; }
public List<SourceFileInfo> SourceFiles { get { return _sourceFiles; } }
public int GetPrgAddress(int fileID, int lineIndex)
public int GetPrgAddress(SourceFileInfo file, int lineIndex)
{
return GetPrgAddress((file.InternalFile as FileInfo).ID, lineIndex);
}
private int GetPrgAddress(int fileID, int lineIndex)
{
int prgAddress;
if(_prgAddressByLine.TryGetValue(fileID.ToString() + "_" + lineIndex.ToString(), out prgAddress)) {
@ -82,9 +90,9 @@ namespace Mesen.GUI.Debugger.Integration
return -1;
}
public LineInfo GetSourceCodeLineInfo(int prgRomAddress)
public SourceCodeLocation GetSourceCodeLineInfo(int prgRomAddress)
{
LineInfo line;
SourceCodeLocation line;
if(_linesByPrgAddress.TryGetValue(prgRomAddress, out line)) {
return line;
}
@ -95,14 +103,14 @@ namespace Mesen.GUI.Debugger.Integration
{
if(prgRomAddress >= 0) {
try {
LineInfo line;
SourceCodeLocation line;
if(_linesByPrgAddress.TryGetValue(prgRomAddress, out line)) {
string output = "";
FileInfo file = _files[line.FileID];
SourceFileInfo file = line.File;
if(file.Data == null) {
return string.Empty;
}
output += file.Data[line.LineNumber];
return output;
}
@ -111,7 +119,7 @@ namespace Mesen.GUI.Debugger.Integration
return null;
}
private ReferenceInfo GetReferenceInfo(int referenceId)
private SourceCodeLocation GetReferenceInfo(int referenceId)
{
FileInfo file;
LineInfo line;
@ -121,20 +129,19 @@ namespace Mesen.GUI.Debugger.Integration
lineContent = file.Data[line.LineNumber];
}
return new ReferenceInfo() {
FileName = _files[line.FileID].Name,
LineNumber = line.LineNumber,
LineContent = lineContent
return new SourceCodeLocation() {
File = _files[line.FileID].SourceFile,
LineNumber = line.LineNumber
};
}
return null;
}
public ReferenceInfo GetSymbolDefinition(SymbolInfo symbol)
public SourceCodeLocation GetSymbolDefinition(SourceSymbol symbol)
{
foreach(int definition in symbol.Definitions) {
ReferenceInfo refInfo = GetReferenceInfo(definition);
foreach(int definition in (symbol.InternalSymbol as SymbolInfo).Definitions) {
SourceCodeLocation refInfo = GetReferenceInfo(definition);
if(refInfo != null) {
return refInfo;
@ -143,12 +150,12 @@ namespace Mesen.GUI.Debugger.Integration
return null;
}
public List<ReferenceInfo> GetSymbolReferences(SymbolInfo symbol)
private List<SourceCodeLocation> GetSymbolReferences(SymbolInfo symbol)
{
List<ReferenceInfo> references = new List<ReferenceInfo>();
List<SourceCodeLocation> references = new List<SourceCodeLocation>();
foreach(int reference in symbol.References) {
ReferenceInfo refInfo = GetReferenceInfo(reference);
SourceCodeLocation refInfo = GetReferenceInfo(reference);
if(refInfo != null) {
references.Add(refInfo);
}
@ -212,19 +219,19 @@ namespace Mesen.GUI.Debugger.Integration
return null;
}
internal List<SymbolInfo> GetSymbols()
private List<SymbolInfo> GetSymbols()
{
return _symbols.Values.ToList();
}
internal SymbolInfo GetSymbol(string word, int prgStartAddress, int prgEndAddress)
public SourceSymbol GetSymbol(string word, int prgStartAddress, int prgEndAddress)
{
try {
foreach(CSymbolInfo symbol in _cSymbols.Values) {
if(symbol.Name == word && symbol.SymbolID.HasValue) {
SymbolInfo matchingSymbol = GetMatchingSymbol(_symbols[symbol.SymbolID.Value], prgStartAddress, prgEndAddress);
if(matchingSymbol != null) {
return matchingSymbol;
return matchingSymbol.SourceSymbol;
}
}
}
@ -233,7 +240,7 @@ namespace Mesen.GUI.Debugger.Integration
if(symbol.Name == word) {
SymbolInfo matchingSymbol = GetMatchingSymbol(symbol, prgStartAddress, prgEndAddress);
if(matchingSymbol != null) {
return matchingSymbol;
return matchingSymbol.SourceSymbol;
}
}
}
@ -242,7 +249,12 @@ namespace Mesen.GUI.Debugger.Integration
return null;
}
public AddressInfo? GetSymbolAddressInfo(SymbolInfo symbol)
public AddressInfo? GetSymbolAddressInfo(SourceSymbol symbol)
{
return GetSymbolAddressInfo(symbol.InternalSymbol as SymbolInfo);
}
private AddressInfo? GetSymbolAddressInfo(SymbolInfo symbol)
{
if(symbol.SegmentID == null || symbol.Address == null) {
return null;
@ -313,6 +325,9 @@ namespace Mesen.GUI.Debugger.Integration
IsAssembly = isAsm
};
file.SourceFile = new SourceFileInfo() { Name = file.Name, InternalFile = file };
_sourceFiles.Add(file.SourceFile);
_files.Add(file.ID, file);
return true;
} else if(row.StartsWith("file")) {
@ -333,6 +348,11 @@ namespace Mesen.GUI.Debugger.Integration
Type = match.Groups[5].Success ? (LineType)Int32.Parse(match.Groups[5].Value) : LineType.Assembly,
};
line.Location = new SourceCodeLocation() {
File = _files[line.FileID].SourceFile,
LineNumber = line.LineNumber
};
if(line.LineNumber < 0) {
line.LineNumber = 0;
}
@ -347,7 +367,7 @@ namespace Mesen.GUI.Debugger.Integration
} else {
line.SpanIDs = new List<int>();
}
_usedFileIds.Add(line.FileID);
_lines.Add(line.ID, line);
return true;
@ -378,7 +398,7 @@ namespace Mesen.GUI.Debugger.Integration
return false;
}
private bool LoadCSymbols(string row)
{
Match match = _cSymbolRegex.Match(row);
@ -448,6 +468,8 @@ namespace Mesen.GUI.Debugger.Integration
symbol.References = new List<int>();
}
symbol.SourceSymbol = new SourceSymbol() { Name = symbol.Name, InternalSymbol = symbol, Address = symbol.Address };
_symbols.Add(symbol.ID, symbol);
return true;
} else if(row.StartsWith("sym")) {
@ -457,7 +479,7 @@ namespace Mesen.GUI.Debugger.Integration
return false;
}
public int GetSymbolSize(SymbolInfo symbol)
private int GetSymbolSize(SymbolInfo symbol)
{
if(symbol.SegmentID != null && _segments.ContainsKey(symbol.SegmentID.Value)) {
SegmentInfo segment = _segments[symbol.SegmentID.Value];
@ -674,6 +696,7 @@ namespace Mesen.GUI.Debugger.Integration
if(File.Exists(sourceFile)) {
file.Data = File.ReadAllLines(sourceFile);
file.SourceFile.Data = file.Data;
}
LineInfo[] fileInfos = new LineInfo[maxLineCountByFile[file.ID] + 1];
@ -710,7 +733,7 @@ namespace Mesen.GUI.Debugger.Integration
cdlFile[prgAddress + i] = (byte)CdlFlags.Data;
} else if(cdlFile[prgAddress + i] == 0) {
//Mark bytes as tentative data, until we know that the bytes are actually code
cdlFile[prgAddress + i] = 0x04;
cdlFile[prgAddress + i] = 0x04;
}
}
}
@ -761,11 +784,11 @@ namespace Mesen.GUI.Debugger.Integration
public void Import(string path, bool silent = false)
{
DbgFileStamp = File.GetLastWriteTime(path);
SymbolFileStamp = File.GetLastWriteTime(path);
string[] fileRows = File.ReadAllLines(path);
string basePath = Path.GetDirectoryName(path);
DbgPath = basePath;
SymbolPath = basePath;
foreach(string row in fileRows) {
try {
if(LoadLines(row) || LoadSpans(row) || LoadSymbols(row) || LoadCSymbols(row) || LoadScopes(row) || LoadFiles(row, basePath) || LoadSegments(row)) {
@ -789,13 +812,13 @@ namespace Mesen.GUI.Debugger.Integration
for(int i = 0; i < span.Size; i++) {
int prgAddress = segment.FileOffset - _headerSize + span.Offset + i;
LineInfo existingLine;
/*SourceCodeLocation existingLine;
if(_linesByPrgAddress.TryGetValue(prgAddress, out existingLine) && existingLine.Type == LineType.External) {
//Give priority to lines that come from C files
continue;
}
}*/
_linesByPrgAddress[prgAddress] = line;
_linesByPrgAddress[prgAddress] = line.Location;
if(i == 0 && spanID == line.SpanIDs[0]) {
//Mark the first byte of the first span representing this line as the PRG address for this line of code
FileInfo file = _files[line.FileID];
@ -837,7 +860,7 @@ namespace Mesen.GUI.Debugger.Integration
DebugWorkspaceManager.ResetLabels();
}
LabelManager.SetLabels(labels, true);
if(!silent) {
if(_errorCount > 0) {
_errorCount -= _filesNotFound.Count;
@ -868,26 +891,16 @@ namespace Mesen.GUI.Debugger.Integration
public bool IsSpc;
}
public class FileInfo
private class FileInfo
{
public int ID;
public string Name;
public string[] Data;
public bool IsAssembly;
public override string ToString()
{
string folderName = Path.GetDirectoryName(Name);
string fileName = Path.GetFileName(Name);
if(string.IsNullOrWhiteSpace(folderName)) {
return fileName;
} else {
return $"{fileName} ({folderName})";
}
}
public SourceFileInfo SourceFile;
}
public class LineInfo
private class LineInfo
{
public int ID;
public int FileID;
@ -895,11 +908,13 @@ namespace Mesen.GUI.Debugger.Integration
public LineType Type;
public int LineNumber;
public SourceCodeLocation Location;
}
public enum LineType
private enum LineType
{
Assembly = 0,
Assembly = 0,
External = 1, //i.e C source file
Macro = 2
}
@ -913,7 +928,7 @@ namespace Mesen.GUI.Debugger.Integration
public bool IsData;
}
public class SymbolInfo
private class SymbolInfo
{
public int ID;
public string Name;
@ -923,27 +938,22 @@ namespace Mesen.GUI.Debugger.Integration
public int? Size;
public List<int> References;
public List<int> Definitions;
public SourceSymbol SourceSymbol;
}
public class ScopeInfo
private class ScopeInfo
{
public int ID;
public string Name;
public int? SymbolID;
}
public class CSymbolInfo
private class CSymbolInfo
{
public int ID;
public string Name;
public int? SymbolID;
}
public class ReferenceInfo
{
public string FileName;
public int LineNumber;
public string LineContent;
}
}
}

55
UI/Debugger/Integration/ISymbolProvider.cs Normal file
View file

@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.IO;
namespace Mesen.GUI.Debugger.Integration
{
public interface ISymbolProvider
{
DateTime SymbolFileStamp { get; }
string SymbolPath { get; }
List<SourceFileInfo> SourceFiles { get; }
int GetPrgAddress(SourceFileInfo file, int lineIndex);
string GetSourceCodeLine(int prgRomAddress);
SourceCodeLocation GetSourceCodeLineInfo(int prgRomAddress);
AddressInfo? GetSymbolAddressInfo(SourceSymbol symbol);
SourceCodeLocation GetSymbolDefinition(SourceSymbol symbol);
SourceSymbol GetSymbol(string word, int prgStartAddress, int prgEndAddress);
//List<DbgImporter.ReferenceInfo> GetSymbolReferences(SourceSymbol symbol);
//int GetSymbolSize(SourceSymbol symbol);
}
public class SourceFileInfo
{
public string Name;
public string[] Data;
public object InternalFile;
public override string ToString()
{
string folderName = Path.GetDirectoryName(Name);
string fileName = Path.GetFileName(Name);
if(string.IsNullOrWhiteSpace(folderName)) {
return fileName;
} else {
return $"{fileName} ({folderName})";
}
}
}
public class SourceSymbol
{
public string Name;
public int? Address;
public object InternalSymbol;
}
public class SourceCodeLocation
{
public SourceFileInfo File;
public int LineNumber;
}
}

8
UI/Debugger/Workspace/DebugWorkspaceManager.cs
View file

@ -13,10 +13,10 @@ namespace Mesen.GUI.Debugger.Workspace
{
public class DebugWorkspaceManager
{
public delegate void SymbolProviderChangedHandler(DbgImporter symbolProvider);
public delegate void SymbolProviderChangedHandler(ISymbolProvider symbolProvider);
public static event SymbolProviderChangedHandler SymbolProviderChanged;
private static DebugWorkspace _workspace;
private static DbgImporter _symbolProvider;
private static ISymbolProvider _symbolProvider;
private static string _romName;
private static object _lock = new object();
@ -113,7 +113,7 @@ namespace Mesen.GUI.Debugger.Workspace
string dbgPath = Path.Combine(((ResourcePath)romInfo.RomPath).Folder, romInfo.GetRomName() + ".dbg");
if(File.Exists(dbgPath)) {
_symbolProvider = new DbgImporter();
_symbolProvider.Import(dbgPath, true);
(_symbolProvider as DbgImporter).Import(dbgPath, true);
SymbolProviderChanged?.Invoke(_symbolProvider);
LabelManager.RefreshLabels();
}
@ -122,7 +122,7 @@ namespace Mesen.GUI.Debugger.Workspace
SymbolProviderChanged?.Invoke(_symbolProvider);
}
public static DbgImporter GetSymbolProvider()
public static ISymbolProvider GetSymbolProvider()
{
return _symbolProvider;
}

3
UI/UI.csproj
View file

@ -259,7 +259,7 @@
<Compile Include="Debugger\Breakpoints\InteropBreakpoint.cs" />
<Compile Include="Debugger\Code\BaseStyleProvider.cs" />
<Compile Include="Debugger\Code\Sa1LineStyleProvider.cs" />
<Compile Include="Debugger\Code\DbgCodeDataProvider.cs" />
<Compile Include="Debugger\Code\SymbolCodeDataProvider.cs" />
<Compile Include="Debugger\Code\Sa1DisassemblyManager.cs" />
<Compile Include="Debugger\Code\GsuDisassemblyManager.cs" />
<Compile Include="Debugger\Code\GsuLineStyleProvider.cs" />
@ -328,6 +328,7 @@
<Compile Include="Debugger\Integration\frmIntegrationSettings.Designer.cs">
<DependentUpon>frmIntegrationSettings.cs</DependentUpon>
</Compile>
<Compile Include="Debugger\Integration\ISymbolProvider.cs" />
<Compile Include="Debugger\Labels\CodeLabel.cs" />
<Compile Include="Debugger\Labels\ctrlLabelList.cs">
<SubType>UserControl</SubType>