ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use string.Join

This commit is contained in:
James Groom 2019-04-04 11:57:36 +10:00 committed by GitHub
parent 9af93be0d3
commit b37ced84cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs
View File

@ -71,9 +71,12 @@ namespace BizHawk.Emulation.Cores.Components.M6502
return new TraceInfo return new TraceInfo
{ {
Disassembly = $"{PC:X4}: {rawbytes,-9} {disasm} ".PadRight(32), Disassembly = $"{PC:X4}: {rawbytes,-9} {disasm} ".PadRight(32),
RegisterInfo = string.Format( RegisterInfo = string.Join(" ",
"A:{0:X2} X:{1:X2} Y:{2:X2} SP:{4:X2} P:{3:X2} {6} Cy:{5} PPU-Cy:{8}", $"A:{A:X2}",
A, X, Y, P, S, TotalExecutedCycles, $"X:{X:X2}",
$"Y:{Y:X2}",
$"SP:{S:X2}",
$"P:{P:X2}",
string.Concat( string.Concat(
FlagN ? "N" : "n", FlagN ? "N" : "n",
FlagV ? "V" : "v", FlagV ? "V" : "v",
@ -82,9 +85,11 @@ namespace BizHawk.Emulation.Cores.Components.M6502
FlagD ? "D" : "d", FlagD ? "D" : "d",
FlagI ? "I" : "i", FlagI ? "I" : "i",
FlagZ ? "Z" : "z", FlagZ ? "Z" : "z",
FlagC ? "C" : "c"), FlagC ? "C" : "c",
!RDY ? "R" : "r", // !RDY ? "R" : "r",
ext_ppu_cycle) ),
$"Cy:{TotalExecutedCycles}",
$"PPU-Cy:{ext_ppu_cycle}")
}; };
} }