From 7fb80514263a13266188bdeace2f608c20f40675 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 4 Apr 2019 02:17:00 +1000 Subject: [PATCH] Use string.Concat/string.Join --- BizHawk.Emulation.Cores/CPUs/68000/MC68000.cs | 14 +++++-- .../CPUs/CP1610/CP1610.Execute.cs | 32 ++++++++-------- .../CPUs/HuC6280/HuC6280.cs | 33 ++++++++-------- .../CPUs/LR35902/LR35902.cs | 38 +++++++++---------- .../CPUs/MOS 6502X/MOS6502X.cs | 19 +++++----- BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs | 38 +++++++++---------- .../Consoles/Nintendo/NES/NES.BoardSystem.cs | 13 +++++-- .../Nintendo/QuickNES/QuickNES.ITraceable.cs | 13 +++---- .../Consoles/Sega/gpgx64/GPGX.ITraceable.cs | 3 +- 9 files changed, 105 insertions(+), 98 deletions(-) diff --git a/BizHawk.Emulation.Cores/CPUs/68000/MC68000.cs b/BizHawk.Emulation.Cores/CPUs/68000/MC68000.cs index 4d0521fc15..b851d86272 100644 --- a/BizHawk.Emulation.Cores/CPUs/68000/MC68000.cs +++ b/BizHawk.Emulation.Cores/CPUs/68000/MC68000.cs @@ -2,6 +2,7 @@ using System.Runtime.InteropServices; using System.IO; using System.Globalization; +using System.Linq; namespace BizHawk.Emulation.Cores.Components.M68000 { @@ -163,10 +164,15 @@ namespace BizHawk.Emulation.Cores.Components.M68000 { string a = Disassemble(PC).ToString().PadRight(64); //string a = string.Format("{0:X6}: {1:X4}", PC, ReadWord(PC)).PadRight(64); - string b = string.Format("D0:{0:X8} D1:{1:X8} D2:{2:X8} D3:{3:X8} D4:{4:X8} D5:{5:X8} D6:{6:X8} D7:{7:X8} ", D[0].u32, D[1].u32, D[2].u32, D[3].u32, D[4].u32, D[5].u32, D[6].u32, D[7].u32); - string c = string.Format("A0:{0:X8} A1:{1:X8} A2:{2:X8} A3:{3:X8} A4:{4:X8} A5:{5:X8} A6:{6:X8} A7:{7:X8} ", A[0].u32, A[1].u32, A[2].u32, A[3].u32, A[4].u32, A[5].u32, A[6].u32, A[7].u32); - string d = string.Format("SR:{0:X4} Pending {1}", SR, PendingCycles); - return a + b + c + d; + var dRegStrings = D.Select((r, i) => $"D{i}:{r.u32:X8}"); + var aRegStrings = A.Select((r, i) => $"A{i}:{r.u32:X8}"); + return a + string.Join(" ", dRegStrings + .Concat(aRegStrings) + .Concat(new[] + { + $"SR:{SR:X4}", + $"Pending {PendingCycles}" + })); } public void SaveStateText(TextWriter writer, string id) diff --git a/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs b/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs index c30c140bff..6b5180a254 100644 --- a/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs +++ b/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs @@ -1,4 +1,6 @@ using System; +using System.Linq; + using BizHawk.Emulation.Common; namespace BizHawk.Emulation.Cores.Components.CP1610 @@ -27,23 +29,19 @@ namespace BizHawk.Emulation.Cores.Components.CP1610 RegisterPC-1, opcode, disassemble ? Disassemble((ushort)(RegisterPC-1), out notused) : "---").PadRight(26), - RegisterInfo = string.Format( - "Cy:{0} {1}{2}{3}{4}{5}{6} R0:{7:X4} R1:{8:X4} R2:{9:X4} R3:{10:X4} R4:{11:X4} R5:{12:X4} R6:{13:X4} R7:{14:X4}", - TotalExecutedCycles, - FlagS ? "S" : "s", - FlagC ? "C" : "c", - FlagZ ? "Z" : "z", - FlagO ? "O" : "o", - FlagI ? "I" : "i", - FlagD ? "D" : "d", - Register[0], - Register[1], - Register[2], - Register[3], - Register[4], - Register[5], - Register[6], - Register[7]) + RegisterInfo = string.Join(" ", + new[] + { + $"Cy:{TotalExecutedCycles}", + string.Concat( + FlagS ? "S" : "s", + FlagC ? "C" : "c", + FlagZ ? "Z" : "z", + FlagO ? "O" : "o", + FlagI ? "I" : "i", + FlagD ? "D" : "d") + } + .Concat(Register.Select((r, i) => $"R{i}:{4:X4}"))) }; } diff --git a/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs index 27a93c5d2d..919413ee80 100644 --- a/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs +++ b/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs @@ -278,23 +278,22 @@ namespace BizHawk.Emulation.Cores.Components.H6280 PC, ReadMemory(PC), Disassemble(PC, out notused), MPR[PC >> 13]).PadRight(30), - RegisterInfo = string.Format( - "A:{0:X2} X:{1:X2} Y:{2:X2} P:{3:X2} SP:{4:X2} Cy:{5} {6}{7}{8}{9}{10}{11}{12}{13}", - A, - X, - Y, - P, - S, - TotalExecutedCycles, - FlagN ? "N" : "n", - FlagV ? "V" : "v", - FlagT ? "T" : "t", - FlagB ? "B" : "b", - FlagD ? "D" : "d", - FlagI ? "I" : "i", - FlagZ ? "Z" : "z", - FlagC ? "C" : "c" - ) + RegisterInfo = string.Join(" ", + $"A:{A:X2}", + $"X:{X:X2}", + $"Y:{Y:X2}", + $"P:{P:X2}", + $"SP:{S:X2}", + $"Cy:{TotalExecutedCycles}", + string.Concat( + FlagN ? "N" : "n", + FlagV ? "V" : "v", + FlagT ? "T" : "t", + FlagB ? "B" : "b", + FlagD ? "D" : "d", + FlagI ? "I" : "i", + FlagZ ? "Z" : "z", + FlagC ? "C" : "c")) }; } diff --git a/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs b/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs index a4e26f5a7c..ce37346b38 100644 --- a/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs +++ b/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs @@ -566,25 +566,25 @@ namespace BizHawk.Emulation.Common.Components.LR35902 Disassembly = string.Format( "{0} ", disassemble ? Disassemble(RegPC, ReadMemory, out notused) : "---").PadRight(40), - RegisterInfo = string.Format( - "A:{0:X2} F:{1:X2} B:{2:X2} C:{3:X2} D:{4:X2} E:{5:X2} H:{6:X2} L:{7:X2} SP:{8:X2} Cy:{9} LY:{10} {11}{12}{13}{14}{15}{16}", - Regs[A], - Regs[F], - Regs[B], - Regs[C], - Regs[D], - Regs[E], - Regs[H], - Regs[L], - Regs[SPl] | (Regs[SPh] << 8), - TotalExecutedCycles, - LY, - FlagZ ? "Z" : "z", - FlagN ? "N" : "n", - FlagH ? "H" : "h", - FlagC ? "C" : "c", - FlagI ? "I" : "i", - interrupts_enabled ? "E" : "e") + RegisterInfo = string.Join(" ", + $"A:{Regs[A]:X2}", + $"F:{Regs[F]:X2}", + $"B:{Regs[B]:X2}", + $"C:{Regs[C]:X2}", + $"D:{Regs[D]:X2}", + $"E:{Regs[E]:X2}", + $"H:{Regs[H]:X2}", + $"L:{Regs[L]:X2}", + $"SP:{Regs[SPl] | (Regs[SPh] << 8):X2}", + $"Cy:{TotalExecutedCycles}", + $"LY:{LY}", + string.Concat( + FlagZ ? "Z" : "z", + FlagN ? "N" : "n", + FlagH ? "H" : "h", + FlagC ? "C" : "c", + FlagI ? "I" : "i", + interrupts_enabled ? "E" : "e")) }; } // State Save/Load diff --git a/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs index 5fc328f146..046d2fe808 100644 --- a/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs +++ b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs @@ -74,16 +74,17 @@ namespace BizHawk.Emulation.Cores.Components.M6502 "{0:X4}: {1,-9} {2} ", PC, rawbytes, disasm).PadRight(32), RegisterInfo = string.Format( - "A:{0:X2} X:{1:X2} Y:{2:X2} SP:{4:X2} P:{3:X2} {6}{7}{8}{9}{10}{11}{12}{13} Cy:{5} PPU-Cy:{15}", + "A:{0:X2} X:{1:X2} Y:{2:X2} SP:{4:X2} P:{3:X2} {6} Cy:{5} PPU-Cy:{8}", A, X, Y, P, S, TotalExecutedCycles, - FlagN ? "N" : "n", - FlagV ? "V" : "v", - FlagT ? "T" : "t", - FlagB ? "B" : "b", - FlagD ? "D" : "d", - FlagI ? "I" : "i", - FlagZ ? "Z" : "z", - FlagC ? "C" : "c", + string.Concat( + FlagN ? "N" : "n", + FlagV ? "V" : "v", + FlagT ? "T" : "t", + FlagB ? "B" : "b", + FlagD ? "D" : "d", + FlagI ? "I" : "i", + FlagZ ? "Z" : "z", + FlagC ? "C" : "c"), !RDY ? "R" : "r", ext_ppu_cycle) }; diff --git a/BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs b/BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs index 8560300319..880d26908b 100644 --- a/BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs +++ b/BizHawk.Emulation.Cores/CPUs/Z80A/Z80A.cs @@ -761,25 +761,25 @@ namespace BizHawk.Emulation.Cores.Components.Z80A RegPC, byte_code.PadRight(12), disasm.PadRight(26)), - RegisterInfo = string.Format( - "AF:{0:X4} BC:{1:X4} DE:{2:X4} HL:{3:X4} IX:{4:X4} IY:{5:X4} SP:{6:X4} Cy:{7} {8}{9}{10}{11}{12}{13}{14}{15}{16}", - (Regs[A] << 8) + Regs[F], - (Regs[B] << 8) + Regs[C], - (Regs[D] << 8) + Regs[E], - (Regs[H] << 8) + Regs[L], - (Regs[Ixh] << 8) + Regs[Ixl], - (Regs[Iyh] << 8) + Regs[Iyl], - Regs[SPl] | (Regs[SPh] << 8), - TotalExecutedCycles, - FlagC ? "C" : "c", - FlagN ? "N" : "n", - FlagP ? "P" : "p", - Flag3 ? "3" : "-", - FlagH ? "H" : "h", - Flag5 ? "5" : "-", - FlagZ ? "Z" : "z", - FlagS ? "S" : "s", - FlagI ? "E" : "e") + RegisterInfo = string.Join(" ", + $"AF:{(Regs[A] << 8) + Regs[F]:X4}", + $"BC:{(Regs[B] << 8) + Regs[C]:X4}", + $"DE:{(Regs[D] << 8) + Regs[E]:X4}", + $"HL:{(Regs[H] << 8) + Regs[L]:X4}", + $"IX:{(Regs[Ixh] << 8) + Regs[Ixl]:X4}", + $"IY:{(Regs[Iyh] << 8) + Regs[Iyl]:X4}", + $"SP:{Regs[SPl] | (Regs[SPh] << 8):X4}", + $"Cy:{TotalExecutedCycles}", + string.Concat( + FlagC ? "C" : "c", + FlagN ? "N" : "n", + FlagP ? "P" : "p", + Flag3 ? "3" : "-", + FlagH ? "H" : "h", + Flag5 ? "5" : "-", + FlagZ ? "Z" : "z", + FlagS ? "S" : "s", + FlagI ? "E" : "e")) }; } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs index ba665367f7..7c36202e54 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs @@ -459,10 +459,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES public string palette; // Palette override for VS system public byte vs_security; // for VS system games that do a ppu dheck - public override string ToString() - { - return string.Format("pr={1},ch={2},wr={3},vr={4},ba={5},pa={6}|{7},brd={8},sys={9}", board_type, prg_size, chr_size, wram_size, vram_size, wram_battery ? 1 : 0, pad_h, pad_v, board_type, system); - } + public override string ToString() => string.Join(",", + $"pr={prg_size}", + $"ch={chr_size}", + $"wr={wram_size}", + $"vr={vram_size}", + $"ba={(wram_battery ? 1 : 0)}", + $"pa={pad_h}|{pad_v}", + $"brd={board_type}", + $"sys={system}"); } /// diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.cs index 1798056a31..1e2bfa3e35 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.cs @@ -34,13 +34,12 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES Tracer.Put(new TraceInfo { Disassembly = string.Format("{0:X4}: {1}", pc, opcodeStr).PadRight(26), - RegisterInfo = string.Format( - "A:{1:X2} X:{3:X2} Y:{4:X2} P:{2:X2} SP:{0:X2}", - sp, - a, - p, - x, - y) + RegisterInfo = string.Join(" ", + $"A:{a:X2}", + $"X:{x:X2}", + $"Y:{y:X2}", + $"P:{p:X2}", + $"SP:{sp:X2}") }); } diff --git a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ITraceable.cs b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ITraceable.cs index c8d8dab662..fecbfeeb4a 100644 --- a/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ITraceable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.ITraceable.cs @@ -49,8 +49,7 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx } } var sr = regs["M68K SR"].Value; - sb.Append( - string.Format("{0}{1}{2}{3}{4}", + sb.Append(string.Concat( (sr & 16) > 0 ? "X" : "x", (sr & 8) > 0 ? "N" : "n", (sr & 4) > 0 ? "Z" : "z",