libretro/Mesen
1
0
Fork 0
mirror of https://github.com/libretro/Mesen.git synced 2024-11-27 11:00:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Debugger: Fixed potential issue with DBG file import

Browse Source
This commit is contained in:
Souryo 2016-12-08 19:38:06 -05:00
parent 189bede58d
commit 7dd2123025
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
GUI.NET/Debugger/DbgImporter.cs
View File

@ -31,7 +31,7 @@ namespace Mesen.GUI.Debugger
private static Regex _segmentRegex = new Regex("seg\tid=([0-9]+),.*start=0x([0-9a-fA-F]+)", RegexOptions.Compiled);
private static Regex _segmentPrgRomRegex = new Regex("seg\tid=([0-9]+),.*start=0x([0-9a-fA-F]+),.*ooffs=([0-9]+)", RegexOptions.Compiled);
private static Regex _lineRegex = new Regex("line\tid=([0-9]+),.*file=([0-9]+),.*line=([0-9]+),.*span=([0-9]+)", RegexOptions.Compiled);
private static Regex _fileRegex = new Regex("file\tid=([0-9]+),.*name=\"([0-9a-zA-Z()_.-:/\\\\ ]+)\"", RegexOptions.Compiled);
private static Regex _fileRegex = new Regex("file\tid=([0-9]+),.*name=\"([^\"]+)\"", RegexOptions.Compiled);
private static Regex _spanRegex = new Regex("span\tid=([0-9]+),.*seg=([0-9]+),.*start=([0-9]+)", RegexOptions.Compiled);
private static Regex _symbolRegex = new Regex("sym\tid=([0-9]+).*name=\"([0-9a-zA-Z@_]+)\",.*val=0x([0-9a-fA-F]+),.*seg=([0-9a-zA-Z]+)", RegexOptions.Compiled);
@ -71,10 +71,14 @@ namespace Mesen.GUI.Debugger
ID = Int32.Parse(match.Groups[1].Value),
Name = match.Groups[2].Value.Replace('/', Path.DirectorySeparatorChar).Replace('\\', Path.DirectorySeparatorChar)
};
string sourceFile = Path.Combine(basePath, file.Name);
if(File.Exists(sourceFile)) {
file.Data = File.ReadAllLines(sourceFile);
try {
string sourceFile = Path.Combine(basePath, file.Name);
if(File.Exists(sourceFile)) {
file.Data = File.ReadAllLines(sourceFile);
}
} catch {
_errorCount++;
}
_files.Add(file.ID, file);