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

Debugger: Display original C code as comments

Browse source
This commit is contained in:
Souryo 2016-11-26 14:16:25 -05:00
parent 42d9fb0ea1
commit 259f7c9b7d
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
GUI.NET/Debugger/DbgImporter.cs
View file

@ -37,7 +37,7 @@ namespace Mesen.GUI.Debugger
private static Regex _asmFirstLineRegex = new Regex(";(.*)", RegexOptions.Compiled); private static Regex _asmFirstLineRegex = new Regex(";(.*)", RegexOptions.Compiled);
private static Regex _asmPreviousLinesRegex = new Regex("^\\s*;(.*)", RegexOptions.Compiled); private static Regex _asmPreviousLinesRegex = new Regex("^\\s*;(.*)", RegexOptions.Compiled);
private static Regex _cFirstLineRegex = new Regex("//(.*)", RegexOptions.Compiled); private static Regex _cFirstLineRegex = new Regex("(.*)", RegexOptions.Compiled);
private static Regex _cPreviousLinesRegex = new Regex("^\\s*//(.*)", RegexOptions.Compiled); private static Regex _cPreviousLinesRegex = new Regex("^\\s*//(.*)", RegexOptions.Compiled);
private bool LoadSegments(string row) private bool LoadSegments(string row)
@ -180,7 +180,7 @@ namespace Mesen.GUI.Debugger
continue; continue;
} }
bool isAsm = Path.GetExtension(_files[line.FileID].Name) == ".s"; bool isAsm = Path.GetExtension(_files[line.FileID].Name).StartsWith(".s");
string comment = ""; string comment = "";
for(int i = line.LineNumber; i >= 0; i--) { for(int i = line.LineNumber; i >= 0; i--) {
@ -199,10 +199,11 @@ namespace Mesen.GUI.Debugger
Match match = regex.Match(sourceCodeLine); Match match = regex.Match(sourceCodeLine);
if(match.Success) { if(match.Success) {
string matchedComment = match.Groups[1].Value.Replace("\t", " ");
if(string.IsNullOrWhiteSpace(comment)) { if(string.IsNullOrWhiteSpace(comment)) {
comment = match.Groups[1].Value; comment = matchedComment;
} else { } else {
comment = match.Groups[1].Value + Environment.NewLine + comment; comment = matchedComment + Environment.NewLine + comment;
} }
} else if(i != line.LineNumber) { } else if(i != line.LineNumber) {
break; break;