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

Assembler: Minor bug fixes for edit code feature

Browse source
This commit is contained in:
Souryo 2017-03-11 21:37:58 -05:00
parent d72a4d8be3
commit 79cd19b66a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
GUI.NET/Debugger/Controls/ctrlDebuggerCode.cs
View file

@ -207,14 +207,16 @@ namespace Mesen.GUI.Debugger
string comment = codeLabel?.Comment;
string label = codeLabel?.Label;
if(code == "STP*" || code == "NOP*") {
bool addPadding = true;
if(code.StartsWith("STP*") || code.StartsWith("NOP*")) {
//Transform unofficial opcodes that can't be reassembled properly into .byte statements
if(comment != null) {
comment.Insert(1, code + " - ");
} else {
comment = code;
}
code = ".byte " + string.Join(",", _codeByteCode[i].Split(' ').Select((hexByte) => "$" + hexByte));
code = ".byte " + string.Join(",", _codeByteCode[i].Split(' '));
addPadding = false;
}
if(!string.IsNullOrWhiteSpace(comment) && comment.Contains("\n")) {
@ -224,7 +226,7 @@ namespace Mesen.GUI.Debugger
if(!string.IsNullOrWhiteSpace(label)) {
result.Add(label + ":");
}
result.Add(" " + code + (!string.IsNullOrWhiteSpace(comment) ? (" ;" + comment) : ""));
result.Add((addPadding ? " " : "") + code + (!string.IsNullOrWhiteSpace(comment) ? (" ;" + comment) : ""));
int length = _codeByteCode[i].Count(c => c == ' ') + 1;
byteLength += length;